Skip to content

Commit 7e9a0ce

Browse files
sheetalkamatsheetalkamat
committed
Change the constant's scope from constant.other to variable.other.constant
Fixes #368
1 parent 55dd8ac commit 7e9a0ce

12 files changed

+195
-41
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@ repository:
7777
- include: '#type-annotation'
7878
- include: '#string'
7979
- include: '#comment'
80+
- name: meta.var-single-variable.expr.ts
81+
begin: ([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])
82+
beginCaptures:
83+
'1': { name: meta.definition.variable.ts variable.other.constant.ts }
84+
end: (?=$|[;,=}]|(\s+(of|in)\s+))
8085
- name: meta.var-single-variable.expr.ts
8186
begin: ([_$[:alpha:]][_$[:alnum:]]*)
8287
beginCaptures:
@@ -1397,7 +1402,7 @@ repository:
13971402
)(?=\s*\.\s*[_$[:alpha:]][_$[:alnum:]]*)
13981403
captures:
13991404
'1': { name: punctuation.accessor.ts }
1400-
'2': { name: constant.other.object.property.ts }
1405+
'2': { name: variable.other.constant.object.property.ts }
14011406
'3': { name: variable.other.object.property.ts }
14021407
# function and method assignment
14031408
- match: |-
@@ -1412,7 +1417,7 @@ repository:
14121417
- match: (\.)\s*([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])
14131418
captures:
14141419
'1': { name: punctuation.accessor.ts }
1415-
'2': { name: constant.other.property.ts }
1420+
'2': { name: variable.other.constant.property.ts }
14161421
# properties
14171422
- match: (\.)\s*([_$[:alpha:]][_$[:alnum:]]*)
14181423
captures:
@@ -1425,10 +1430,10 @@ repository:
14251430
([_$[:alpha:]][_$[:alnum:]]*)
14261431
)(?=\s*\.\s*[_$[:alpha:]][_$[:alnum:]]*)
14271432
captures:
1428-
'1': { name: constant.other.object.ts }
1433+
'1': { name: variable.other.constant.object.ts }
14291434
'2': { name: variable.other.object.ts }
14301435
# const
1431-
- name: constant.other.ts
1436+
- name: variable.other.constant.ts
14321437
match: ([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])
14331438
# vars
14341439
- name: variable.other.readwrite.ts

‎TypeScript.tmLanguage

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,22 @@
192192
</dict>
193193
</array>
194194
</dict>
195+
<dict>
196+
<key>name</key>
197+
<string>meta.var-single-variable.expr.ts</string>
198+
<key>begin</key>
199+
<string>([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])</string>
200+
<key>beginCaptures</key>
201+
<dict>
202+
<key>1</key>
203+
<dict>
204+
<key>name</key>
205+
<string>meta.definition.variable.ts variable.other.constant.ts</string>
206+
</dict>
207+
</dict>
208+
<key>end</key>
209+
<string>(?=$|[;,=}]|(\s+(of|in)\s+))</string>
210+
</dict>
195211
<dict>
196212
<key>name</key>
197213
<string>meta.var-single-variable.expr.ts</string>
@@ -3868,7 +3884,7 @@
38683884
<key>2</key>
38693885
<dict>
38703886
<key>name</key>
3871-
<string>constant.other.object.property.ts</string>
3887+
<string>variable.other.constant.object.property.ts</string>
38723888
</dict>
38733889
<key>3</key>
38743890
<dict>
@@ -3910,7 +3926,7 @@
39103926
<key>2</key>
39113927
<dict>
39123928
<key>name</key>
3913-
<string>constant.other.property.ts</string>
3929+
<string>variable.other.constant.property.ts</string>
39143930
</dict>
39153931
</dict>
39163932
</dict>
@@ -3942,7 +3958,7 @@
39423958
<key>1</key>
39433959
<dict>
39443960
<key>name</key>
3945-
<string>constant.other.object.ts</string>
3961+
<string>variable.other.constant.object.ts</string>
39463962
</dict>
39473963
<key>2</key>
39483964
<dict>
@@ -3953,7 +3969,7 @@
39533969
</dict>
39543970
<dict>
39553971
<key>name</key>
3956-
<string>constant.other.ts</string>
3972+
<string>variable.other.constant.ts</string>
39573973
<key>match</key>
39583974
<string>([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])</string>
39593975
</dict>

‎TypeScriptReact.tmLanguage

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,22 @@
192192
</dict>
193193
</array>
194194
</dict>
195+
<dict>
196+
<key>name</key>
197+
<string>meta.var-single-variable.expr.tsx</string>
198+
<key>begin</key>
199+
<string>([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])</string>
200+
<key>beginCaptures</key>
201+
<dict>
202+
<key>1</key>
203+
<dict>
204+
<key>name</key>
205+
<string>meta.definition.variable.tsx variable.other.constant.tsx</string>
206+
</dict>
207+
</dict>
208+
<key>end</key>
209+
<string>(?=$|[;,=}]|(\s+(of|in)\s+))</string>
210+
</dict>
195211
<dict>
196212
<key>name</key>
197213
<string>meta.var-single-variable.expr.tsx</string>
@@ -3872,7 +3888,7 @@
38723888
<key>2</key>
38733889
<dict>
38743890
<key>name</key>
3875-
<string>constant.other.object.property.tsx</string>
3891+
<string>variable.other.constant.object.property.tsx</string>
38763892
</dict>
38773893
<key>3</key>
38783894
<dict>
@@ -3914,7 +3930,7 @@
39143930
<key>2</key>
39153931
<dict>
39163932
<key>name</key>
3917-
<string>constant.other.property.tsx</string>
3933+
<string>variable.other.constant.property.tsx</string>
39183934
</dict>
39193935
</dict>
39203936
</dict>
@@ -3946,7 +3962,7 @@
39463962
<key>1</key>
39473963
<dict>
39483964
<key>name</key>
3949-
<string>constant.other.object.tsx</string>
3965+
<string>variable.other.constant.object.tsx</string>
39503966
</dict>
39513967
<key>2</key>
39523968
<dict>
@@ -3957,7 +3973,7 @@
39573973
</dict>
39583974
<dict>
39593975
<key>name</key>
3960-
<string>constant.other.tsx</string>
3976+
<string>variable.other.constant.tsx</string>
39613977
<key>match</key>
39623978
<string>([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])</string>
39633979
</dict>

‎tests/baselines/Issue10.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Grammar: TypeScript.tmLanguage
149149
^
150150
source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts punctuation.accessor.ts
151151
^
152-
source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts constant.other.property.ts
152+
source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts variable.other.constant.property.ts
153153
^
154154
source.ts meta.class.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts
155155
^

‎tests/baselines/Issue124.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Grammar: TypeScript.tmLanguage
151151
^^
152152
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts
153153
^^^^^^^^^^^^^^^^^^^^
154-
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts constant.other.ts
154+
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts variable.other.constant.ts
155155
^
156156
source.ts meta.var.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts
157157
^^

0 commit comments

Comments
 (0)