summaryrefslogtreecommitdiffstats
path: root/after
diff options
context:
space:
mode:
Diffstat (limited to 'after')
-rw-r--r--after/ftplugin/terraform.vim2
-rw-r--r--after/syntax/jsx.vim2
2 files changed, 3 insertions, 1 deletions
diff --git a/after/ftplugin/terraform.vim b/after/ftplugin/terraform.vim
index 0597b428..a1750984 100644
--- a/after/ftplugin/terraform.vim
+++ b/after/ftplugin/terraform.vim
@@ -39,6 +39,8 @@ function! TerraformFolds()
return ">1"
elseif match(thisline, '^terraform') >= 0
return ">1"
+ elseif match(thisline, '^locals') >= 0
+ return ">1"
else
return "="
endif
diff --git a/after/syntax/jsx.vim b/after/syntax/jsx.vim
index a8ca0aea..05987149 100644
--- a/after/syntax/jsx.vim
+++ b/after/syntax/jsx.vim
@@ -49,7 +49,7 @@ syn region jsxChild contained start=+{+ end=++ contains=jsBlock,javascriptBlock
" and generic Flow type annotations (http://flowtype.org/).
syn region jsxRegion
\ contains=@Spell,@XMLSyntax,jsxRegion,jsxChild,jsBlock,javascriptBlock
- \ start=+\%(<\|\w\)\@<!<\z([a-zA-Z][a-zA-Z0-9:\-.]*\)+
+ \ start=+\%(<\|\w\)\@<!<\z([a-zA-Z][a-zA-Z0-9:\-.]*\>[:,]\@!\)\([^>]*>(\)\@!+
\ skip=+<!--\_.\{-}-->+
\ end=+</\z1\_\s\{-}>+
\ end=+/>+