Skip to content

Commit bcb5d5f

Browse files
anubmatanubmat
committed
Changed the scope of implies operator
1 parent 3276501 commit bcb5d5f

File tree

6 files changed

+48
-15
lines changed

6 files changed

+48
-15
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ repository:
339339
name: meta.type.function.return.ts
340340
begin: '=>'
341341
beginCaptures:
342-
'0': { name: keyword.others.ts }
342+
'0': { name: keyword.operator.ts }
343343
end: (?=\s*[,\)\{=;>]|//|$)
344344
patterns:
345345
- include: '#type'
@@ -380,7 +380,7 @@ repository:
380380
variable-initializer:
381381
begin: (=)
382382
beginCaptures:
383-
'1': { name: keyword.others.ts }
383+
'1': { name: keyword.operator.comparison.ts }
384384
end: (?=$|[,);=])
385385
patterns:
386386
- include: '#expression'
@@ -403,6 +403,7 @@ repository:
403403
- include: '#block'
404404
- include: '#import-operator'
405405
- include: '#expression-operator'
406+
- include: '#imply-operator'
406407
- include: '#relational-operator'
407408
- include: '#arithmetic-operator'
408409
- include: '#logic-operator'
@@ -495,7 +496,11 @@ repository:
495496

496497
expression-operator:
497498
name: keyword.others.ts
498-
match: =>|\b(delete|in|instanceof|new|typeof|as|is|of)\b
499+
match: \b(delete|in|instanceof|new|typeof|as|is|of)\b
500+
501+
imply-operator:
502+
name: keyword.operator.ts
503+
match: =>
499504

500505
import-operator:
501506
name: keyword.control.import.include.ts

‎TypeScript.tmLanguage

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,10 @@
375375
<key>include</key>
376376
<string>#expression-operator</string>
377377
</dict>
378+
<dict>
379+
<key>include</key>
380+
<string>#imply-operator</string>
381+
</dict>
378382
<dict>
379383
<key>include</key>
380384
<string>#relational-operator</string>
@@ -416,7 +420,7 @@
416420
<key>expression-operator</key>
417421
<dict>
418422
<key>match</key>
419-
<string>=&gt;|\b(delete|in|instanceof|new|typeof|as|is|of)\b</string>
423+
<string>\b(delete|in|instanceof|new|typeof|as|is|of)\b</string>
420424
<key>name</key>
421425
<string>keyword.others.ts</string>
422426
</dict>
@@ -617,6 +621,13 @@
617621
</dict>
618622
</array>
619623
</dict>
624+
<key>imply-operator</key>
625+
<dict>
626+
<key>match</key>
627+
<string>=&gt;</string>
628+
<key>name</key>
629+
<string>keyword.operator.ts</string>
630+
</dict>
620631
<key>import-operator</key>
621632
<dict>
622633
<key>match</key>
@@ -1560,7 +1571,7 @@
15601571
<key>0</key>
15611572
<dict>
15621573
<key>name</key>
1563-
<string>keyword.others.ts</string>
1574+
<string>keyword.operator.ts</string>
15641575
</dict>
15651576
</dict>
15661577
<key>end</key>
@@ -1855,7 +1866,7 @@
18551866
<key>1</key>
18561867
<dict>
18571868
<key>name</key>
1858-
<string>keyword.others.ts</string>
1869+
<string>keyword.operator.comparison.ts</string>
18591870
</dict>
18601871
</dict>
18611872
<key>end</key>

