diff options
author | Adam Stankiewicz <sheerun@sher.pl> | 2019-09-06 15:54:31 +0200 |
---|---|---|
committer | Adam Stankiewicz <sheerun@sher.pl> | 2019-09-06 15:54:31 +0200 |
commit | 48e07bc5014fecfdff24f75124a65634c216c9e2 (patch) | |
tree | 2e16f9a515364e27ac451acbc313b1d7ca518790 /after/syntax/javascript | |
parent | c8897c9c18ee79d3780dd352aee34bf6498c625d (diff) | |
download | vim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.tar.gz vim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.zip |
Improve guard to support concatenated files
Diffstat (limited to '')
-rw-r--r-- | after/syntax/javascript.vim | 10 | ||||
-rw-r--r-- | after/syntax/javascript/graphql.vim | 6 |
2 files changed, 5 insertions, 11 deletions
diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim index 1d2064b5..50a22712 100644 --- a/after/syntax/javascript.vim +++ b/after/syntax/javascript.vim @@ -1,7 +1,4 @@ -if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1) - finish -endif - +if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1) """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Vim syntax file " @@ -60,10 +57,8 @@ let b:current_syntax = 'javascript.jsx' let &cpo = s:jsx_cpo unlet s:jsx_cpo -if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'styled-components') != -1 - finish endif - +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'styled-components') == -1 " Vim syntax file " Language: styled-components (js/ts) " Maintainer: Karl Fleischmann <fleischmann.karl@gmail.com> @@ -259,3 +254,4 @@ hi def link styledXmlRegion String if exists("s:current_syntax") let b:current_syntax=s:current_syntax endif +endif diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim index edc8eea1..e9a0ff3a 100644 --- a/after/syntax/javascript/graphql.vim +++ b/after/syntax/javascript/graphql.vim @@ -1,7 +1,4 @@ -if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1 - finish -endif - +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1 if exists('b:current_syntax') let s:current_syntax = b:current_syntax unlet b:current_syntax @@ -25,3 +22,4 @@ hi def link graphqlTemplateExpression jsTemplateExpression syn cluster jsExpression add=graphqlTaggedTemplate syn cluster graphqlTaggedTemplate add=graphqlTemplateString +endif |