Skip to content

Commit b7a1912

Browse files
sheetalkamatsheetalkamat
committed
Add the expression scope to the keyword.operator to be colored as keyword
1 parent fea3b25 commit b7a1912

14 files changed

+47
-67
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ repository:
698698
- include: '#type'
699699

700700
type-predicate-operator:
701-
name: keyword.operator.is.ts
701+
name: keyword.operator.expression.is.ts
702702
match: (?<!\.|\$)\bis\b(?!\$)
703703

704704
type-annotation:
@@ -1351,18 +1351,18 @@ repository:
13511351
patterns:
13521352
- name: keyword.control.flow.ts
13531353
match: (?<!\.|\$)\b(await)\b(?!\$)
1354-
- name: keyword.operator.delete.ts
1354+
- name: keyword.operator.expression.delete.ts
13551355
match: (?<!\.|\$)\bdelete\b(?!\$)
1356-
- name: keyword.operator.in.ts
1356+
- name: keyword.operator.expression.in.ts
13571357
match: (?<!\.|\$)\bin\b(?!\$)
1358-
- name: keyword.operator.of.ts
1358+
- name: keyword.operator.expression.of.ts
13591359
match: (?<!\.|\$)\bof\b(?!\$)
1360-
- name: keyword.operator.instanceof.ts
1360+
- name: keyword.operator.expression.instanceof.ts
13611361
match: (?<!\.|\$)\binstanceof\b(?!\$)
13621362
- name: keyword.operator.new.ts
13631363
match: (?<!\.|\$)\bnew\b(?!\$)
13641364
- include: '#typeof-operator'
1365-
- name: keyword.operator.void.ts
1365+
- name: keyword.operator.expression.void.ts
13661366
match: (?<!\.|\$)\bvoid\b(?!\$)
13671367
- begin: (?<!\.|\$)\bas\b(?!\$)
13681368
beginCaptures:
@@ -1396,7 +1396,7 @@ repository:
13961396
match: '%|\*|/|-|\+'
13971397

13981398
typeof-operator:
1399-
name: keyword.operator.typeof.ts
1399+
name: keyword.operator.expression.typeof.ts
14001400
match: (?<!\.|\$)\btypeof\b(?!\$)
14011401

14021402
arrow-function:

‎TypeScript.YAML-tmTheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ name: TypeScript
55
uuid: ef98eb90-bf9b-11e4-bb52-0800200c9a66
66

77
settings:
8-
- scope: storage.modifier, storage.type, keyword.control, keyword.other.ts, keyword.generator.asterisk, punctuation.definition.template-expression
9-
settings: { vsclassificationtype: keyword }
10-
- scope: keyword.operator.new.ts, keyword.operator.delete.ts, keyword.operator.in.ts, keyword.operator.of.ts, keyword.operator.instanceof.ts, keyword.operator.typeof.ts, keyword.operator.void.ts, keyword.control.as.ts, keyword.operator.is.ts
8+
- scope: storage.modifier, storage.type, keyword.control, keyword.other.ts, keyword.operator.expression, keyword.operator.new, keyword.generator.asterisk, punctuation.definition.template-expression
119
settings: { vsclassificationtype: keyword }
1210
- scope: support.type, constant.language, variable.language
1311
settings: { vsclassificationtype: keyword }

