Skip to content

Commit 44cc86b

Browse files
committed
Fixing Issues with object-heritage clause: Made tests more comprehensive, Replaced space characters with word breaks.
1 parent a6fa109 commit 44cc86b

File tree

5 files changed

+29
-9
lines changed

5 files changed

+29
-9
lines changed

TypeScript.YAML-tmLanguage

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

101101
object-heritage-type:
102102
name: meta.object.heritage.parent.ts
103-
match: '(?:\b([a-zA-Z_$][\w$]*)\b)'
103+
match: '(?:\s*([a-zA-Z_$][\w$]*)\b)'
104104
captures:
105105
'1': { name: storage.type.ts }
106106

TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@
10501050
</dict>
10511051
</dict>
10521052
<key>match</key>
1053-
<string>(?:\b([a-zA-Z_$][\w$]*)\b)</string>
1053+
<string>(?:\s*([a-zA-Z_$][\w$]*)\b)</string>
10541054
<key>name</key>
10551055
<string>meta.object.heritage.parent.ts</string>
10561056
</dict>

TypeScriptReact.YAML-tmLanguage

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

103103
object-heritage-type:
104104
name: meta.object.heritage.parent.tsx
105-
match: '(?:\b([a-zA-Z_$][\w$]*)\b)'
105+
match: '(?:\s*([a-zA-Z_$][\w$]*)\b)'
106106
captures:
107107
'1': { name: storage.type.tsx }
108108

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1416,7 +1416,7 @@
14161416
</dict>
14171417
</dict>
14181418
<key>match</key>
1419-
<string>(?:\b([a-zA-Z_$][\w$]*)\b)</string>
1419+
<string>(?:\s*([a-zA-Z_$][\w$]*)\b)</string>
14201420
<key>name</key>
14211421
<string>meta.object.heritage.parent.tsx</string>
14221422
</dict>

tests/baselines/Issue89.txt

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,27 @@
1+
[1, 8]: source.ts meta.declaration.object.ts storage.type.ts
12
[1, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
2-
[1, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts
3-
[1, 37]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts
4-
[1, 41]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts
5-
[1, 56]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts
3+
[1, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts
4+
[1, 27]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts
5+
[1, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts
6+
[1, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts
7+
[1, 47]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts
68
[2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts
7-
[4, 1]: source.ts
9+
[4, 1]: source.ts
10+
[7, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
11+
[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
13+
[7, 34]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts
14+
[7, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts
15+
[7, 48]: source.ts meta.declaration.object.ts meta.object.heritage.ts
16+
[8, 2]: source.ts meta.declaration.object.ts meta.object.body.ts
17+
[10, 1]: source.ts
18+
[12, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
19+
[12, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts
20+
[12, 28]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts
21+
[12, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts
22+
[12, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts
23+
[12, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts
24+
[12, 51]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts
25+
[12, 56]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts
26+
[13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts
27+
[15, 1]: source.ts

0 commit comments

Comments
 (0)