summaryrefslogtreecommitdiffstats
path: root/extras/flow.vim
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2019-09-06 15:54:31 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2019-09-06 15:54:31 +0200
commit48e07bc5014fecfdff24f75124a65634c216c9e2 (patch)
tree2e16f9a515364e27ac451acbc313b1d7ca518790 /extras/flow.vim
parentc8897c9c18ee79d3780dd352aee34bf6498c625d (diff)
downloadvim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.tar.gz
vim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.zip
Improve guard to support concatenated files
Diffstat (limited to 'extras/flow.vim')
-rw-r--r--extras/flow.vim6
1 files changed, 2 insertions, 4 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