‎TypeScript.tmLanguage

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2289,7 +2289,7 @@
22892289
<key>type-predicate-operator</key>
22902290
<dict>
22912291
<key>name</key>
2292-
<string>keyword.operator.is.ts</string>
2292+
<string>keyword.operator.expression.is.ts</string>
22932293
<key>match</key>
22942294
<string>(?&lt;!\.|\$)\bis\b(?!\$)</string>
22952295
</dict>
@@ -3793,25 +3793,25 @@
37933793
</dict>
37943794
<dict>
37953795
<key>name</key>
3796-
<string>keyword.operator.delete.ts</string>
3796+
<string>keyword.operator.expression.delete.ts</string>
37973797
<key>match</key>
37983798
<string>(?&lt;!\.|\$)\bdelete\b(?!\$)</string>
37993799
</dict>
38003800
<dict>
38013801
<key>name</key>
3802-
<string>keyword.operator.in.ts</string>
3802+
<string>keyword.operator.expression.in.ts</string>
38033803
<key>match</key>
38043804
<string>(?&lt;!\.|\$)\bin\b(?!\$)</string>
38053805
</dict>
38063806
<dict>
38073807
<key>name</key>
3808-
<string>keyword.operator.of.ts</string>
3808+
<string>keyword.operator.expression.of.ts</string>
38093809
<key>match</key>
38103810
<string>(?&lt;!\.|\$)\bof\b(?!\$)</string>
38113811
</dict>
38123812
<dict>
38133813
<key>name</key>
3814-
<string>keyword.operator.instanceof.ts</string>
3814+
<string>keyword.operator.expression.instanceof.ts</string>
38153815
<key>match</key>
38163816
<string>(?&lt;!\.|\$)\binstanceof\b(?!\$)</string>
38173817
</dict>
@@ -3827,7 +3827,7 @@
38273827
</dict>
38283828
<dict>
38293829
<key>name</key>
3830-
<string>keyword.operator.void.ts</string>
3830+
<string>keyword.operator.expression.void.ts</string>
38313831
<key>match</key>
38323832
<string>(?&lt;!\.|\$)\bvoid\b(?!\$)</string>
38333833
</dict>
@@ -3929,7 +3929,7 @@
39293929
<key>typeof-operator</key>
39303930
<dict>
39313931
<key>name</key>
3932-
<string>keyword.operator.typeof.ts</string>
3932+
<string>keyword.operator.expression.typeof.ts</string>
39333933
<key>match</key>
39343934
<string>(?&lt;!\.|\$)\btypeof\b(?!\$)</string>
39353935
</dict>

‎TypeScript.tmTheme

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,7 @@
1010
<array>
1111
<dict>
1212
<key>scope</key>
13-
<string>storage.modifier, storage.type, keyword.control, keyword.other.ts, keyword.generator.asterisk, punctuation.definition.template-expression</string>
14-
<key>settings</key>
15-
<dict>
16-
<key>vsclassificationtype</key>
17-
<string>keyword</string>
18-
</dict>
19-
</dict>
20-
<dict>
21-
<key>scope</key>
22-
<string>keyword.operator.new.ts, keyword.operator.delete.ts, keyword.operator.in.ts, keyword.operator.of.ts, keyword.operator.instanceof.ts, keyword.operator.typeof.ts, keyword.operator.void.ts, keyword.control.as.ts, keyword.operator.is.ts</string>
13+
<string>storage.modifier, storage.type, keyword.control, keyword.other.ts, keyword.operator.expression, keyword.operator.new, keyword.generator.asterisk, punctuation.definition.template-expression</string>
2314
<key>settings</key>
2415
<dict>
2516
<key>vsclassificationtype</key>

