From 1597b7b766ee3999cdfea862af14999c37041d0e Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 4 Mar 2019 09:28:35 +0100
Subject: Change plugin guard for disabling, fixes #371

---
 extras/flow.vim  | 8 ++++----
 extras/jsdoc.vim | 8 ++++----
 extras/ngdoc.vim | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'extras')

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
-- 
cgit v1.2.3