Skip to content

Commit e57ddfb

Browse files
committed
Add ] as the end for new expression
Fixes #482
1 parent 4adb173 commit e57ddfb

File tree

5 files changed

+74
-3
lines changed

5 files changed

+74
-3
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1569,7 +1569,7 @@ repository:
15691569
begin: (?<!\.|\$)\b(new)\b(?!\$|\.)
15701570
beginCaptures:
15711571
'1': { name: keyword.operator.new.ts }
1572-
end: (?<=\))|(?=[;),}]|$|((?<!\.|\$)\bnew\b(?!\$|\.))|((?<!\.|\$)\bfunction((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))
1572+
end: (?<=\))|(?=[;),}\]]|$|((?<!\.|\$)\bnew\b(?!\$|\.))|((?<!\.|\$)\bfunction((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))
15731573
patterns:
15741574
- include: '#paren-expression'
15751575
- include: '#class-or-interface-declaration'

TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4312,7 +4312,7 @@
43124312
</dict>
43134313
</dict>
43144314
<key>end</key>
4315-
<string>(?&lt;=\))|(?=[;),}]|$|((?&lt;!\.|\$)\bnew\b(?!\$|\.))|((?&lt;!\.|\$)\bfunction((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))</string>
4315+
<string>(?&lt;=\))|(?=[;),}\]]|$|((?&lt;!\.|\$)\bnew\b(?!\$|\.))|((?&lt;!\.|\$)\bfunction((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))</string>
43164316
<key>patterns</key>
43174317
<array>
43184318
<dict>

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4258,7 +4258,7 @@
42584258
</dict>
42594259
</dict>
42604260
<key>end</key>
4261-
<string>(?&lt;=\))|(?=[;),}]|$|((?&lt;!\.|\$)\bnew\b(?!\$|\.))|((?&lt;!\.|\$)\bfunction((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))</string>
4261+
<string>(?&lt;=\))|(?=[;),}\]]|$|((?&lt;!\.|\$)\bnew\b(?!\$|\.))|((?&lt;!\.|\$)\bfunction((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))</string>
42624262
<key>patterns</key>
42634263
<array>
42644264
<dict>

tests/baselines/Issue482.baseline.txt

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
original file
2+
-----------------------------------
3+
let a = 1;
4+
let b = [new Object]
5+
let c = 1
6+
-----------------------------------
7+
8+
Grammar: TypeScript.tmLanguage
9+
-----------------------------------
10+
>let a = 1;
11+
^^^
12+
source.ts meta.var.expr.ts storage.type.ts
13+
^
14+
source.ts meta.var.expr.ts
15+
^
16+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
17+
^
18+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
19+
^
20+
source.ts meta.var.expr.ts keyword.operator.assignment.ts
21+
^
22+
source.ts meta.var.expr.ts
23+
^
24+
source.ts meta.var.expr.ts constant.numeric.decimal.ts
25+
^
26+
source.ts punctuation.terminator.statement.ts
27+
^^
28+
source.ts
29+
>let b = [new Object]
30+
^^^
31+
source.ts meta.var.expr.ts storage.type.ts
32+
^
33+
source.ts meta.var.expr.ts
34+
^
35+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
36+
^
37+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
38+
^
39+
source.ts meta.var.expr.ts keyword.operator.assignment.ts
40+
^
41+
source.ts meta.var.expr.ts
42+
^
43+
source.ts meta.var.expr.ts meta.array.literal.ts meta.brace.square.ts
44+
^^^
45+
source.ts meta.var.expr.ts meta.array.literal.ts new.expr.ts keyword.operator.new.ts
46+
^
47+
source.ts meta.var.expr.ts meta.array.literal.ts new.expr.ts
48+
^^^^^^
49+
source.ts meta.var.expr.ts meta.array.literal.ts new.expr.ts entity.name.type.ts
50+
^
51+
source.ts meta.var.expr.ts meta.array.literal.ts meta.brace.square.ts
52+
^
53+
source.ts meta.var.expr.ts
54+
>let c = 1
55+
^^^
56+
source.ts meta.var.expr.ts storage.type.ts
57+
^
58+
source.ts meta.var.expr.ts
59+
^
60+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
61+
^
62+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
63+
^
64+
source.ts meta.var.expr.ts keyword.operator.assignment.ts
65+
^
66+
source.ts meta.var.expr.ts
67+
^
68+
source.ts meta.var.expr.ts constant.numeric.decimal.ts

tests/cases/Issue482.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
let a = 1;
2+
let b = [new Object]
3+
let c = 1

0 commit comments

Comments
 (0)