Skip to content

Commit 612844a

Browse files
committed
Fix incorrect end lookback for labeled blocks
Fixes #625
1 parent ef418e5 commit 612844a

File tree

6 files changed

+83
-6
lines changed

6 files changed

+83
-6
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ repository:
177177
beginCaptures:
178178
'1': { name: entity.name.label.ts }
179179
'2': { name: punctuation.separator.label.ts }
180-
end: (?<=\{)
180+
end: (?<=\})
181181
patterns:
182182
- include: '#decl-block'
183183
- match: '{{label}}'

TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
</dict>
219219
</dict>
220220
<key>end</key>
221-
<string>(?&lt;=\{)</string>
221+
<string>(?&lt;=\})</string>
222222
<key>patterns</key>
223223
<array>
224224
<dict>

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
</dict>
219219
</dict>
220220
<key>end</key>
221-
<string>(?&lt;=\{)</string>
221+
<string>(?&lt;=\})</string>
222222
<key>patterns</key>
223223
<array>
224224
<dict>

tests/baselines/Issue610.baseline.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,10 @@ Grammar: TypeScript.tmLanguage
105105
^
106106
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts
107107
> }
108-
^^^^
108+
^^
109109
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
110+
^
111+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
110112
>}
111-
^^
112-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
113+
^
114+
source.ts meta.class.ts punctuation.definition.block.ts

tests/baselines/Issue625.baseline.txt

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
original file
2+
-----------------------------------
3+
console.log(1);
4+
foo: {
5+
console.log(1);
6+
}
7+
console.log(1);
8+
-----------------------------------
9+
10+
Grammar: TypeScript.tmLanguage
11+
-----------------------------------
12+
>console.log(1);
13+
^^^^^^^
14+
source.ts meta.function-call.ts support.class.console.ts
15+
^
16+
source.ts meta.function-call.ts punctuation.accessor.ts
17+
^^^
18+
source.ts meta.function-call.ts support.function.console.ts
19+
^
20+
source.ts meta.brace.round.ts
21+
^
22+
source.ts constant.numeric.decimal.ts
23+
^
24+
source.ts meta.brace.round.ts
25+
^
26+
source.ts punctuation.terminator.statement.ts
27+
>foo: {
28+
^^^
29+
source.ts entity.name.label.ts
30+
^
31+
source.ts punctuation.separator.label.ts
32+
^
33+
source.ts
34+
^
35+
source.ts meta.block.ts punctuation.definition.block.ts
36+
> console.log(1);
37+
^^^^
38+
source.ts meta.block.ts
39+
^^^^^^^
40+
source.ts meta.block.ts meta.function-call.ts support.class.console.ts
41+
^
42+
source.ts meta.block.ts meta.function-call.ts punctuation.accessor.ts
43+
^^^
44+
source.ts meta.block.ts meta.function-call.ts support.function.console.ts
45+
^
46+
source.ts meta.block.ts meta.brace.round.ts
47+
^
48+
source.ts meta.block.ts constant.numeric.decimal.ts
49+
^
50+
source.ts meta.block.ts meta.brace.round.ts
51+
^
52+
source.ts meta.block.ts punctuation.terminator.statement.ts
53+
>}
54+
^
55+
source.ts meta.block.ts punctuation.definition.block.ts
56+
>console.log(1);
57+
^^^^^^^
58+
source.ts meta.function-call.ts support.class.console.ts
59+
^
60+
source.ts meta.function-call.ts punctuation.accessor.ts
61+
^^^
62+
source.ts meta.function-call.ts support.function.console.ts
63+
^
64+
source.ts meta.brace.round.ts
65+
^
66+
source.ts constant.numeric.decimal.ts
67+
^
68+
source.ts meta.brace.round.ts
69+
^
70+
source.ts punctuation.terminator.statement.ts

tests/cases/Issue625.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
console.log(1);
2+
foo: {
3+
console.log(1);
4+
}
5+
console.log(1);

0 commit comments

Comments
 (0)