Skip to content

Commit aeb3fc9

Browse files
sheetalkamatsheetalkamat
authored
Merge pull request #270 from Microsoft/detailedScoping
Scope variables, functions, methods, properties, objects, constants
2 parents ad0ec07 + b8bd8cd commit aeb3fc9

File tree

105 files changed

+4107
-993
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+4107
-993
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 344 additions & 30 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: 630 additions & 48 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: 630 additions & 48 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>

‎build/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"start": "tsc && node ./build.js"
1010
},
1111
"dependencies": {
12-
"@types/js-yaml": "^3.5.28",
13-
"@types/node": "^6.0.39",
14-
"js-yaml": "^3.6.1",
15-
"plist": "^2.0.1",
16-
"typescript": "^2.1.0-dev.20160920"
12+
"@types/js-yaml": "latest",
13+
"@types/node": "latest",
14+
"js-yaml": "latest",
15+
"plist": "latest",
16+
"typescript": "latest"
1717
}
1818
}

‎tests/.tsdrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎tests/baselines/Abstracts.baseline.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Grammar: TypeScript.tmLanguage
8888
^
8989
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
9090
^^^
91-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
91+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.property.ts
9292
^
9393
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
9494
^
@@ -261,11 +261,11 @@ Grammar: TypeScript.tmLanguage
261261
source.ts punctuation.terminator.statement.ts
262262
>cow.makeSound();
263263
^^^
264-
source.ts
264+
source.ts variable.other.object.ts
265265
^
266266
source.ts punctuation.accessor.ts
267267
^^^^^^^^^
268-
source.ts variable.function.ts
268+
source.ts entity.name.function.ts
269269
^
270270
source.ts meta.brace.round.ts
271271
^

‎tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -155,40 +155,50 @@ Grammar: TypeScript.tmLanguage
155155
^
156156
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.brace.round.ts
157157
^^^^^^^
158-
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
158+
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 variable.other.object.ts
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
169-
^^^^^^^^^^^^^
171+
^
170172
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
173+
^^^^^^^^^^^^
174+
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 variable.other.readwrite.ts
171175
^
172176
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.brace.round.ts
173177
^
174178
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
175179
^
176180
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.definition.block.ts
177181
> domNode.style.display = desiredValue;
178-
^^^^^^^^^^^^^^^^^^^
182+
^^^^^^^^^^^^
179183
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
184+
^^^^^^^
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 variable.other.object.ts
180186
^
181187
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
182188
^^^^^
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
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
184190
^
185191
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
192+
^^^^^^^
193+
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
194+
^
195+
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
188196
^
189197
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
190-
^^^^^^^^^^^^^
198+
^
191199
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
200+
^^^^^^^^^^^^
201+
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 variable.other.readwrite.ts
192202
^
193203
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.terminator.statement.ts
194204
> }
@@ -271,8 +281,12 @@ Grammar: TypeScript.tmLanguage
271281
source.ts meta.function.ts meta.block.ts meta.brace.round.ts
272282
^^^^^^
273283
source.ts meta.function.ts meta.block.ts keyword.operator.typeof.ts
274-
^^^
284+
^
275285
source.ts meta.function.ts meta.block.ts
286+
^
287+
source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
288+
^
289+
source.ts meta.function.ts meta.block.ts
276290
^^^
277291
source.ts meta.function.ts meta.block.ts keyword.operator.comparison.ts
278292
^
@@ -298,8 +312,8 @@ Grammar: TypeScript.tmLanguage
298312
source.ts meta.function.ts meta.block.ts meta.block.ts
299313
^
300314
source.ts meta.function.ts meta.block.ts meta.block.ts keyword.operator.arithmetic.ts
301-
^^
302-
source.ts meta.function.ts meta.block.ts meta.block.ts
315+
^
316+
source.ts meta.function.ts meta.block.ts meta.block.ts variable.other.readwrite.ts
303317
> }
304318
^^^^
305319
source.ts meta.function.ts meta.block.ts meta.block.ts
@@ -353,8 +367,10 @@ Grammar: TypeScript.tmLanguage
353367
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts
354368
^
355369
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts
356-
^^
370+
^
357371
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
372+
^
373+
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
358374
> return f("hello world")
359375
^^^^^^^^
360376
source.ts meta.function.ts meta.block.ts meta.block.ts
@@ -363,7 +379,7 @@ Grammar: TypeScript.tmLanguage
363379
^
364380
source.ts meta.function.ts meta.block.ts meta.block.ts
365381
^
366-
source.ts meta.function.ts meta.block.ts meta.block.ts variable.function.ts
382+
source.ts meta.function.ts meta.block.ts meta.block.ts entity.name.function.ts
367383
^
368384
source.ts meta.function.ts meta.block.ts meta.block.ts meta.brace.round.ts
369385
^

0 commit comments

Comments
 (0)