‎TypeScriptReact.YAML-tmLanguage

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ repository:
341341
name: meta.type.function.return.tsx
342342
begin: '=>'
343343
beginCaptures:
344-
'0': { name: keyword.others.tsx }
344+
'0': { name: keyword.operator.tsx }
345345
end: (?=\s*[,\)\{=;>]|//|$)
346346
patterns:
347347
- include: '#type'
@@ -382,7 +382,7 @@ repository:
382382
variable-initializer:
383383
begin: (=)
384384
beginCaptures:
385-
'1': { name: keyword.others.tsx }
385+
'1': { name: keyword.operator.comparison.tsx }
386386
end: (?=$|[,);=])
387387
patterns:
388388
- include: '#expression'
@@ -405,6 +405,7 @@ repository:
405405
- include: '#block'
406406
- include: '#import-operator'
407407
- include: '#expression-operator'
408+
- include: '#imply-operator'
408409
- include: '#relational-operator'
409410
- include: '#arithmetic-operator'
410411
- include: '#logic-operator'
@@ -483,7 +484,11 @@ repository:
483484

484485
expression-operator:
485486
name: keyword.others.tsx
486-
match: =>|\b(delete|in|instanceof|new|typeof|as|is|of)\b
487+
match: \b(delete|in|instanceof|new|typeof|as|is|of)\b
488+
489+
imply-operator:
490+
name: keyword.operator.tsx
491+
match: =>
487492

488493
import-operator:
489494
name: keyword.control.import.include.tsx
@@ -494,6 +499,7 @@ repository:
494499
match: \*|/|\-\-|\-|\+\+|\+|%
495500

496501
relational-operator:
502+
497503
name: keyword.operator.comparison.tsx
498504
match: ===|==|=|!=|!==|<=|>=|<>|<|>
499505

‎TypeScriptReact.tmLanguage

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,10 @@
343343
<key>include</key>
344344
<string>#expression-operator</string>
345345
</dict>
346+
<dict>
347+
<key>include</key>
348+
<string>#imply-operator</string>
349+
</dict>
346350
<dict>
347351
<key>include</key>
348352
<string>#relational-operator</string>
@@ -384,7 +388,7 @@
384388
<key>expression-operator</key>
385389
<dict>
386390
<key>match</key>
387-
<string>=&gt;|\b(delete|in|instanceof|new|typeof|as|is|of)\b</string>
391+
<string>\b(delete|in|instanceof|new|typeof|as|is|of)\b</string>
388392
<key>name</key>
389393
<string>keyword.others.tsx</string>
390394
</dict>
@@ -585,6 +589,13 @@
585589
</dict>
586590
</array>
587591
</dict>
592+
<key>imply-operator</key>
593+
<dict>
594+
<key>match</key>
595+
<string>=&gt;</string>
596+
<key>name</key>
597+
<string>keyword.operator.tsx</string>
598+
</dict>
588599
<key>import-operator</key>
589600
<dict>
590601
<key>match</key>
@@ -1926,7 +1937,7 @@
19261937
<key>0</key>
19271938
<dict>
19281939
<key>name</key>
1929-
<string>keyword.others.tsx</string>
1940+
<string>keyword.operator.tsx</string>
19301941
</dict>
19311942
</dict>
19321943
<key>end</key>
@@ -2221,7 +2232,7 @@
22212232
<key>1</key>
22222233
<dict>
22232234
<key>name</key>
2224-
<string>keyword.others.tsx</string>
2235+
<string>keyword.operator.comparison.tsx</string>
22252236
</dict>
22262237
</dict>
22272238
<key>end</key>

‎tests/baselines/ArrowFunctionInsideTypeAssertion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
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
66
[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
7-
[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
7+
[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.operator.ts
88
[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
1313
[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
14-
[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
14+
[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.operator.ts
1515
[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/Issue63.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[3, 1]: source.ts meta.type.declaration.ts keyword.other.ts
66
[3, 14]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts
77
[3, 21]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts
8-
[3, 46]: source.ts meta.type.declaration.ts meta.type.function.return.ts keyword.others.ts
8+
[3, 46]: source.ts meta.type.declaration.ts meta.type.function.return.ts keyword.operator.ts
99
[3, 49]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts
1010
[5, 17]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts
1111
[5, 45]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts

0 commit comments

Comments
 (0)