summaryrefslogtreecommitdiffstats
path: root/syntax/basic/object.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 /syntax/basic/object.vim
parentc8897c9c18ee79d3780dd352aee34bf6498c625d (diff)
downloadvim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.tar.gz
vim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.zip
Improve guard to support concatenated files
Diffstat (limited to 'syntax/basic/object.vim')
-rw-r--r--syntax/basic/object.vim6
1 files changed, 2 insertions, 4 deletions
diff --git a/syntax/basic/object.vim b/syntax/basic/object.vim
index 533201c3..eadaba0a 100644
--- a/syntax/basic/object.vim
+++ b/syntax/basic/object.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
- finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
syntax region typescriptObjectLiteral matchgroup=typescriptBraces
\ start=/{/ end=/}/
\ contains=@typescriptComments,typescriptObjectLabel,typescriptStringProperty,typescriptComputedPropertyName
@@ -30,3 +27,4 @@ syntax match typescriptRestOrSpread /\.\.\./ contained
syntax match typescriptObjectSpread /\.\.\./ contained containedin=typescriptObjectLiteral,typescriptArray nextgroup=@typescriptValue
syntax match typescriptObjectColon contained /:/ nextgroup=@typescriptValue skipwhite skipempty
+endif