Skip to content

Commit 86e9911

Browse files
anubmatanubmat
committed
Updated to most recent origin
2 parents 7813b5e + 9a1c040 commit 86e9911

11 files changed

+177
-63
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -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

@@ -154,15 +154,16 @@ repository:
154154

155155
method-declaration:
156156
name: meta.method.declaration.ts
157-
begin: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
157+
begin: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
158158
beginCaptures:
159-
'1': { name: storage.modifier.ts }
160-
'2': { name: storage.modifier.ts }
161-
'3': { name: storage.modifier.ts }
162-
'4': { name: storage.type.property.ts }
163-
'5': { name: keyword.others.ts }
164-
'6': { name: entity.name.function.ts }
165-
'7': { name: keyword.others.ts }
159+
'1': { name: storage.modifier.ts } # captures keyword (abstract)
160+
'2': { name: storage.modifier.ts } # captures keyword (public or private or protected)
161+
'3': { name: storage.modifier.ts } # captures keyword (async)
162+
'4': { name: storage.type.property.ts } # captures keyword (get|set)
163+
'5': { name: keyword.operator.ts } # captures keyword (new)
164+
'6': { name: support.type.ts } # captures keyword (constructor)
165+
'7': { name: entity.name.function.ts } # captures method name ([a-zA-Z_$][\.\w$]*)
166+
'8': { name: keyword.operator.ts } # captures (\??)
166167
end: '(?=\}|;|,)|(?<=\})'
167168
patterns:
168169
- include: '#comment'
@@ -174,15 +175,16 @@ repository:
174175

175176
method-overload-declaration:
176177
name: meta.method.overload.declaration.ts
177-
match: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
178+
match: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
178179
captures:
179-
'1': { name: storage.modifier.ts }
180-
'2': { name: storage.modifier.ts }
181-
'3': { name: storage.modifier.ts }
182-
'4': { name: storage.type.property.ts }
183-
'5': { name: keyword.others.ts }
184-
'6': { name: entity.name.function.ts }
185-
'7': { name: keyword.others.ts }
180+
'1': { name: storage.modifier.ts } # captures keyword (abstract)
181+
'2': { name: storage.modifier.ts } # captures keyword (public or private or protected)
182+
'3': { name: storage.modifier.ts } # captures keyword (async)
183+
'4': { name: storage.type.property.ts } # captures keyword (get|set)
184+
'5': { name: keyword.operator.ts } # captures keyword (new)
185+
'6': { name: support.type.ts } # captures keyword (constructor)
186+
'7': { name: entity.name.function.ts } # captures method name ([a-zA-Z_$][\.\w$]*)
187+
'8': { name: keyword.operator.ts } # captures (\??)
186188

187189
indexer-declaration:
188190
name: meta.indexer.declaration.ts
@@ -637,7 +639,7 @@ repository:
637639

