From 43085dc02f34d7d54208e6e20989d4779bffe71c Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Thu, 12 Dec 2019 16:33:01 +0100 Subject: Update --- after/syntax/jsx_pretty.vim | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'after/syntax') diff --git a/after/syntax/jsx_pretty.vim b/after/syntax/jsx_pretty.vim index 1f1c2567..546e9d48 100644 --- a/after/syntax/jsx_pretty.vim +++ b/after/syntax/jsx_pretty.vim @@ -20,7 +20,7 @@ syntax region jsxTag \ matchgroup=NONE \ end=+\%(/\_s*>\)\@=+ \ contained - \ contains=jsxOpenTag,jsxAttrib,jsxEscapeJs,jsxSpreadOperator,jsComment,@javascriptComments,javaScriptLineComment,javaScriptComment,typescriptLineComment,typescriptComment + \ contains=jsxOpenTag,jsxAttrib,jsxExpressionBlock,jsxSpreadOperator,jsComment,@javascriptComments,javaScriptLineComment,javaScriptComment,typescriptLineComment,typescriptComment \ keepend \ extend \ skipwhite @@ -39,7 +39,7 @@ syntax region jsxElement \ start=+<\_s*\%(>\|\${\|\z(\<[-:._$A-Za-z0-9]\+\>\)\)+ \ end=+/\_s*>+ \ end=+<\_s*/\_s*\z1\_s*>+ - \ contains=jsxElement,jsxTag,jsxEscapeJs,jsxComment,jsxCloseTag,@Spell + \ contains=jsxElement,jsxTag,jsxExpressionBlock,jsxComment,jsxCloseTag,@Spell \ keepend \ extend \ contained @@ -66,7 +66,7 @@ exe 'syntax region jsxOpenTag " " ~~~~~~~~~~~~~~~~ -syntax region jsxEscapeJs +syntax region jsxExpressionBlock \ matchgroup=jsxBraces \ start=+{+ \ end=+}+ @@ -84,7 +84,7 @@ syntax match jsxNamespace +:+ contained " " ~ -syntax match jsxEqual +=+ contained skipwhite skipempty nextgroup=jsxString,jsxEscapeJs,jsxRegion +syntax match jsxEqual +=+ contained skipwhite skipempty nextgroup=jsxString,jsxExpressionBlock,jsxRegion " " ~~ @@ -154,10 +154,10 @@ if s:enable_tagged_jsx \ end=+`+ \ extend \ contained - \ contains=jsxElement,jsxEscapeJs + \ contains=jsxElement,jsxExpressionBlock \ transparent - syntax region jsxEscapeJs + syntax region jsxExpressionBlock \ matchgroup=jsxBraces \ start=+\${+ \ end=+}+ @@ -171,14 +171,14 @@ if s:enable_tagged_jsx \ matchgroup=NONE \ end=+}\@1<=+ \ contained - \ contains=jsxEscapeJs + \ contains=jsxExpressionBlock \ skipwhite \ skipempty \ nextgroup=jsxAttrib,jsxSpreadOperator syntax keyword jsxAttribKeyword class contained - syntax match jsxSpreadOperator +\.\.\.+ contained nextgroup=jsxEscapeJs skipwhite + syntax match jsxSpreadOperator +\.\.\.+ contained nextgroup=jsxExpressionBlock skipwhite syntax match jsxCloseTag ++ contained -- cgit v1.2.3