‎TypeScriptReact.tmLanguage

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2293,7 +2293,7 @@
22932293
<key>type-predicate-operator</key>
22942294
<dict>
22952295
<key>name</key>
2296-
<string>keyword.operator.is.tsx</string>
2296+
<string>keyword.operator.expression.is.tsx</string>
22972297
<key>match</key>
22982298
<string>(?&lt;!\.|\$)\bis\b(?!\$)</string>
22992299
</dict>
@@ -3775,25 +3775,25 @@
37753775
</dict>
37763776
<dict>
37773777
<key>name</key>
3778-
<string>keyword.operator.delete.tsx</string>
3778+
<string>keyword.operator.expression.delete.tsx</string>
37793779
<key>match</key>
37803780
<string>(?&lt;!\.|\$)\bdelete\b(?!\$)</string>
37813781
</dict>
37823782
<dict>
37833783
<key>name</key>
3784-
<string>keyword.operator.in.tsx</string>
3784+
<string>keyword.operator.expression.in.tsx</string>
37853785
<key>match</key>
37863786
<string>(?&lt;!\.|\$)\bin\b(?!\$)</string>
37873787
</dict>
37883788
<dict>
37893789
<key>name</key>
3790-
<string>keyword.operator.of.tsx</string>
3790+
<string>keyword.operator.expression.of.tsx</string>
37913791
<key>match</key>
37923792
<string>(?&lt;!\.|\$)\bof\b(?!\$)</string>
37933793
</dict>
37943794
<dict>
37953795
<key>name</key>
3796-
<string>keyword.operator.instanceof.tsx</string>
3796+
<string>keyword.operator.expression.instanceof.tsx</string>
37973797
<key>match</key>
37983798
<string>(?&lt;!\.|\$)\binstanceof\b(?!\$)</string>
37993799
</dict>
@@ -3809,7 +3809,7 @@
38093809
</dict>
38103810
<dict>
38113811
<key>name</key>
3812-
<string>keyword.operator.void.tsx</string>
3812+
<string>keyword.operator.expression.void.tsx</string>
38133813
<key>match</key>
38143814
<string>(?&lt;!\.|\$)\bvoid\b(?!\$)</string>
38153815
</dict>
@@ -3911,7 +3911,7 @@
39113911
<key>typeof-operator</key>
39123912
<dict>
39133913
<key>name</key>
3914-
<string>keyword.operator.typeof.tsx</string>
3914+
<string>keyword.operator.expression.typeof.tsx</string>
39153915
<key>match</key>
39163916
<string>(?&lt;!\.|\$)\btypeof\b(?!\$)</string>
39173917
</dict>

‎TypeScriptReact.tmTheme

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,7 @@
1010
<array>
1111
<dict>
1212
<key>scope</key>
13-
<string>storage.modifier, storage.type, keyword.control, keyword.other.tsx, keyword.generator.asterisk, punctuation.definition.template-expression</string>
14-
<key>settings</key>
15-
<dict>
16-
<key>vsclassificationtype</key>
17-
<string>keyword</string>
18-
</dict>
19-
</dict>
20-
<dict>
21-
<key>scope</key>
22-
<string>keyword.operator.new.tsx, keyword.operator.delete.tsx, keyword.operator.in.tsx, keyword.operator.of.tsx, keyword.operator.instanceof.tsx, keyword.operator.typeof.tsx, keyword.operator.void.tsx, keyword.control.as.tsx, keyword.operator.is.tsx</string>
13+
<string>storage.modifier, storage.type, keyword.control, keyword.other.tsx, keyword.operator.expression, keyword.operator.new, keyword.generator.asterisk, punctuation.definition.template-expression</string>
2314
<key>settings</key>
2415
<dict>
2516
<key>vsclassificationtype</key>

‎tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ Grammar: TypeScript.tmLanguage
280280
^
281281
source.ts meta.function.ts meta.block.ts meta.brace.round.ts
282282
^^^^^^
283-
source.ts meta.function.ts meta.block.ts keyword.operator.typeof.ts
283+
source.ts meta.function.ts meta.block.ts keyword.operator.expression.typeof.ts
284284
^
285285
source.ts meta.function.ts meta.block.ts
286286
^

‎tests/baselines/Issue180.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Grammar: TypeScript.tmLanguage
3030
^
3131
source.ts meta.brace.round.ts
3232
^^^^^^
33-
source.ts keyword.operator.typeof.ts
33+
source.ts keyword.operator.expression.typeof.ts
3434
^
3535
source.ts
3636
^^^^^^^^^

‎tests/baselines/Issue232.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Grammar: TypeScript.tmLanguage
3333
^
3434
source.ts
3535
^^
36-
source.ts keyword.operator.of.ts
36+
source.ts keyword.operator.expression.of.ts
3737
^
3838
source.ts
3939
^^^^

‎tests/baselines/Issue243.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ Grammar: TypeScript.tmLanguage
194194
^
195195
source.ts
196196
^^
197-
source.ts keyword.operator.in.ts
197+
source.ts keyword.operator.expression.in.ts
198198
^
199199
source.ts
200200
^^^^^^

0 commit comments

Comments
 (0)