summaryrefslogtreecommitdiffstats
path: root/after/syntax
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2019-11-04 09:04:28 +0100
committerAdam Stankiewicz <sheerun@sher.pl>2019-11-04 09:04:28 +0100
commit4e95df7c7e12cb76e781f2dacf1c07f8984cce58 (patch)
treeaf9230137ec342d4bed0a68a9ccb49ed3303b3d0 /after/syntax
parent31c55b85a03d96252bba14d64911cc78a20369a1 (diff)
downloadvim-polyglot-4e95df7c7e12cb76e781f2dacf1c07f8984cce58.tar.gz
vim-polyglot-4e95df7c7e12cb76e781f2dacf1c07f8984cce58.zip
Update
Diffstat (limited to '')
-rw-r--r--after/syntax/jsx_pretty.vim2
-rw-r--r--after/syntax/typescript.vim4
2 files changed, 5 insertions, 1 deletions
diff --git a/after/syntax/jsx_pretty.vim b/after/syntax/jsx_pretty.vim
index b4d0e0f0..3c13b41f 100644
--- a/after/syntax/jsx_pretty.vim
+++ b/after/syntax/jsx_pretty.vim
@@ -38,7 +38,7 @@ syntax region jsxElement
" detect jsx region
syntax region jsxRegion
- \ start=+\(\(\_[([,?:=+\-*/<>{}]\|&&\|||\|=>\|\<return\|\<default\|\<await\|\<yield\)\_s*\)\@<=<\_s*\(>\|\z(\(script\)\@!\<[_\$A-Za-z][-:_\.\$0-9A-Za-z]*\>\)\(\_s*\([-+*)\]}&|?,]\|/\([/*]\|\_s*>\)\@!\)\)\@!\)+
+ \ start=+\(\(\_[([,?:=+\-*/>{}]\|<\s\+\|&&\|||\|=>\|\<return\|\<default\|\<await\|\<yield\)\_s*\)\@<=<\_s*\(>\|\z(\(script\|T\s*>\s*(\)\@!\<[_\$A-Za-z][-:_\.\$0-9A-Za-z]*\>\)\(\_s*\([-+*)\]}&|?,]\|/\([/*]\|\_s*>\)\@!\)\)\@!\)+
\ end=++
\ contains=jsxElement
diff --git a/after/syntax/typescript.vim b/after/syntax/typescript.vim
index ba90c5d5..9f52ed21 100644
--- a/after/syntax/typescript.vim
+++ b/after/syntax/typescript.vim
@@ -9,6 +9,10 @@ if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript')
"
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if get(g:, 'vim_jsx_pretty_disable_tsx', 0)
+ finish
+endif
+
let s:jsx_cpo = &cpo
set cpo&vim