Skip to content

Commit 74d7b4d

Browse files
committed
Add support classes, functions, properties and constants
Fixes #71, #72
1 parent 1c934d7 commit 74d7b4d

40 files changed

+1559
-160
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 269 additions & 0 deletions
Large diffs are not rendered by default.

TypeScript.YAML-tmTheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ settings:
4747
- scope: entity.name.function, entity.name.type, meta.template.expression.ts, variable, entity.other.inherited-class.ts
4848
settings: { vsclassificationtype: identifier }
4949

50-
- scope: constant.language.undefined.ts
50+
- scope: constant.language.undefined.ts, variable.language.arguments.ts, support.type.object
5151
settings: { vsclassificationtype: identifier }
5252

5353
...

TypeScript.tmLanguage

Lines changed: 447 additions & 0 deletions
Large diffs are not rendered by default.

TypeScript.tmTheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
</dict>
155155
<dict>
156156
<key>scope</key>
157-
<string>constant.language.undefined.ts</string>
157+
<string>constant.language.undefined.ts, variable.language.arguments.ts, support.type.object</string>
158158
<key>settings</key>
159159
<dict>
160160
<key>vsclassificationtype</key>

TypeScriptReact.tmLanguage

Lines changed: 447 additions & 0 deletions
Large diffs are not rendered by default.

TypeScriptReact.tmTheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
</dict>
155155
<dict>
156156
<key>scope</key>
157-
<string>constant.language.undefined.tsx</string>
157+
<string>constant.language.undefined.tsx, variable.language.arguments.tsx, support.type.object</string>
158158
<key>settings</key>
159159
<dict>
160160
<key>vsclassificationtype</key>

tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,13 @@ Grammar: TypeScript.tmLanguage
159159
^
160160
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts punctuation.accessor.ts
161161
^^^^^
162-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts
162+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts support.variable.property.dom.ts
163163
^
164164
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts punctuation.accessor.ts
165-
^^^^^^^^
166-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts
165+
^^^^^^^
166+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts support.variable.property.dom.ts
167+
^
168+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts
167169
^^^
168170
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts keyword.operator.comparison.ts
169171
^^^^^^^^^^^^^
@@ -180,11 +182,13 @@ Grammar: TypeScript.tmLanguage
180182
^
181183
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts punctuation.accessor.ts
182184
^^^^^
183-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts
185+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts support.variable.property.dom.ts
184186
^
185187
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts punctuation.accessor.ts
186-
^^^^^^^^
187-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts
188+
^^^^^^^
189+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts support.variable.property.dom.ts
190+
^
191+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts
188192
^
189193
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.block.ts meta.block.ts keyword.operator.assignment.ts
190194
^^^^^^^^^^^^^

tests/baselines/FunctionMethodParameters.baseline.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ Grammar: TypeScript.tmLanguage
367367
^
368368
source.ts meta.function.ts meta.block.ts punctuation.accessor.ts
369369
^^^^^^
370-
source.ts meta.function.ts meta.block.ts
370+
source.ts meta.function.ts meta.block.ts support.variable.property.ts
371371
^
372372
source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
373373
>}
@@ -723,7 +723,7 @@ Grammar: TypeScript.tmLanguage
723723
^
724724
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
725725
^^^^^^
726-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
726+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.variable.property.ts
727727
^
728728
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
729729
> }

tests/baselines/Issue10.baseline.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,14 @@ Grammar: TypeScript.tmLanguage
101101
^^
102102
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
103103
> console.log("hello");
104-
^^^^^^^^^^^^^^^
104+
^^^^^^^^
105105
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
106+
^^^^^^^
107+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.class.console.ts
106108
^
107109
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
108110
^^^
109-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.function.ts
111+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.function.console.ts
110112
^
111113
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
112114
^
@@ -176,12 +178,14 @@ Grammar: TypeScript.tmLanguage
176178
^^
177179
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
178180
> console.log("hello");
179-
^^^^^^^^^^^^^^^
181+
^^^^^^^^
180182
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
183+
^^^^^^^
184+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.class.console.ts
181185
^
182186
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
183187
^^^
184-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.function.ts
188+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.function.console.ts
185189
^
186190
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
187191
^

tests/baselines/Issue112.baseline.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Grammar: TypeScript.tmLanguage
3030
^
3131
source.ts punctuation.accessor.ts
3232
^^^^
33-
source.ts
33+
source.ts support.variable.property.dom.ts
3434
^
3535
source.ts punctuation.separator.comma.ts
3636
^^^^^^^^^^^^^
@@ -74,15 +74,15 @@ Grammar: TypeScript.tmLanguage
7474
^
7575
source.ts punctuation.accessor.ts
7676
^^^^^^
77-
source.ts variable.function.ts
77+
source.ts support.function.dom.ts
7878
^
7979
source.ts meta.brace.round.ts
8080
^^^^^^^^^^
8181
source.ts
8282
^
8383
source.ts punctuation.accessor.ts
8484
^^
85-
source.ts
85+
source.ts support.variable.property.dom.ts
8686
^
8787
source.ts meta.brace.round.ts
8888
^
@@ -99,7 +99,7 @@ Grammar: TypeScript.tmLanguage
9999
^
100100
source.ts punctuation.accessor.ts
101101
^^^^^^
102-
source.ts variable.function.ts
102+
source.ts support.function.dom.ts
103103
^
104104
source.ts meta.brace.round.ts
105105
^^^^^^^^^^

0 commit comments

Comments
 (0)