Skip to content

Commit 0f2c566

Browse files
authored
Merge pull request #310 from Microsoft/someUpdates
Few bug fixes
2 parents 8408211 + d3b73ef commit 0f2c566

File tree

113 files changed

+3714
-2861
lines changed

Some content is hidden

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

113 files changed

+3714
-2861
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 82 additions & 107 deletions
Large diffs are not rendered by default.

TypeScript.tmLanguage

Lines changed: 137 additions & 208 deletions
Large diffs are not rendered by default.

TypeScriptReact.tmLanguage

Lines changed: 137 additions & 208 deletions
Large diffs are not rendered by default.

tests/baselines/Abstracts.baseline.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Grammar: TypeScript.tmLanguage
4141
^^^^^^
4242
source.ts meta.class.ts storage.modifier.ts
4343
^
44-
source.ts meta.class.ts meta.field.declaration.ts
44+
source.ts meta.class.ts
4545
^^^
4646
source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
4747
^
@@ -244,19 +244,19 @@ Grammar: TypeScript.tmLanguage
244244
^
245245
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
246246
^
247-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
247+
source.ts meta.var.expr.ts keyword.operator.assignment.ts
248248
^
249-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
249+
source.ts meta.var.expr.ts
250250
^^^
251-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.operator.new.ts
251+
source.ts meta.var.expr.ts new.expr.ts keyword.operator.new.ts
252252
^
253-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts
253+
source.ts meta.var.expr.ts new.expr.ts
254254
^^^
255-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts entity.name.type.ts
255+
source.ts meta.var.expr.ts new.expr.ts entity.name.type.ts
256256
^
257-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
257+
source.ts meta.var.expr.ts meta.brace.round.ts
258258
^
259-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
259+
source.ts meta.var.expr.ts meta.brace.round.ts
260260
^
261261
source.ts punctuation.terminator.statement.ts
262262
>cow.makeSound();

tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt

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

tests/baselines/ArrowFunctionInsideTypeAssertion.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ Grammar: TypeScript.tmLanguage
3333
>var object = {
3434
> setTransform: <(domNode: HTMLElement, desiredValue: string) => void>null,
3535
^
36-
[5, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts
36+
[5, 19]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts
3737
^
38-
[5, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
38+
[5, 20]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
3939
^^^^^^^
40-
[5, 21]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts variable.parameter.ts
40+
[5, 21]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts variable.parameter.ts
4141
^^^^^^^^^^^
42-
[5, 30]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts
42+
[5, 30]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts
4343
^^^^^^^^^^^^
44-
[5, 43]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts variable.parameter.ts
44+
[5, 43]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts variable.parameter.ts
4545
^^^^^^
46-
[5, 57]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
46+
[5, 57]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
4747
^^
48-
[5, 65]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts storage.type.function.arrow.ts
48+
[5, 65]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts storage.type.function.arrow.ts
4949
^^^^
50-
[5, 68]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts
50+
[5, 68]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts
5151
^^^^
52-
[5, 73]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts constant.language.null.ts
52+
[5, 73]: source.ts meta.var.expr.ts meta.object-literal.ts meta.object.member.ts constant.language.null.ts
5353
> setDisplay: (domNode: HTMLElement, desiredValue: string) => {
5454
> if (domNode.style.display !== desiredValue) {
5555
> domNode.style.display = desiredValue;
@@ -64,21 +64,21 @@ Grammar: TypeScript.tmLanguage
6464
> else {
6565
> let f = <(v: string) => number> x
6666
^
67-
[18, 17]: 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
67+
[18, 17]: source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
6868
^
69-
[18, 18]: 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.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
69+
[18, 18]: source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts cast.expr.ts meta.type.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
7070
^
71-
[18, 19]: 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.ts meta.parameters.ts variable.parameter.ts
71+
[18, 19]: source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts cast.expr.ts meta.type.function.ts meta.parameters.ts variable.parameter.ts
7272
^^^^^^
73-
[18, 22]: 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.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
73+
[18, 22]: source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts cast.expr.ts meta.type.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
7474
^^
75-
[18, 30]: 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 storage.type.function.arrow.ts
75+
[18, 30]: source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts cast.expr.ts meta.type.function.return.ts storage.type.function.arrow.ts
7676
^^^^^^
77-
[18, 33]: 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
77+
[18, 33]: source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts
7878
^
79-
[18, 39]: 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
79+
[18, 39]: source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
8080
^
81-
[18, 41]: 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
81+
[18, 41]: source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts variable.other.readwrite.ts
8282
> return f("hello world")
8383
> }
8484
>}

0 commit comments

Comments
 (0)