Skip to content

Commit 817281c

Browse files
committed
{ followed by ':' can only be statement and not object literal as other scenarios are already handled
Fixes #294
1 parent 0ec5ae9 commit 817281c

File tree

4 files changed

+40
-12
lines changed

4 files changed

+40
-12
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ repository:
599599

600600
after-operator-block:
601601
name: meta.object-literal.ts
602-
begin: (?<=[=(:,\[?+!]|await|return|yield|throw|in|of|typeof|&&|\|\||\*)\s*(\{)
602+
begin: (?<=[=(,\[?+!]|await|return|yield|throw|in|of|typeof|&&|\|\||\*)\s*(\{)
603603
beginCaptures:
604604
'1': { name: punctuation.definition.block.ts }
605605
end: \}

TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1959,7 +1959,7 @@
19591959
<key>name</key>
19601960
<string>meta.object-literal.ts</string>
19611961
<key>begin</key>
1962-
<string>(?&lt;=[=(:,\[?+!]|await|return|yield|throw|in|of|typeof|&amp;&amp;|\|\||\*)\s*(\{)</string>
1962+
<string>(?&lt;=[=(,\[?+!]|await|return|yield|throw|in|of|typeof|&amp;&amp;|\|\||\*)\s*(\{)</string>
19631963
<key>beginCaptures</key>
19641964
<dict>
19651965
<key>1</key>

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1963,7 +1963,7 @@
19631963
<key>name</key>
19641964
<string>meta.object-literal.tsx</string>
19651965
<key>begin</key>
1966-
<string>(?&lt;=[=(:,\[?+!]|await|return|yield|throw|in|of|typeof|&amp;&amp;|\|\||\*)\s*(\{)</string>
1966+
<string>(?&lt;=[=(,\[?+!]|await|return|yield|throw|in|of|typeof|&amp;&amp;|\|\||\*)\s*(\{)</string>
19671967
<key>beginCaptures</key>
19681968
<dict>
19691969
<key>1</key>

tests/baselines/Issue294.baseline.txt

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,50 @@ Grammar: TypeScript.tmLanguage
3939
^
4040
source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
4141
^
42-
source.ts switch-statement.expr.ts switch-block.expr.ts meta.object-literal.ts
42+
source.ts switch-statement.expr.ts switch-block.expr.ts
4343
^
44-
source.ts switch-statement.expr.ts switch-block.expr.ts meta.object-literal.ts punctuation.definition.block.ts
44+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts punctuation.definition.block.ts
4545
^^
46-
source.ts switch-statement.expr.ts switch-block.expr.ts meta.object-literal.ts
46+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts
4747
> const zero = 0;
48-
^^^^^^^^^^^^^^^^^^^^^^^^^
49-
source.ts switch-statement.expr.ts switch-block.expr.ts meta.object-literal.ts
48+
^^^^^^^^
49+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts
50+
^^^^^
51+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts storage.type.ts
52+
^
53+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts
54+
^^^^
55+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
56+
^
57+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
58+
^
59+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
60+
^
61+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
62+
^
63+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
64+
^
65+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts punctuation.terminator.statement.ts
66+
^^
67+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts
5068
> return zero;
51-
^^^^^^^^^^^^^^^^^^^^^^
52-
source.ts switch-statement.expr.ts switch-block.expr.ts meta.object-literal.ts
69+
^^^^^^^^
70+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts
71+
^^^^^^
72+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts keyword.control.flow.ts
73+
^
74+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts
75+
^^^^
76+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts variable.other.readwrite.ts
77+
^
78+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts punctuation.terminator.statement.ts
79+
^^
80+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts
5381
> }
5482
^^^^
55-
source.ts switch-statement.expr.ts switch-block.expr.ts meta.object-literal.ts
83+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts
5684
^
57-
source.ts switch-statement.expr.ts switch-block.expr.ts meta.object-literal.ts punctuation.definition.block.ts
85+
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts punctuation.definition.block.ts
5886
^^
5987
source.ts switch-statement.expr.ts switch-block.expr.ts
6088
>}

0 commit comments

Comments
 (0)