Skip to content

Commit 3276501

Browse files
anubmatanubmat
committed
Made tests more comprehensive and chenged scope of constructor
1 parent 86e9911 commit 3276501

File tree

8 files changed

+63
-21
lines changed

8 files changed

+63
-21
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ repository:
161161
'3': { name: storage.modifier.ts } # captures keyword (async)
162162
'4': { name: storage.type.property.ts } # captures keyword (get|set)
163163
'5': { name: keyword.operator.ts } # captures keyword (new)
164-
'6': { name: support.type.ts } # captures keyword (constructor)
164+
'6': { name: storage.type.ts } # captures keyword (constructor)
165165
'7': { name: entity.name.function.ts } # captures method name ([a-zA-Z_$][\.\w$]*)
166166
'8': { name: keyword.operator.ts } # captures (\??)
167167
end: '(?=\}|;|,)|(?<=\})'
@@ -182,7 +182,7 @@ repository:
182182
'3': { name: storage.modifier.ts } # captures keyword (async)
183183
'4': { name: storage.type.property.ts } # captures keyword (get|set)
184184
'5': { name: keyword.operator.ts } # captures keyword (new)
185-
'6': { name: support.type.ts } # captures keyword (constructor)
185+
'6': { name: storage.type.ts } # captures keyword (constructor)
186186
'7': { name: entity.name.function.ts } # captures method name ([a-zA-Z_$][\.\w$]*)
187187
'8': { name: keyword.operator.ts } # captures (\??)
188188

‎TypeScript.tmLanguage

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -752,12 +752,12 @@
752752
<key>5</key>
753753
<dict>
754754
<key>name</key>
755-
<string>keyword.others.ts</string>
755+
<string>keyword.operator.ts</string>
756756
</dict>
757757
<key>6</key>
758758
<dict>
759759
<key>name</key>
760-
<string>support.type.ts</string>
760+
<string>storage.type.ts</string>
761761
</dict>
762762
<key>7</key>
763763
<dict>
@@ -767,7 +767,7 @@
767767
<key>8</key>
768768
<dict>
769769
<key>name</key>
770-
<string>keyword.others.ts</string>
770+
<string>keyword.operator.ts</string>
771771
</dict>
772772
</dict>
773773
<key>end</key>
@@ -829,12 +829,12 @@
829829
<key>5</key>
830830
<dict>
831831
<key>name</key>
832-
<string>keyword.others.ts</string>
832+
<string>keyword.operator.ts</string>
833833
</dict>
834834
<key>6</key>
835835
<dict>
836836
<key>name</key>
837-
<string>support.type.ts</string>
837+
<string>storage.type.ts</string>
838838
</dict>
839839
<key>7</key>
840840
<dict>
@@ -844,7 +844,7 @@
844844
<key>8</key>
845845
<dict>
846846
<key>name</key>
847-
<string>keyword.others.ts</string>
847+
<string>keyword.operator.ts</string>
848848
</dict>
849849
</dict>
850850
<key>match</key>

‎TypeScriptReact.YAML-tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ repository:
163163
'3': { name: storage.modifier.tsx } # captures keyword (async)
164164
'4': { name: storage.type.property.tsx } # captures keyword (get|set)
165165
'5': { name: keyword.operator.tsx } # captures keyword (new)
166-
'6': { name: support.type.tsx } # captures keyword (constructor)
166+
'6': { name: storage.type.tsx } # captures keyword (constructor)
167167
'7': { name: entity.name.function.tsx } # captures method name ([a-zA-Z_$][\.\w$]*)
168168
'8': { name: keyword.operator.tsx } # captures (\??)
169169
end: '(?=\}|;|,)|(?<=\})'
@@ -184,7 +184,7 @@ repository:
184184
'3': { name: storage.modifier.tsx } # captures keyword (async)
185185
'4': { name: storage.type.property.tsx } # captures keyword (get|set)
186186
'5': { name: keyword.operator.tsx } # captures keyword (new)
187-
'6': { name: support.type.tsx } # captures keyword (constructor)
187+
'6': { name: storage.type.tsx } # captures keyword (constructor)
188188
'7': { name: entity.name.function.tsx } # captures method name ([a-zA-Z_$][\.\w$]*)
189189
'8': { name: keyword.operator.tsx } # captures (\??)
190190

