summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2019-03-04 09:28:35 +0100
committerAdam Stankiewicz <sheerun@sher.pl>2019-03-04 09:28:35 +0100
commit1597b7b766ee3999cdfea862af14999c37041d0e (patch)
tree4934067126da413f85ac3fd6007d177bce77de93 /extras
parented677c34d55a0e025b7008f29419498a3989cde2 (diff)
downloadvim-polyglot-1597b7b766ee3999cdfea862af14999c37041d0e.tar.gz
vim-polyglot-1597b7b766ee3999cdfea862af14999c37041d0e.zip
Change plugin guard for disabling, fixes #371
Diffstat (limited to 'extras')
-rw-r--r--extras/flow.vim8
-rw-r--r--extras/jsdoc.vim8
-rw-r--r--extras/ngdoc.vim8
3 files changed, 12 insertions, 12 deletions
diff --git a/extras/flow.vim b/extras/flow.vim
index ecd368b1..67b7671b 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+ finish
+endif
+
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
@@ -109,5 +111,3 @@ 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 65546139..50c69e85 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+ finish
+endif
+
"" syntax coloring for javadoc comments (HTML)
syntax region jsComment matchgroup=jsComment start="/\*\s*" end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
@@ -39,5 +41,3 @@ 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 be314a80..90eceadf 100644
--- a/extras/ngdoc.vim
+++ b/extras/ngdoc.vim
@@ -1,7 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+ finish
+endif
+
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