Skip to content

Commit 7148a4d

Browse files
committed
Fix incorrect multi line variable declaration capture for ","
Fixes #635
1 parent 88217b1 commit 7148a4d

File tree

5 files changed

+56
-3
lines changed

5 files changed

+56
-3
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ repository:
249249
- begin: (,)\s*(?!\S)
250250
beginCaptures:
251251
'1': { name: punctuation.separator.comma.ts }
252-
end: (?<!,)((?==|;|}|(\s+(of|in)\s+)|^\s*$))|((?<=\S)(?=\s*$))
252+
end: (?<!,)(((?==|;|}|(\s+(of|in)\s+)|^\s*$))|((?<=\S)(?=\s*$)))
253253
patterns:
254254
- include: '#comment'
255255
- include: '#destructuring-variable'

TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@
448448
</dict>
449449
</dict>
450450
<key>end</key>
451-
<string>(?&lt;!,)((?==|;|}|(\s+(of|in)\s+)|^\s*$))|((?&lt;=\S)(?=\s*$))</string>
451+
<string>(?&lt;!,)(((?==|;|}|(\s+(of|in)\s+)|^\s*$))|((?&lt;=\S)(?=\s*$)))</string>
452452
<key>patterns</key>
453453
<array>
454454
<dict>

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
</dict>
453453
</dict>
454454
<key>end</key>
455-
<string>(?&lt;!,)((?==|;|}|(\s+(of|in)\s+)|^\s*$))|((?&lt;=\S)(?=\s*$))</string>
455+
<string>(?&lt;!,)(((?==|;|}|(\s+(of|in)\s+)|^\s*$))|((?&lt;=\S)(?=\s*$)))</string>
456456
<key>patterns</key>
457457
<array>
458458
<dict>

tests/baselines/Issue635.baseline.txt

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
original file
2+
-----------------------------------
3+
let a: number,
4+
b: number,
5+
c: number;
6+
-----------------------------------
7+
8+
Grammar: TypeScript.tmLanguage
9+
-----------------------------------
10+
>let a: number,
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 meta.type.annotation.ts keyword.operator.type.annotation.ts
19+
^
20+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts
21+
^^^^^^
22+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts
23+
^
24+
source.ts meta.var.expr.ts punctuation.separator.comma.ts
25+
> b: number,
26+
^^^^
27+
source.ts meta.var.expr.ts
28+
^
29+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
30+
^
31+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
32+
^
33+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts
34+
^^^^^^
35+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts
36+
^
37+
source.ts meta.var.expr.ts punctuation.separator.comma.ts
38+
> c: number;
39+
^^^^
40+
source.ts meta.var.expr.ts
41+
^
42+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
43+
^
44+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
45+
^
46+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts
47+
^^^^^^
48+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts
49+
^
50+
source.ts punctuation.terminator.statement.ts

tests/cases/Issue635.ts

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

0 commit comments

Comments
 (0)