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 /extras | |
| parent | c8897c9c18ee79d3780dd352aee34bf6498c625d (diff) | |
| download | vim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.tar.gz vim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.zip | |
Improve guard to support concatenated files
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/flow.vim | 6 | ||||
| -rw-r--r-- | extras/jsdoc.vim | 6 | ||||
| -rw-r--r-- | extras/ngdoc.vim | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/extras/flow.vim b/extras/flow.vim index 67b7671b..7a266036 100644 --- a/extras/flow.vim +++ b/extras/flow.vim @@ -1,7 +1,4 @@ -if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1 - finish -endif - +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1 syntax region jsFlowDefinition contained start=/:/ end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen syntax region jsFlowArgumentDef contained start=/:/ end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster syntax region jsFlowArray contained matchgroup=jsFlowNoise start=/\[/ end=/\]/ contains=@jsFlowCluster,jsComment fold @@ -111,3 +108,4 @@ if version >= 508 || !exists("did_javascript_syn_inits") HiLink jsFlowObjectFuncName jsObjectFuncName delcommand HiLink endif +endif diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim index d7250f81..cad3df30 100644 --- a/extras/jsdoc.vim +++ b/extras/jsdoc.vim @@ -1,7 +1,4 @@ -if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1 - finish -endif - +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1 "" syntax coloring for javadoc comments (HTML) syntax region jsComment matchgroup=jsComment start="/\*\s*" end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold @@ -41,3 +38,4 @@ if version >= 508 || !exists("did_javascript_syn_inits") HiLink jsDocParam Label delcommand HiLink endif +endif diff --git a/extras/ngdoc.vim b/extras/ngdoc.vim index 90eceadf..f1384556 100644 --- a/extras/ngdoc.vim +++ b/extras/ngdoc.vim @@ -1,7 +1,5 @@ -if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1 - finish -endif - +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1 syntax match jsDocTags contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite syntax match jsDocType contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite syntax match jsDocParam contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+" +endif |