638640
numeric-literal:
639641
name: constant.numeric.ts
640-
match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b
642+
match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|(([0-9]+(\.[0-9]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b
641643

642644
boolean-literal:
643645
name: constant.language.boolean.ts

‎TypeScript.tmLanguage

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@
726726
<key>method-declaration</key>
727727
<dict>
728728
<key>begin</key>
729-
<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
729+
<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
730730
<key>beginCaptures</key>
731731
<dict>
732732
<key>1</key>
@@ -757,9 +757,14 @@
757757
<key>6</key>
758758
<dict>
759759
<key>name</key>
760-
<string>entity.name.function.ts</string>
760+
<string>support.type.ts</string>
761761
</dict>
762762
<key>7</key>
763+
<dict>
764+
<key>name</key>
765+
<string>entity.name.function.ts</string>
766+
</dict>
767+
<key>8</key>
763768
<dict>
764769
<key>name</key>
765770
<string>keyword.others.ts</string>
@@ -829,16 +834,21 @@
829834
<key>6</key>
830835
<dict>
831836
<key>name</key>
832-
<string>entity.name.function.ts</string>
837+
<string>support.type.ts</string>
833838
</dict>
834839
<key>7</key>
840+
<dict>
841+
<key>name</key>
842+
<string>entity.name.function.ts</string>
843+
</dict>
844+
<key>8</key>
835845
<dict>
836846
<key>name</key>
837847
<string>keyword.others.ts</string>
838848
</dict>
839849
</dict>
840850
<key>match</key>
841-
<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
851+
<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
842852
<key>name</key>
843853
<string>meta.method.overload.declaration.ts</string>
844854
</dict>
@@ -880,7 +890,7 @@
880890
<key>numeric-literal</key>
881891
<dict>
882892
<key>match</key>
883-
<string>\b(?&lt;=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b</string>
893+
<string>\b(?&lt;=[^$])((0(x|X)[0-9a-fA-F]+)|(([0-9]+(\.[0-9]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b</string>
884894
<key>name</key>
885895
<string>constant.numeric.ts</string>
886896
</dict>
@@ -1065,7 +1075,7 @@
10651075
</dict>
10661076
</dict>
10671077
<key>match</key>
1068-
<string>(?:\s*([a-zA-Z_$][\w$]*)\b)</string>
1078+
<string>(?:\b([a-zA-Z_$][\w$]*)\b)</string>
10691079
<key>name</key>
10701080
<string>meta.object.heritage.parent.ts</string>
10711081
</dict>

‎TypeScriptReact.YAML-tmLanguage

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -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

@@ -156,15 +156,16 @@ repository:
156156

157157
method-declaration:
158158
name: meta.method.declaration.tsx
159-
begin: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
160-
beginCaptures:
161-
'1': { name: storage.modifier.tsx }
162-
'2': { name: storage.modifier.tsx }
163-
'3': { name: storage.modifier.tsx }
164-
'4': { name: storage.type.property.tsx }
165-
'5': { name: keyword.others.tsx }
166-
'6': { name: entity.name.function.tsx }
167-
'7': { name: keyword.others.tsx }
159+
begin: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
160+
beginCaptures:
161+
'1': { name: storage.modifier.tsx } # captures keyword (abstract)
162+
'2': { name: storage.modifier.tsx } # captures keyword (public or private or protected)
163+
'3': { name: storage.modifier.tsx } # captures keyword (async)
164+
'4': { name: storage.type.property.tsx } # captures keyword (get|set)
165+
'5': { name: keyword.operator.tsx } # captures keyword (new)
166+
'6': { name: support.type.tsx } # captures keyword (constructor)
167+
'7': { name: entity.name.function.tsx } # captures method name ([a-zA-Z_$][\.\w$]*)
168+
'8': { name: keyword.operator.tsx } # captures (\??)
168169
end: '(?=\}|;|,)|(?<=\})'
169170
patterns:
170171
- include: '#comment'
@@ -176,15 +177,16 @@ repository:
176177

177178
method-overload-declaration:
178179
name: meta.method.overload.declaration.tsx
179-
match: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
180+
match: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)'
180181
captures:
181-
'1': { name: storage.modifier.tsx }
182-
'2': { name: storage.modifier.tsx }
183-
'3': { name: storage.modifier.tsx }
184-
'4': { name: storage.type.property.tsx }
185-
'5': { name: keyword.others.tsx }
186-
'6': { name: entity.name.function.tsx }
187-
'7': { name: keyword.others.tsx }
182+
'1': { name: storage.modifier.tsx } # captures keyword (abstract)
183+
'2': { name: storage.modifier.tsx } # captures keyword (public or private or protected)
184+
'3': { name: storage.modifier.tsx } # captures keyword (async)
185+
'4': { name: storage.type.property.tsx } # captures keyword (get|set)
186+
'5': { name: keyword.operator.tsx } # captures keyword (new)
187+
'6': { name: support.type.tsx } # captures keyword (constructor)
188+
'7': { name: entity.name.function.tsx } # captures method name ([a-zA-Z_$][\.\w$]*)
189+
'8': { name: keyword.operator.tsx } # captures (\??)
188190

189191
indexer-declaration:
190192
name: meta.indexer.declaration.tsx
@@ -625,7 +627,7 @@ repository:
625627

626628
numeric-literal:
627629
name: constant.numeric.tsx
628-
match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b
630+
match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|(([0-9]+(\.[0-9]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b
629631

630632
boolean-literal:
631633
name: constant.language.boolean.tsx

‎TypeScriptReact.tmLanguage

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,7 @@
10921092
<key>method-declaration</key>
10931093
<dict>
10941094
<key>begin</key>
1095-
<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
1095+
<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
10961096
<key>beginCaptures</key>
10971097
<dict>
10981098
<key>1</key>
@@ -1123,9 +1123,14 @@
11231123
<key>6</key>
11241124
<dict>
11251125
<key>name</key>
1126-
<string>entity.name.function.tsx</string>
1126+
<string>support.type.tsx</string>
11271127
</dict>
11281128
<key>7</key>
1129+
<dict>
1130+
<key>name</key>
1131+
<string>entity.name.function.tsx</string>
1132+
</dict>
1133+
<key>8</key>
11291134
<dict>
11301135
<key>name</key>
11311136
<string>keyword.others.tsx</string>
@@ -1195,16 +1200,21 @@
11951200
<key>6</key>
11961201
<dict>
11971202
<key>name</key>
1198-
<string>entity.name.function.tsx</string>
1203+
<string>support.type.tsx</string>
11991204
</dict>
12001205
<key>7</key>
1206+
<dict>
1207+
<key>name</key>
1208+
<string>entity.name.function.tsx</string>
1209+
</dict>
1210+
<key>8</key>
12011211
<dict>
12021212
<key>name</key>
12031213
<string>keyword.others.tsx</string>
12041214
</dict>
12051215
</dict>
12061216
<key>match</key>
1207-
<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
1217+
<string>\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\&lt;)</string>
12081218
<key>name</key>
12091219
<string>meta.method.overload.declaration.tsx</string>
12101220
</dict>
@@ -1246,7 +1256,7 @@
12461256
<key>numeric-literal</key>
12471257
<dict>
12481258
<key>match</key>
1249-
<string>\b(?&lt;=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b</string>
1259+
<string>\b(?&lt;=[^$])((0(x|X)[0-9a-fA-F]+)|(([0-9]+(\.[0-9]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b</string>
12501260
<key>name</key>
12511261
<string>constant.numeric.tsx</string>
12521262
</dict>
@@ -1431,7 +1441,7 @@
14311441
</dict>
14321442
</dict>
14331443
<key>match</key>
1434-
<string>(?:\s*([a-zA-Z_$][\w$]*)\b)</string>
1444+
<string>(?:\b([a-zA-Z_$][\w$]*)\b)</string>
14351445
<key>name</key>
14361446
<string>meta.object.heritage.parent.tsx</string>
14371447
</dict>

‎tests/baselines/Issue110.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[1, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
2+
[2, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
3+
[3, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
4+
[4, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
5+
[5, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
6+
[6, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
7+
[7, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
8+
[8, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
9+
[9, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
10+
[10, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
11+
[11, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
12+
[12, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
13+
[13, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
14+
[14, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
15+
[15, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
16+
[16, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
17+
[16, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
18+
[19, 1]: source.ts comment.block.ts

‎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 entity.name.function.ts
1+
[2, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts support.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 entity.name.function.ts
18+
[12, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts support.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: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[5, 1]: source.ts meta.declaration.object.ts storage.type.ts
2+
[5, 11]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
3+
[6, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts
4+
[7, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts
5+
[11, 1]: source.ts meta.declaration.object.ts storage.type.ts
6+
[12, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts
7+
[13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts
8+
[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
10+
[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
11+
[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
12+
[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
13+
[16, 28]: 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
14+
[18, 1]: source.ts

0 commit comments

Comments
 (0)