Skip to content

Commit 37bbfb4

Browse files
committed
Fix #5 syntax is broken to next case <=
1 parent 2776ceb commit 37bbfb4

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

after/syntax/javascript.vim

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ endif
2424
" <tag></tag>
2525
" s~~~~~~~~~~~e
2626
syntax region jsxRegion
27-
\ start=+<\z([^ /!?<>"']\+\)+
27+
\ start=+<\z([^ /!?<>"'=:]\+\)+
2828
\ skip=+<!--\_.\{-}-->+
2929
\ end=+</\z1\_\s\{-}[^(=>)]>+
3030
\ end=+>\n\?\s*)\@=+
@@ -42,7 +42,7 @@ syntax region jsxRegion
4242
" <tag id="sample">
4343
" s~~~~~~~~~~~~~~~e
4444
syntax region jsxTag
45-
\ start=+<[^ /!?<>"']\@=+
45+
\ start=+<[^ /!?<>"'=:]\@=+
4646
\ end=+>+
4747
\ matchgroup=jsxCloseTag end=+/>+
4848
\ contained
@@ -108,13 +108,18 @@ syntax region jsxString contained start=+'+ end=+'+ contains=jsxEntity,@Spell di
108108
" s~~~~~~~~~~~~~~e
109109
syntax region jsxEscapeJs
110110
\ contained
111-
\ contains=jsTemplateString,jsObject,jsArrowFuncArgs,jsFuncBlock,
112-
\jsParen,javascriptIdentifier,javascriptTemplate,
113-
\javascriptArrowFunc,jsxRegion
111+
\ contains=jsTemplateString,jsObject,jsArrowFuncArgs,
112+
\jsFlowDefinition,
113+
\jsFuncBlock,jsParen,javascriptIdentifier,
114+
\javascriptTemplate,javascriptArrowFunc,
115+
\jsxRegion
114116
\ matchgroup=jsxCloseTag end=+>+
115117
\ start=+{+
116118
\ end=+}+
117119

120+
syntax match jsxIfOperator +?+
121+
syntax match jsxElseOperator +:+
122+
118123
syntax cluster jsExpression add=jsxRegion
119124
syntax cluster javascriptNoReserved add=jsxRegion
120125

sample.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ class Hoge extends React.Component {
22
constructor(props) {
33
super(props);
44
this.state = { };
5+
if ( foo <= 300 ) {
6+
7+
}
58
}
69

710
renderHoge() {
@@ -18,6 +21,8 @@ class Hoge extends React.Component {
1821

1922
render() {
2023
return (
24+
<div>
25+
</div>
2126
<div>
2227
{(hoge => {
2328
if (hoge) {

0 commit comments

Comments
 (0)