Skip to content

Commit 7813b5e

Browse files
anubmatanubmat
committed
Fetched most recent version of origin and resolved conflicts
2 parents e21186a + 014ea4c commit 7813b5e

17 files changed

+117
-65
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ patterns:
1111
repository:
1212
var-expr:
1313
name: meta.var.expr.ts
14-
begin: (?<!\()\s*\b(var|let|const(?!\s+enum)\b)
14+
begin: (?<!\()\s*\b(var|let|const(?!\s+enum))\b
1515
beginCaptures:
1616
'1': { name: storage.type.ts }
1717
end: (?=$|;)
@@ -48,7 +48,7 @@ repository:
4848
begin: \b(type)\b\s+([a-zA-Z_$][\w$]*)\s*
4949
beginCaptures:
5050
'1': { name: keyword.other.ts }
51-
'2': { name: storage.type.ts }
51+
'2': { name: support.type.ts }
5252
end: (?=$|[,);>]|var|type|function|class|interface)
5353
patterns:
5454
- include: '#type-parameters'
@@ -105,7 +105,7 @@ repository:
105105
name: meta.object.heritage.parent.ts
106106
match: '(?:\s*([a-zA-Z_$][\w$]*)\b)'
107107
captures:
108-
'1': { name: storage.type.ts }
108+
'1': { name: support.type.ts }
109109

110110
object-body:
111111
name: meta.object.body.ts
@@ -308,7 +308,7 @@ repository:
308308
name: meta.type.primitive.ts
309309
match: '\b(string|number|boolean|symbol|any|void)\b'
310310
captures:
311-
'1': { name: storage.type.ts }
311+
'1': { name: support.type.ts }
312312

313313
# Parenthesis can contain either types and function parameters
314314
# (number | string) or (param: number, param2: string)
@@ -406,6 +406,7 @@ repository:
406406
- include: '#logic-operator'
407407
- include: '#assignment-operator'
408408
- include: '#storage-keyword'
409+
- include: '#type-primitive'
409410
- include: '#function-call'
410411
- include: '#case-clause'
411412
- include: '#control-statement'
@@ -516,7 +517,7 @@ repository:
516517

517518
storage-keyword:
518519
name: storage.type.ts
519-
match: \b(number|boolean|string|any|var|let|function|const|module|namespace|void|export)\b
520+
match: \b(var|let|function|const|module|namespace|void|export)\b
520521

521522
paren-expression:
522523
begin: \(

‎TypeScript.tmLanguage

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,10 @@
395395
<key>include</key>
396396
<string>#storage-keyword</string>
397397
</dict>
398+
<dict>
399+
<key>include</key>
400+
<string>#type-primitive</string>
401+
</dict>
398402
<dict>
399403
<key>include</key>
400404
<string>#function-call</string>
@@ -1057,7 +1061,7 @@
10571061
<key>1</key>
10581062
<dict>
10591063
<key>name</key>
1060-
<string>storage.type.ts</string>
1064+
<string>support.type.ts</string>
10611065
</dict>
10621066
</dict>
10631067
<key>match</key>
@@ -1252,7 +1256,7 @@
12521256
<key>storage-keyword</key>
12531257
<dict>
12541258
<key>match</key>
1255-
<string>\b(number|boolean|string|any|var|let|function|const|module|namespace|void|export)\b</string>
1259+
<string>\b(var|let|function|const|module|namespace|void|export)\b</string>
12561260
<key>name</key>
12571261
<string>storage.type.ts</string>
12581262
</dict>
@@ -1512,7 +1516,7 @@
15121516
<key>2</key>
15131517
<dict>
15141518
<key>name</key>
1515-
<string>storage.type.ts</string>
1519+
<string>support.type.ts</string>
15161520
</dict>
15171521
</dict>
15181522
<key>end</key>
@@ -1717,7 +1721,7 @@
17171721
<key>1</key>
17181722
<dict>
17191723
<key>name</key>
1720-
<string>storage.type.ts</string>
1724+
<string>support.type.ts</string>
17211725
</dict>
17221726
</dict>
17231727
<key>match</key>
@@ -1771,7 +1775,7 @@
17711775
<key>var-expr</key>
17721776
<dict>
17731777
<key>begin</key>
1774-
<string>(?&lt;!\()\s*\b(var|let|const(?!\s+enum)\b)</string>
1778+
<string>(?&lt;!\()\s*\b(var|let|const(?!\s+enum))\b</string>
17751779
<key>beginCaptures</key>
17761780
<dict>
17771781
<key>1</key>

‎TypeScriptReact.YAML-tmLanguage

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ patterns:
1313
repository:
1414
var-expr:
1515
name: meta.var.expr.tsx
16-
begin: (?<!\()\s*\b(var|let|const(?!\s+enum)\b)
16+
begin: (?<!\()\s*\b(var|let|const(?!\s+enum))\b
1717
beginCaptures:
1818
'1': { name: storage.type.tsx }
1919
end: (?=$|;)
@@ -50,7 +50,7 @@ repository:
5050
begin: \b(type)\b\s+([a-zA-Z_$][\w$]*)\s*
5151
beginCaptures:
5252
'1': { name: keyword.other.tsx }
53-
'2': { name: storage.type.tsx }
53+
'2': { name: support.type.tsx }
5454
end: (?=$|[,);>]|var|type|function|class|interface)
5555
patterns:
5656
- include: '#type-parameters'
@@ -107,7 +107,7 @@ repository:
107107
name: meta.object.heritage.parent.tsx
108108
match: '(?:\s*([a-zA-Z_$][\w$]*)\b)'
109109
captures:
110-
'1': { name: storage.type.tsx }
110+
'1': { name: support.type.tsx }
111111

112112
object-body:
113113
name: meta.object.body.tsx
@@ -310,7 +310,7 @@ repository:
310310
name: meta.type.primitive.tsx
311311
match: '\b(string|number|boolean|symbol|any|void)\b'
312312
captures:
313-
'1': { name: storage.type.tsx }
313+
'1': { name: support.type.tsx }
314314

315315
# Parenthesis can contain either types and function parameters
316316
# (number | string) or (param: number, param2: string)
@@ -408,6 +408,7 @@ repository:
408408
- include: '#logic-operator'
409409
- include: '#assignment-operator'
410410
- include: '#storage-keyword'
411+
- include: '#type-primitive'
411412
- include: '#function-call'
412413
- include: '#case-clause'
413414
- include: '#control-statement'
@@ -504,7 +505,7 @@ repository:
504505

505506
storage-keyword:
506507
name: storage.type.tsx
507-
match: \b(number|boolean|string|any|var|let|function|const|module|namespace|void|export)\b
508+
match: \b(var|let|function|const|module|namespace|void|export)\b
508509

509510
paren-expression:
510511
begin: \(

‎TypeScriptReact.tmLanguage

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,10 @@
363363
<key>include</key>
364364
<string>#storage-keyword</string>
365365
</dict>
366+
<dict>
367+
<key>include</key>
368+
<string>#type-primitive</string>
369+
</dict>
366370
<dict>
367371
<key>include</key>
368372
<string>#function-call</string>
@@ -1423,7 +1427,7 @@
14231427
<key>1</key>
14241428
<dict>
14251429
<key>name</key>
1426-
<string>storage.type.tsx</string>
1430+
<string>support.type.tsx</string>
14271431
</dict>
14281432
</dict>
14291433
<key>match</key>
@@ -1618,7 +1622,7 @@
16181622
<key>storage-keyword</key>
16191623
<dict>
16201624
<key>match</key>
1621-
<string>\b(number|boolean|string|any|var|let|function|const|module|namespace|void|export)\b</string>
1625+
<string>\b(var|let|function|const|module|namespace|void|export)\b</string>
16221626
<key>name</key>
16231627
<string>storage.type.tsx</string>
16241628
</dict>
@@ -1878,7 +1882,7 @@
18781882
<key>2</key>
18791883
<dict>
18801884
<key>name</key>
1881-
<string>storage.type.tsx</string>
1885+
<string>support.type.tsx</string>
18821886
</dict>
18831887
</dict>
18841888
<key>end</key>
@@ -2083,7 +2087,7 @@
20832087
<key>1</key>
20842088
<dict>
20852089
<key>name</key>
2086-
<string>storage.type.tsx</string>
2090+
<string>support.type.tsx</string>
20872091
</dict>
20882092
</dict>
20892093
<key>match</key>
@@ -2137,7 +2141,7 @@
21372141
<key>var-expr</key>
21382142
<dict>
21392143
<key>begin</key>
2140-
<string>(?&lt;!\()\s*\b(var|let|const(?!\s+enum)\b)</string>
2144+
<string>(?&lt;!\()\s*\b(var|let|const(?!\s+enum))\b</string>
21412145
<key>beginCaptures</key>
21422146
<dict>
21432147
<key>1</key>

‎tests/baselines/ArrowFunctionInsideTypeAssertion.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
[4, 21]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts
44
[4, 30]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts
55
[4, 43]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts
6-
[4, 57]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts storage.type.ts
6+
[4, 57]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts
77
[4, 65]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts keyword.others.ts
8-
[4, 68]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts storage.type.ts
8+
[4, 68]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts
99
[4, 73]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts constant.language.null.ts
1010
[17, 17]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts
1111
[17, 18]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts
1212
[17, 19]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts
13-
[17, 22]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts storage.type.ts
13+
[17, 22]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts
1414
[17, 30]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts keyword.others.ts
15-
[17, 33]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts storage.type.ts
15+
[17, 33]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts
1616
[17, 39]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts
1717
[17, 41]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts

‎tests/baselines/Issue149.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[1, 1]: source.ts meta.function.ts storage.type.ts
22
[1, 17]: source.ts meta.function.ts entity.name.function.ts
3-
[1, 23]: source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts storage.type.ts
3+
[1, 23]: source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts
44
[1, 32]: source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts
55
[1, 41]: source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.name.ts
66
[2, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts

‎tests/baselines/Issue156.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts
22
[2, 6]: 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
3-
[2, 10]: 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 storage.type.ts
3+
[2, 10]: 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
44
[2, 19]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts
55
[2, 23]: 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
6-
[2, 27]: 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 storage.type.ts
6+
[2, 27]: 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
77
[4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts

‎tests/baselines/Issue191.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[2, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.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
4-
[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 storage.type.ts
4+
[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
55
[3, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts
6-
[3, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts storage.type.ts
6+
[3, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts
77
[3, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts
88
[4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts
99
[4, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts
@@ -18,9 +18,9 @@
1818
[12, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.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
21-
[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 storage.type.ts
21+
[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
2222
[13, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts
23-
[13, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts storage.type.ts
23+
[13, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts
2424
[13, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts
2525
[14, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts
2626
[14, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts

0 commit comments

Comments
 (0)