‎TypeScriptReact.tmLanguage

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,12 +1118,12 @@
11181118
<key>5</key>
11191119
<dict>
11201120
<key>name</key>
1121-
<string>keyword.others.tsx</string>
1121+
<string>keyword.operator.tsx</string>
11221122
</dict>
11231123
<key>6</key>
11241124
<dict>
11251125
<key>name</key>
1126-
<string>support.type.tsx</string>
1126+
<string>storage.type.tsx</string>
11271127
</dict>
11281128
<key>7</key>
11291129
<dict>
@@ -1133,7 +1133,7 @@
11331133
<key>8</key>
11341134
<dict>
11351135
<key>name</key>
1136-
<string>keyword.others.tsx</string>
1136+
<string>keyword.operator.tsx</string>
11371137
</dict>
11381138
</dict>
11391139
<key>end</key>
@@ -1195,12 +1195,12 @@
11951195
<key>5</key>
11961196
<dict>
11971197
<key>name</key>
1198-
<string>keyword.others.tsx</string>
1198+
<string>keyword.operator.tsx</string>
11991199
</dict>
12001200
<key>6</key>
12011201
<dict>
12021202
<key>name</key>
1203-
<string>support.type.tsx</string>
1203+
<string>storage.type.tsx</string>
12041204
</dict>
12051205
<key>7</key>
12061206
<dict>
@@ -1210,7 +1210,7 @@
12101210
<key>8</key>
12111211
<dict>
12121212
<key>name</key>
1213-
<string>keyword.others.tsx</string>
1213+
<string>keyword.operator.tsx</string>
12141214
</dict>
12151215
</dict>
12161216
<key>match</key>

‎tests/baselines/Issue191.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[2, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts support.type.ts
1+
[2, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts
22
[2, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts
33
[2, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts
44
[2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts
@@ -15,7 +15,7 @@
1515
[6, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts
1616
[11, 13]: source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts
1717
[11, 16]: source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts
18-
[12, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts support.type.ts
18+
[12, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts
1919
[12, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts
2020
[12, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts
2121
[12, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts

‎tests/baselines/Issue32.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[12, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts
77
[13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts
88
[14, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts
9-
[16, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts support.type.ts
9+
[16, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts
1010
[16, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts
1111
[16, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts
1212
[16, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts

‎tests/baselines/Issue37.txt

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,26 @@
2424
[36, 5]: source.ts meta.block.ts meta.function.ts storage.type.ts
2525
[41, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.others.ts
2626
[43, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts
27-
[44, 1]: source.ts keyword.others.ts
27+
[44, 1]: source.ts keyword.others.ts
28+
[51, 1]: source.ts storage.type.ts
29+
[51, 8]: source.ts
30+
[52, 5]: source.ts meta.block.ts meta.declaration.object.ts storage.type.ts
31+
[52, 12]: source.ts meta.block.ts meta.declaration.object.ts storage.type.ts
32+
[52, 18]: source.ts meta.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
33+
[53, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts
34+
[53, 16]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts
35+
[53, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts
36+
[55, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts
37+
[55, 21]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts
38+
[55, 29]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts
39+
[56, 13]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts
40+
[56, 27]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
41+
[57, 17]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.others.ts
42+
[57, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
43+
[57, 31]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts
44+
[57, 35]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.single.ts
45+
[57, 47]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
46+
[57, 54]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.others.ts
47+
[57, 65]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
48+
[58, 14]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts
49+
[65, 1]: source.ts comment.block.ts

‎tests/cases/Issue37.ts

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,26 @@ var m: ^^typeof M = M;
4343
var adder = ^^new Adder(3, 4);
4444
^^delete (adder)
4545

46-
var s = typeof {}
46+
var s = typeof {}git
4747
interface I {}
4848
var j: I = {}
49+
50+
51+
^^module ^^Body {
52+
^^export ^^class ^^Cell {
53+
^^public ^^parent: ^^Cell;
54+
55+
^^constructor(^^parent: ^^Cell) {
56+
^^this.parent = ^^parent;
57+
if (^^typeof ^^parent ^^=== ^^'object' || ^^parent ^^instanceof ^^Error) {
58+
^^
59+
}
60+
}
61+
}
62+
}
63+
64+
/*
65+
^^
66+
End of file
67+
68+
*/

0 commit comments

Comments
 (0)