From 10932ddaaf560e1ae5bc12137515dc7007a0afc3 Mon Sep 17 00:00:00 2001 From: Renato Augusto Gama dos Santos Date: Mon, 6 Jul 2020 10:10:08 -0300 Subject: [PATCH] JSX - Support vim-jsx-pretty and improve YATS syntax (#198) * Initial work supporting maxmellon/vim-jsx-pretty * adding purple for variable declarations * feat: vim-jsx-pretty syntax support javascript/javascriptreact * feat: allow typescript.tsx in typescript.vim * feat: support vim-jsx-pretty in .tsx/typescriptreact * fix: remove changes outside scope * fix: return yats to original * feat: update vim-jsx-pretty support to match expected colors Co-authored-by: Guillermo Velasquez --- after/syntax/javascript.vim | 16 ++++++++++++++-- after/syntax/javascriptreact.vim | 1 + after/syntax/typescript.vim | 2 +- after/syntax/typescriptreact.vim | 12 ++++++++++++ 4 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 after/syntax/javascriptreact.vim diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim index 32e3390..372bba5 100644 --- a/after/syntax/javascript.vim +++ b/after/syntax/javascript.vim @@ -1,5 +1,5 @@ -if dracula#should_abort('javascript') - finish +if dracula#should_abort('javascript', 'javascriptreact', 'javascript.jsx') + finish endif hi! link javaScriptBraces Delimiter @@ -22,4 +22,16 @@ hi! link jsTemplateBraces Special "}}} +" maxmellon/vim-jsx-pretty {{{ + +hi! link jsxTag Keyword +hi! link jsxTagName Keyword +hi! link jsxComponentName Type +hi! link jsxCloseTag Type +hi! link jsxAttrib DraculaGreenItalic +hi! link jsxCloseString Identifier +hi! link jsxOpenPunct Identifier + +" }}} + " vim: fdm=marker ts=2 sts=2 sw=2 fdl=0: diff --git a/after/syntax/javascriptreact.vim b/after/syntax/javascriptreact.vim new file mode 100644 index 0000000..b5b557c --- /dev/null +++ b/after/syntax/javascriptreact.vim @@ -0,0 +1 @@ +runtime! syntax/javascript.vim diff --git a/after/syntax/typescript.vim b/after/syntax/typescript.vim index ee0466e..c368fb5 100644 --- a/after/syntax/typescript.vim +++ b/after/syntax/typescript.vim @@ -1,4 +1,4 @@ -if dracula#should_abort('typescript', 'typescriptreact') +if dracula#should_abort('typescript', 'typescriptreact', 'typescript.tsx') finish endif diff --git a/after/syntax/typescriptreact.vim b/after/syntax/typescriptreact.vim index 911b9bf..3fde694 100644 --- a/after/syntax/typescriptreact.vim +++ b/after/syntax/typescriptreact.vim @@ -8,3 +8,15 @@ hi! link tsxAttrib DraculaGreenItalic hi! link tsxEqual Operator hi! link tsxIntrinsicTagName Keyword hi! link tsxTagName Type + +" maxmellon/vim-jsx-pretty {{{ + +hi! link jsxTag Keyword +hi! link jsxTagName Keyword +hi! link jsxComponentName Type +hi! link jsxCloseTag Type +hi! link jsxAttrib DraculaGreenItalic +hi! link jsxCloseString Identifier +hi! link jsxOpenPunct Identifier + +" }}}