Skip to content

Commit 2646468

Browse files
committed
Added a testcase and eliminated space characters entirely
1 parent 05f7ff0 commit 2646468

File tree

6 files changed

+27
-11
lines changed

6 files changed

+27
-11
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ repository:
8989

9090
object-heritage:
9191
name: meta.object.heritage.ts
92-
begin: '(?:\s*\b(extends|implements)\b)'
92+
begin: '(?:\b(extends|implements)\b)'
9393
beginCaptures:
9494
'1': { name: keyword.other.ts }
9595
end: (?=\{)
@@ -103,7 +103,7 @@ repository:
103103

104104
object-heritage-type:
105105
name: meta.object.heritage.parent.ts
106-
match: '(?:\s*([a-zA-Z_$][\w$]*)\b)'
106+
match: '(?:\b([a-zA-Z_$][\w$]*)\b)'
107107
captures:
108108
'1': { name: support.type.ts }
109109

TypeScript.tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@
10121012
<key>object-heritage</key>
10131013
<dict>
10141014
<key>begin</key>
1015-
<string>(?:\s*\b(extends|implements)\b)</string>
1015+
<string>(?:\b(extends|implements)\b)</string>
10161016
<key>beginCaptures</key>
10171017
<dict>
10181018
<key>1</key>
@@ -1064,7 +1064,7 @@
10641064
</dict>
10651065
</dict>
10661066
<key>match</key>
1067-
<string>(?:\s*([a-zA-Z_$][\w$]*)\b)</string>
1067+
<string>(?:\b([a-zA-Z_$][\w$]*)\b)</string>
10681068
<key>name</key>
10691069
<string>meta.object.heritage.parent.ts</string>
10701070
</dict>

TypeScriptReact.YAML-tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ repository:
9191

9292
object-heritage:
9393
name: meta.object.heritage.tsx
94-
begin: '(?:\s*\b(extends|implements)\b)'
94+
begin: '(?:\b(extends|implements)\b)'
9595
beginCaptures:
9696
'1': { name: keyword.other.tsx }
9797
end: (?=\{)
@@ -105,7 +105,7 @@ repository:
105105

106106
object-heritage-type:
107107
name: meta.object.heritage.parent.tsx
108-
match: '(?:\s*([a-zA-Z_$][\w$]*)\b)'
108+
match: '(?:\b([a-zA-Z_$][\w$]*)\b)'
109109
captures:
110110
'1': { name: support.type.tsx }
111111

TypeScriptReact.tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,7 @@
13781378
<key>object-heritage</key>
13791379
<dict>
13801380
<key>begin</key>
1381-
<string>(?:\s*\b(extends|implements)\b)</string>
1381+
<string>(?:\b(extends|implements)\b)</string>
13821382
<key>beginCaptures</key>
13831383
<dict>
13841384
<key>1</key>
@@ -1430,7 +1430,7 @@
14301430
</dict>
14311431
</dict>
14321432
<key>match</key>
1433-
<string>(?:\s*([a-zA-Z_$][\w$]*)\b)</string>
1433+
<string>(?:\b([a-zA-Z_$][\w$]*)\b)</string>
14341434
<key>name</key>
14351435
<string>meta.object.heritage.parent.tsx</string>
14361436
</dict>

tests/baselines/Issue89.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[4, 1]: source.ts
1010
[7, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
1111
[7, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts
12-
[7, 31]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts
12+
[7, 31]: source.ts meta.declaration.object.ts meta.object.heritage.ts
1313
[7, 34]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts
1414
[7, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts
1515
[7, 48]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts
@@ -18,10 +18,18 @@
1818
[12, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
1919
[12, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts
2020
[12, 28]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts
21-
[12, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts
21+
[12, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts
2222
[12, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts
2323
[12, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts
2424
[12, 51]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts
2525
[12, 56]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts
2626
[13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts
27-
[15, 1]: source.ts
27+
[15, 1]: source.ts
28+
[17, 1]: source.ts meta.declaration.object.ts storage.type.ts
29+
[17, 7]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
30+
[17, 17]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts
31+
[17, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts
32+
[17, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts
33+
[17, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts
34+
[18, 5]: source.ts meta.declaration.object.ts meta.object.body.ts
35+
[22, 20]: source.ts comment.block.ts

tests/cases/Issue89.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,11 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{
1313
^^
1414
}
1515
^^
16+
17+
^^class ^^className ^^extends ^^class1 ^^implements ^^class2 {
18+
^^
19+
}
20+
21+
/*
22+
Checking comments ^^
23+
*/

0 commit comments

Comments
 (0)