From 89e4a66bd58769fe510fba3a4485ee7e332fa9ff Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 28 Jul 2016 13:48:22 -0700 Subject: [PATCH 01/77] Make baselines so we can verify against new grammar --- .gitignore | 3 +- tests/baselines/Abstracts.baseline.txt | 234 ++ ...owFunctionInsideTypeAssertion.baseline.txt | 298 +++ tests/baselines/Comments.baseline.txt | 2060 +++++++++++++++++ .../FunctionMethodOverloads.baseline.txt | 1086 +++++++++ .../FunctionMethodParameters.baseline.txt | 619 +++++ .../FunctionMethodReturnTypes.baseline.txt | 1633 +++++++++++++ tests/baselines/Issue110.baseline.txt | 237 ++ tests/baselines/Issue124.baseline.txt | 244 ++ tests/baselines/Issue149.baseline.txt | 269 +++ tests/baselines/Issue156.baseline.txt | 68 + tests/baselines/Issue191.baseline.txt | 322 +++ tests/baselines/Issue200.baseline.txt | 52 + tests/baselines/Issue208.baseline.txt | 250 ++ tests/baselines/Issue262.baseline.txt | 79 + tests/baselines/Issue28.baseline.txt | 106 + tests/baselines/Issue288.baseline.txt | 204 ++ tests/baselines/Issue32.baseline.txt | 167 ++ tests/baselines/Issue335.baseline.txt | 443 ++++ tests/baselines/Issue37.baseline.txt | 634 +++++ tests/baselines/Issue44.baseline.txt | 60 + tests/baselines/Issue5.baseline.txt | 285 +++ tests/baselines/Issue63.baseline.txt | 264 +++ tests/baselines/Issue82.baseline.txt | 76 + tests/baselines/Issue89.baseline.txt | 210 ++ tests/baselines/Issue90.baseline.txt | 59 + tests/baselines/Issue96.baseline.txt | 116 + .../ParameterProperties.baseline.txt | 121 + ...SyntacticallyIncorrectStrings.baseline.txt | 53 + tests/baselines/TsxSamples.baseline.txt | 769 ++++++ tests/baselines/awaitColoring.baseline.txt | 16 + tests/baselines/javascript.baseline.txt | 64 + .../multipleVariableDeclaration.baseline.txt | 214 ++ .../baselines/namespaceAndModule.baseline.txt | 77 + tests/baselines/pr48_noSemiColon.baseline.txt | 311 +++ tests/build.ts | 36 + tests/test.ts | 9 + tests/tsconfig.json | 1 + 38 files changed, 11748 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/Abstracts.baseline.txt create mode 100644 tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt create mode 100644 tests/baselines/Comments.baseline.txt create mode 100644 tests/baselines/FunctionMethodOverloads.baseline.txt create mode 100644 tests/baselines/FunctionMethodParameters.baseline.txt create mode 100644 tests/baselines/FunctionMethodReturnTypes.baseline.txt create mode 100644 tests/baselines/Issue110.baseline.txt create mode 100644 tests/baselines/Issue124.baseline.txt create mode 100644 tests/baselines/Issue149.baseline.txt create mode 100644 tests/baselines/Issue156.baseline.txt create mode 100644 tests/baselines/Issue191.baseline.txt create mode 100644 tests/baselines/Issue200.baseline.txt create mode 100644 tests/baselines/Issue208.baseline.txt create mode 100644 tests/baselines/Issue262.baseline.txt create mode 100644 tests/baselines/Issue28.baseline.txt create mode 100644 tests/baselines/Issue288.baseline.txt create mode 100644 tests/baselines/Issue32.baseline.txt create mode 100644 tests/baselines/Issue335.baseline.txt create mode 100644 tests/baselines/Issue37.baseline.txt create mode 100644 tests/baselines/Issue44.baseline.txt create mode 100644 tests/baselines/Issue5.baseline.txt create mode 100644 tests/baselines/Issue63.baseline.txt create mode 100644 tests/baselines/Issue82.baseline.txt create mode 100644 tests/baselines/Issue89.baseline.txt create mode 100644 tests/baselines/Issue90.baseline.txt create mode 100644 tests/baselines/Issue96.baseline.txt create mode 100644 tests/baselines/ParameterProperties.baseline.txt create mode 100644 tests/baselines/SyntacticallyIncorrectStrings.baseline.txt create mode 100644 tests/baselines/TsxSamples.baseline.txt create mode 100644 tests/baselines/awaitColoring.baseline.txt create mode 100644 tests/baselines/javascript.baseline.txt create mode 100644 tests/baselines/multipleVariableDeclaration.baseline.txt create mode 100644 tests/baselines/namespaceAndModule.baseline.txt create mode 100644 tests/baselines/pr48_noSemiColon.baseline.txt diff --git a/.gitignore b/.gitignore index 4c566d18..70c90d0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ tests/generated/* tests/node_modules tests/typings/ -tests/*.js \ No newline at end of file +tests/*.js +tests/generatedBaselines/* \ No newline at end of file diff --git a/tests/baselines/Abstracts.baseline.txt b/tests/baselines/Abstracts.baseline.txt new file mode 100644 index 00000000..0c6739f0 --- /dev/null +++ b/tests/baselines/Abstracts.baseline.txt @@ -0,0 +1,234 @@ +>abstract class Animal { + ^^^^^^^^ + source.ts meta.declaration.object.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> public age: number; + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public yearsLeft() { return 20 - this.age; } + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.arithmetic.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> abstract makeSound(): string; + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>class Cow extends Animal { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> makeSound() { return "Moo"; } + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>class Cat extends Animal { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> makeSound() { return "Meow"; } + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>let cow = new Cow(); + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^ + source.ts +>cow.makeSound(); + ^^^^^^^^^^^^^ + source.ts + ^ + source.ts meta.brace.paren.ts + ^ + source.ts meta.brace.paren.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt new file mode 100644 index 00000000..f0b917d7 --- /dev/null +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -0,0 +1,298 @@ +>// Issue: https://github.com/Microsoft/TypeScript-Sublime-Plugin/issues/292 + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.line.ts +> + ^ + source.ts +>var object = { + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts +> setTransform: <(domNode: HTMLElement, desiredValue: string) => void>null, + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts + ^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts + ^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts constant.language.null.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts +> setDisplay: (domNode: HTMLElement, desiredValue: string) => { + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.brace.paren.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts keyword.operator.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts +> if (domNode.style.display !== desiredValue) { + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts keyword.control.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.paren.ts + ^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts keyword.operator.comparison.ts + ^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts meta.brace.curly.ts +> domNode.style.display = desiredValue; + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts keyword.operator.comparison.ts + ^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts +> } + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts meta.brace.curly.ts +> } + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts +> + ^ + source.ts +>function f(x: string | ((value: string) => number)) { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> if (typeof x === "string") { + ^^^^ + source.ts meta.function.ts meta.decl.block.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.others.ts + ^^^ + source.ts meta.function.ts meta.decl.block.ts + ^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.operator.comparison.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts +> return +x + ^^^^^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts keyword.operator.arithmetic.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts +> } + ^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts +> else { + ^^^^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts +> let f = <(v: string) => number> x + ^^^^^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts + ^^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts +> return f("hello world") + ^^^^^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts keyword.control.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts string.double.ts + ^^^^^^^^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts +> } + ^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts +> + ^ + source.ts \ No newline at end of file diff --git a/tests/baselines/Comments.baseline.txt b/tests/baselines/Comments.baseline.txt new file mode 100644 index 00000000..a8c0f10d --- /dev/null +++ b/tests/baselines/Comments.baseline.txt @@ -0,0 +1,2060 @@ +>/* + ^^ + source.ts comment.block.ts +>Tests for comments in general. + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.ts +> + ^ + source.ts comment.block.ts +>Pull requests: + ^^^^^^^^^^^^^^^ + source.ts comment.block.ts +> - https://github.com/Microsoft/TypeScript-Sublime-Plugin/pull/307 + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.ts +> - https://github.com/Microsoft/TypeScript-Sublime-Plugin/pull/308 + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.ts +>*/ + ^^ + source.ts comment.block.ts +> + ^ + source.ts +>var /* comment */ x: string = "yahoo"; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^ + source.ts meta.var.expr.ts comment.block.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts comment.block.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^ + source.ts +>var x /* comment */: string = "yahoo"; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^ + source.ts +>var x: /* comment */ string = "yahoo"; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^ + source.ts +>var x: string /* comment */ = "yahoo"; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^ + source.ts +>var x: string = /* comment */ "yahoo"; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^ + source.ts +>var x: string = "yahoo" /* comment */; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^ + source.ts +>var x: string = "yahoo"; /* comment */ + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^ + source.ts + ^^ + source.ts comment.block.ts + ^^^^^^^^^ + source.ts comment.block.ts + ^^ + source.ts comment.block.ts +> + ^ + source.ts +>var /* comment */ x: string = "yahoo" + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^ + source.ts meta.var.expr.ts comment.block.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts comment.block.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +>var x /* comment */: string = "yahoo" + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +>var x: /* comment */ string = "yahoo" + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +>var x: string /* comment */ = "yahoo" + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +>var x: string = /* comment */ "yahoo" + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +>var x: string = "yahoo" /* comment */ + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts +> + ^ + source.ts +>/**/ interface i extends i1, i2, i3 {} + ^^ + source.ts comment.block.ts + ^^ + source.ts comment.block.ts + ^ + source.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>interface /**/ i extends i1, i2, i3 {} + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>interface i /**/ extends i1, i2, i3 {} + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>interface i extends /**/ i1, i2, i3 {} + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>interface i extends i1 /**/, i2, i3 {} + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>interface i extends i1, /**/ i2, i3 {} + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>interface i extends i1, i2 /**/, i3 {} + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>interface i extends i1, i2, /**/ i3 {} + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>interface i extends i1, i2, i3 /**/ {} + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>/**/ interface /**/ i /**/ extends /**/ i1, /**/ i2, /**/ i3 /**/ {} + ^^ + source.ts comment.block.ts + ^^ + source.ts comment.block.ts + ^ + source.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>/**/ interface /**/ i /**/ extends /**/ i1 /**/ , /**/ i2 /**/ , /**/ i3 /**/ {} + ^^ + source.ts comment.block.ts + ^^ + source.ts comment.block.ts + ^ + source.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>/**/class i extends c1,c2,c3{} + ^^ + source.ts comment.block.ts + ^^ + source.ts comment.block.ts + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>class/**/i extends c1,c2,c3{} + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>class i/**/extends c1,c2,c3{} + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>class i extends/**/c1,c2,c3{} + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>class i extends c1/**/,c2,c3{} + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>class i extends c1,/**/c2,c3{} + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>class i extends c1,c2/**/,c3{} + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>class i extends c1,c2,/**/c3{} + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>class i extends c1,c2,c3/**/{} + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>/**/class/**/i/**/extends/**/c1,/**/c2,/**/c3/**/{} + ^^ + source.ts comment.block.ts + ^^ + source.ts comment.block.ts + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>/**/class/**/i/**/extends/**/c1/**/,/**/c2/**/,/**/c3/**/{} + ^^ + source.ts comment.block.ts + ^^ + source.ts comment.block.ts + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>interface KeyValuePair/**/ extends Array { 0: K; 1: V; } + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts keyword.operator.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>interface KeyValuePair/**/extends Array { 0: K; 1: V; } + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts keyword.operator.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>interface KeyValuePair extends/**/Array { 0: K; 1: V; } + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts keyword.operator.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>interface KeyValuePair extends Array/**/ { 0: K; 1: V; } + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts keyword.operator.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>interface KeyValuePair extends Array/**/{ 0: K; 1: V; } + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts keyword.operator.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>interface G/**/ { + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> f(x: V): V; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>interface G { + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> f(x: V): V; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>interface G { + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts keyword.other.ts + ^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> f(x: V): V; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>var x/*comments*/=new String(); + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^ + source.ts +>var x=/*comments*/new String(); + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^ + source.ts +>var x= new/*comments*/String(); + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^ + source.ts +> + ^ + source.ts +>var x /* comments */ = new String(); + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^ + source.ts +>var x = /* comments */ new String(); + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^ + source.ts +>var x = new /* comments */ String(); + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts + ^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/FunctionMethodOverloads.baseline.txt b/tests/baselines/FunctionMethodOverloads.baseline.txt new file mode 100644 index 00000000..e055f711 --- /dev/null +++ b/tests/baselines/FunctionMethodOverloads.baseline.txt @@ -0,0 +1,1086 @@ +>/* Function overload tests */ + ^^ + source.ts comment.block.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.ts + ^^ + source.ts comment.block.ts +>export function testFunctionOverload(p: number): new() => any + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts + ^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts +>export function testFunctionOverload(p: string) + ^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.function.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts +>export function testFunctionOverload(p: string []) + ^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.function.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts +>export function testFunctionOverload(p: {}) + ^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.function.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts +>export function testFunctionOverload(p: {a: A, b:B} | string []) + ^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.function.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts +>export function testFunctionOverload(p: any): new() => any { + ^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.function.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts + ^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> throw new Error("") + ^^^^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts +>} + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts +>export function testFunctionOverloadWithSemicolon(p: number): new () => any; + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts + ^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts +>export function testFunctionOverloadWithSemicolon(p: string); + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^ + source.ts +>export function testFunctionOverloadWithSemicolon(p: string[]); + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^ + source.ts +>export function testFunctionOverloadWithSemicolon(p: {}); + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^ + source.ts +>export function testFunctionOverloadWithSemicolon(p: { a: A, b: B } | string[]); + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^ + source.ts +>export function testFunctionOverloadWithSemicolon(p: any): new () => any { + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts + ^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> throw new Error("") + ^^^^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts +>} + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts +> + ^ + source.ts +>class testClass { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> /* Function overload tests */ + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts +> public testMethodOverload(p: number): new() => any + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.others.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts +> public testMethodOverload(p: string) + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts + ^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts +> public testMethodOverload(p: string []) + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts + ^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts +> public testMethodOverload(p: {}) + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts + ^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts +> public testMethodOverload(p: {a: A, b:B} | string []) + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts + ^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts +> public testMethodOverload(p: any): new() => any { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts + ^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.others.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> throw new Error("") + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public testMethodOverloadWithSemicolon(p: number): new () => any; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.others.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public testMethodOverloadWithSemicolon(p: string); + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public testMethodOverloadWithSemicolon(p: string[]); + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public testMethodOverloadWithSemicolon(p: {}); + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public testMethodOverloadWithSemicolon(p: { a: A, b: B } | string[]); + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public testMethodOverloadWithSemicolon(p: any): new () => any { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.others.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> throw new Error("") + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>interface I { + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> foo(): number + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts +> bar(): string; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>abstract class C { + ^^^^^^^^ + source.ts meta.declaration.object.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> abstract foo() + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts +> abstract bar() + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/FunctionMethodParameters.baseline.txt b/tests/baselines/FunctionMethodParameters.baseline.txt new file mode 100644 index 00000000..baa5e279 --- /dev/null +++ b/tests/baselines/FunctionMethodParameters.baseline.txt @@ -0,0 +1,619 @@ +>/* Function parameter tests */ + ^^ + source.ts comment.block.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.ts + ^^ + source.ts comment.block.ts +>function testFunctionParamType( + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts +> m1: string, + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts +> m2: {}, + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts +> m3: any [], + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts +> m4: {a: A, b: B}, + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts +> m5: () => void, + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts +> m6: (x:(string), y:[number, string]) => number, + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.name.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.name.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts +> m7: Array, + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts +> m8: [number, number], + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts +> m9: {a: A, b: B} | [number, number], + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts +> m10: (() => void) | string[]): number { + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> return m6.length; + ^^^^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^^^^^^^^^^^^ + source.ts meta.function.ts meta.decl.block.ts +>} + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts +>class testClass { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> /* method param type tests */ + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts +> public testMethodParamType( + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts +> m1: string, + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts +> m2: {}, + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts +> m3: any [], + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts +> m4: {a: A, b: B}, + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts +> m5: () => void, + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts +> m6: (x:(string), y:[number, string]) => number, + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts +> m7: Array, + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts +> m8: [number, number], + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts +> m9: {a: A, b: B} | [number, number], + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts +> m10: (() => void) | string[]): number { + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> return m6.length; + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt new file mode 100644 index 00000000..4f70968c --- /dev/null +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -0,0 +1,1633 @@ +>/* Function return type tests */ + ^^ + source.ts comment.block.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.ts + ^^ + source.ts comment.block.ts +>export function testFunctionReturnType1(): string [] { return [""] } + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>export function testFunctionReturnType2(): {} { return {} } + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts + ^^^^^^ + source.ts meta.block.ts keyword.control.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts +>export function testFunctionReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} } + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^^^^^^^^^^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts + ^^^^^^ + source.ts meta.block.ts keyword.control.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.block.ts meta.block.ts + ^^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^^^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts +>export function testFunctionReturnType4(): [number, number] { return [1, 1] } + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>export function testFunctionReturnType5(): Array { return [{ m: "" }] } + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>export function testFunctionReturnType6(): new () => number { throw new Error(""); } + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>export function testFunctionReturnType7(): (() => number) { throw new Error(""); } + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>export function testFunctionReturnType8(): (() => number) [] { throw new Error(""); } + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>export function testFunctionReturnType9(): (() => number) | (() => string) { throw new Error(""); } + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts keyword.operator.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>export function testFunctionReturnType10(): {a: A, b: B} [] { return [{a: {m: "" }, b: {m1: "" }}] } + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^^^^^^^^^^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts + ^ + source.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts + ^^^^^^ + source.ts meta.block.ts keyword.control.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts + ^^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^^^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts +>export function testFunctionReturnType11(): number | string { return 1 } + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts keyword.operator.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts constant.numeric.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>export function testFunctionReturnType12(): number | string [] { return } + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts keyword.operator.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>export function testFunctionReturnType13(): [number, number] | string [] { return [""] } + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts keyword.operator.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts +>class TestClass { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> /* method return type tests */ + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts +> public testMethodReturnType1(): string [] { return [""] } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> public testMethodReturnType2(): {} { return {} } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> public testMethodReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> public testMethodReturnType4(): [number, number] { return [1, 1] } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> public testMethodReturnType5(): Array { return [{ m: "" }] } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> public testMethodReturnType6(): new () => number { throw new Error(""); } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.others.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> public testMethodReturnType7(): (() => number) { throw new Error(""); } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> public testMethodReturnType8(): (() => number) [] { throw new Error(""); } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> public testMethodReturnType9(): (() => number) | (() => string) { throw new Error(""); } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> public testMethodReturnType10(): {a: A, b: B} [] { return [{a: {m: "" }, b: {m1: "" }}] } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> public testMethodReturnType11(): number | string { return 1 } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> public testMethodReturnType12(): number | string [] { return } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> public testMethodReturnType13(): [number, number] | string [] { return [""] } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/Issue110.baseline.txt b/tests/baselines/Issue110.baseline.txt new file mode 100644 index 00000000..6dc92121 --- /dev/null +++ b/tests/baselines/Issue110.baseline.txt @@ -0,0 +1,237 @@ +>let number1 = 0x100 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts +>let number2 = 14e15 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number3 = 10.42e41.5 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts +>let number4 = 4 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number5 = 51.4 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number6 = 12.4E10.2 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number7 = 14.6e+10 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number8 = 12E4 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number9 = 10e10 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number10 = 14e14.5 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number11 = 12E-10 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number12 = 13.4e-14.2 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number13 = 14.12 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number14 = 10.2E+4 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number6 = 5.00567789e+2 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let i = 1, j = 1e3 + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +> + ^ + source.ts +>/* + ^^ + source.ts comment.block.ts +> + ^ + source.ts comment.block.ts +> Testing comments + ^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.ts +>*/ + ^^ + source.ts comment.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue124.baseline.txt b/tests/baselines/Issue124.baseline.txt new file mode 100644 index 00000000..4d875ecd --- /dev/null +++ b/tests/baselines/Issue124.baseline.txt @@ -0,0 +1,244 @@ +>/* + ^^ + source.ts comment.block.ts +> Solving Issue #124, #80, #81 + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.ts +> Adding capability of ternary strings. + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.ts +>*/ + ^^ + source.ts comment.block.ts +> + ^ + source.ts +>let a = true ? true : true; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + ^^^^ + source.ts +>let b = true ? true : `this is ${} highlighted` + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts + ^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts +>let c = true ? `hello` : `this ${DEPENDENCY_SEPARATOR}${moduleName} is highlighted`; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts + ^^^^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts + ^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts + ^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^^ + source.ts +> + ^ + source.ts +>var newVar = a ? (b == `hello`) : true; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + ^^ + source.ts +> + ^ + source.ts +>var debArch = arch === 'x64' ? 'amd64' : 'i386'; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^ + source.ts +> + ^ + source.ts +>/* + ^^ + source.ts comment.block.ts +> Comment + ^^^^^^^^^ + source.ts comment.block.ts +>*/ + ^^ + source.ts comment.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue149.baseline.txt b/tests/baselines/Issue149.baseline.txt new file mode 100644 index 00000000..273ffe15 --- /dev/null +++ b/tests/baselines/Issue149.baseline.txt @@ -0,0 +1,269 @@ +>export function fn(s: string): new() => View + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts + ^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.name.ts +>export function fn(s: string) + ^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.function.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^ + source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts +>export function fn(n: number) + ^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.function.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^ + source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts +>export function fn(s: any) { + ^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^^^^^^^ + source.ts meta.function.ts meta.function.overload.ts storage.type.function.ts + ^ + source.ts meta.function.ts meta.function.overload.ts + ^^ + source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> return ""; + ^^^^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts +>} + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts +>export function fn(s: string): new () => View; + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts + ^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.name.ts + ^^ + source.ts +>export function fn(s: string); + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^ + source.ts +>export function fn(n: number); + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^ + source.ts +>export function fn(s: any) { + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> return ""; + ^^^^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.function.ts meta.decl.block.ts string.double.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts +>} + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/Issue156.baseline.txt b/tests/baselines/Issue156.baseline.txt new file mode 100644 index 00000000..62a6463a --- /dev/null +++ b/tests/baselines/Issue156.baseline.txt @@ -0,0 +1,68 @@ +>class Test { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> mmm(p1: string | {}, p2: string) + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts +> { + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> } + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt new file mode 100644 index 00000000..7db8af19 --- /dev/null +++ b/tests/baselines/Issue191.baseline.txt @@ -0,0 +1,322 @@ +>class Thing { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> constructor(public content: string){ + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> var prop = Q.defer(); + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> this.store = new Data(); + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> gaze(path.join(this.content, "**/*.json"), (err, watch) => { + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + ^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts +> process.stuout.write(`Watching for changes in:`); + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + ^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> }) + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts +> }; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>class Thing { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> constructor(public content: string){ + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> var prop = Q.defer(); + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> this.store = new Data(); + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> gaze(path.join(this.content, "**/*.json"), (err, watch) => { + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + ^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts +> process.stuout.write(`Watching for changes in:`); + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + ^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> }) + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts +> }; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts \ No newline at end of file diff --git a/tests/baselines/Issue200.baseline.txt b/tests/baselines/Issue200.baseline.txt new file mode 100644 index 00000000..04e8fc6d --- /dev/null +++ b/tests/baselines/Issue200.baseline.txt @@ -0,0 +1,52 @@ +> + ^^ + source.ts +> + ^^ + source.ts +>declare module 'goog:goog.i18n.NumberFormatSymbols_en_TT' { + ^^^^^^^ + source.ts keyword.control.ts + ^ + source.ts + ^^^^^^ + source.ts storage.type.ts + ^ + source.ts + ^ + source.ts string.single.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts string.single.ts + ^ + source.ts string.single.ts + ^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.block.ts +> import alias = lool.clutz.goog.i18n.NumberFormatSymbols_en_TT; + ^^ + source.ts meta.block.ts + ^^^^^^ + source.ts meta.block.ts keyword.control.import.include.ts + ^^^^^^^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts keyword.operator.comparison.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.block.ts +> export default alias; + ^^ + source.ts meta.block.ts + ^^^^^^ + source.ts meta.block.ts storage.type.ts + ^ + source.ts meta.block.ts + ^^^^^^^ + source.ts meta.block.ts keyword.control.ts + ^^^^^^^^^ + source.ts meta.block.ts +>} + ^ + source.ts meta.block.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/Issue208.baseline.txt b/tests/baselines/Issue208.baseline.txt new file mode 100644 index 00000000..384d7914 --- /dev/null +++ b/tests/baselines/Issue208.baseline.txt @@ -0,0 +1,250 @@ +>var someVar = new Thing('data'); + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^ + source.ts +>var someVar = makeThing('data'); + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^ + source.ts +> + ^ + source.ts +>class MyClass { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> static someProp = new Thing('data'); + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> static someProp = makeThing('data'); + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> + ^ + source.ts meta.declaration.object.ts meta.object.body.ts +> someProp = new Thing('data'); + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> someProp = makeThing('data'); + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/Issue262.baseline.txt b/tests/baselines/Issue262.baseline.txt new file mode 100644 index 00000000..3343926c --- /dev/null +++ b/tests/baselines/Issue262.baseline.txt @@ -0,0 +1,79 @@ +>for (let a = 1; a < 10; a++) { + ^^^ + source.ts keyword.control.ts + ^ + source.ts + ^ + source.ts meta.brace.paren.ts + ^^^ + source.ts storage.type.ts + ^^^ + source.ts + ^ + source.ts keyword.operator.comparison.ts + ^ + source.ts + ^ + source.ts constant.numeric.ts + ^^^^ + source.ts + ^ + source.ts keyword.operator.comparison.ts + ^ + source.ts + ^^ + source.ts constant.numeric.ts + ^^^ + source.ts + ^^ + source.ts keyword.operator.arithmetic.ts + ^ + source.ts meta.brace.paren.ts + ^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts +> for (let b = 1; b < a; b++) { + ^^^^ + source.ts meta.block.ts + ^^^ + source.ts meta.block.ts keyword.control.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts meta.brace.paren.ts + ^^^ + source.ts meta.block.ts storage.type.ts + ^^^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts keyword.operator.comparison.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts constant.numeric.ts + ^^^^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts keyword.operator.comparison.ts + ^^^^^ + source.ts meta.block.ts + ^^ + source.ts meta.block.ts keyword.operator.arithmetic.ts + ^ + source.ts meta.block.ts meta.brace.paren.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts meta.block.ts meta.brace.curly.ts +> + ^^^^^^^^^ + source.ts meta.block.ts meta.block.ts +> } + ^^^^ + source.ts meta.block.ts meta.block.ts + ^ + source.ts meta.block.ts meta.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.block.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/Issue28.baseline.txt b/tests/baselines/Issue28.baseline.txt new file mode 100644 index 00000000..c53c665c --- /dev/null +++ b/tests/baselines/Issue28.baseline.txt @@ -0,0 +1,106 @@ +> + ^ + source.ts +>/* Testing octals */ + ^^ + source.ts comment.block.ts + ^^^^^^^^^^^^^^^^ + source.ts comment.block.ts + ^^ + source.ts comment.block.ts +> + ^ + source.ts +>var x = 123; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts +>var y = 0x123; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts +>var z = 0b10101; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts +>var z = 0B00000; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts +>var j = 0o474774; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts +>var w = 0O767; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts +> + ^ + source.ts \ No newline at end of file diff --git a/tests/baselines/Issue288.baseline.txt b/tests/baselines/Issue288.baseline.txt new file mode 100644 index 00000000..ec571c4e --- /dev/null +++ b/tests/baselines/Issue288.baseline.txt @@ -0,0 +1,204 @@ +>// Issue 288: "function" in "functionName" gets highlighted. + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.line.ts +>// Fixed in pull request #289. + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.line.ts +> + ^ + source.ts +>function Name(){ + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>var AnotherName = function(){ + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts +>export function eName(){ + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>export var eAnotherName = function(){ + ^^^^^^ + source.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts +>var functionName=1; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts +>functionName=1; + ^^^^^^^^^^^^ + source.ts + ^ + source.ts keyword.operator.comparison.ts + ^ + source.ts constant.numeric.ts + ^^ + source.ts +> + ^ + source.ts +>export var functionName2=1; + ^^^^^^ + source.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts +> + ^ + source.ts +>var exportName="hello"; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^ + source.ts +>exportName2="hello"; + ^^^^^^^^^^^ + source.ts + ^ + source.ts keyword.operator.comparison.ts + ^ + source.ts string.double.ts + ^^^^^ + source.ts string.double.ts + ^ + source.ts string.double.ts + ^^ + source.ts +> + ^ + source.ts +>var returnName=1; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts +>returnName+=1; + ^^^^^^^^^^ + source.ts + ^ + source.ts keyword.operator.arithmetic.ts + ^ + source.ts keyword.operator.comparison.ts + ^ + source.ts constant.numeric.ts + ^^ + source.ts +> + ^ + source.ts \ No newline at end of file diff --git a/tests/baselines/Issue32.baseline.txt b/tests/baselines/Issue32.baseline.txt new file mode 100644 index 00000000..47e276e9 --- /dev/null +++ b/tests/baselines/Issue32.baseline.txt @@ -0,0 +1,167 @@ +>/* + ^^ + source.ts comment.block.ts +> Testing Isuue 32: Adding constructor as a support.type keword + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.ts +>*/ + ^^ + source.ts comment.block.ts +> + ^ + source.ts +>interface NewInterface{ + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> currentData: Data; + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> setVal(d: Data) + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +> + ^ + source.ts +>class NewClass implements NewInterface { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> currentData: Data; + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> setVal(d: Data){ + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> this.currentData = d; + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + ^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> } + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> constructor(m: number, n: string){} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>/* + ^^ + source.ts comment.block.ts +> Testing comments + ^^^^^^^^^^^^^^^^^^ + source.ts comment.block.ts +>*/ + ^^ + source.ts comment.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue335.baseline.txt b/tests/baselines/Issue335.baseline.txt new file mode 100644 index 00000000..8d81f396 --- /dev/null +++ b/tests/baselines/Issue335.baseline.txt @@ -0,0 +1,443 @@ +>class A1 { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> b() { + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> let d; + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> d.default = 1; + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> } + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts meta.declaration.object.ts meta.object.body.ts +> private static c() { + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> } + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>class A2 { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> b() { + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> let d; + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> d.case = 1 + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.ts +> } + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts meta.declaration.object.ts meta.object.body.ts +> private static c() { + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> } + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>class A3 { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> b() { + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> let d + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts +> d.default = 1 + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +> switch (d.default) { + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts +> case 1: + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts +> case 2: + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts +> default: + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts +> break; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts +> } + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts +> } + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts meta.declaration.object.ts meta.object.body.ts +> private static c() { + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> } + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>class A4 { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> b() { + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> let d + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts +> d.case = 1 + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +> switch (d.default) { + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts +> case 1: + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts +> case 2: + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts +> default: + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts +> break; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts +> } + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts +> } + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts meta.declaration.object.ts meta.object.body.ts +> private static c() { + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> } + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt new file mode 100644 index 00000000..0ce73062 --- /dev/null +++ b/tests/baselines/Issue37.baseline.txt @@ -0,0 +1,634 @@ +>//Test For Scopes + ^^^^^^^^^^^^^^^^^^ + source.ts comment.line.ts +> + ^ + source.ts +>import * as req from "./Required" + ^^^^^^ + source.ts keyword.control.import.include.ts + ^ + source.ts + ^ + source.ts keyword.operator.arithmetic.ts + ^ + source.ts + ^^ + source.ts keyword.others.ts + ^^^^^ + source.ts + ^^^^ + source.ts keyword.control.import.include.ts + ^ + source.ts + ^ + source.ts string.double.ts + ^^^^^^^^^^ + source.ts string.double.ts + ^ + source.ts string.double.ts +>import { Scale } from "./scale"; + ^^^^^^ + source.ts keyword.control.import.include.ts + ^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^^^^^^^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts + ^^^^ + source.ts keyword.control.import.include.ts + ^ + source.ts + ^ + source.ts string.double.ts + ^^^^^^^ + source.ts string.double.ts + ^ + source.ts string.double.ts + ^^ + source.ts +> + ^ + source.ts +>if (object.instanceof(ClassNew)) { + ^^ + source.ts keyword.control.ts + ^ + source.ts + ^ + source.ts meta.brace.paren.ts + ^^^^^^^ + source.ts + ^^^^^^^^^^ + source.ts keyword.others.ts + ^ + source.ts meta.brace.paren.ts + ^^^^^^^^ + source.ts + ^ + source.ts meta.brace.paren.ts + ^ + source.ts meta.brace.paren.ts + ^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.block.ts meta.brace.curly.ts +> + ^ + source.ts +>class class1(){ + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> static functioname(){ + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> } + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>export class className(){ + ^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> private state = { } + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>void newFunctionName(){ + ^^^^ + source.ts storage.type.ts + ^^^^^^^^^^^^^^^^ + source.ts + ^ + source.ts meta.brace.paren.ts + ^ + source.ts meta.brace.paren.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts +> + ^ + source.ts meta.block.ts +> var c = a + b; + ^ + source.ts meta.block.ts meta.var.expr.ts + ^^^ + source.ts meta.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.block.ts meta.var.expr.ts + ^ + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts + ^^ + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.block.ts +> + ^ + source.ts meta.block.ts +> switch (someNum) { + ^ + source.ts meta.block.ts + ^^^^^^ + source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts + ^^ + source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts + ^^^^^^^ + source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts + ^ + source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts + ^ + source.ts meta.block.ts switch-statement.expr.ts + ^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts +> case 1: break; + ^^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + ^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + ^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.ts + ^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + ^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.ts + ^^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts +> case 2: break; + ^^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + ^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + ^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.ts + ^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + ^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.ts + ^^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts +> default: break; + ^^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^^^^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + ^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + ^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.ts + ^^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts +> } + ^ + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + ^ + source.ts meta.block.ts switch-statement.expr.ts + ^^ + source.ts meta.block.ts +> + ^ + source.ts meta.block.ts +>} + ^ + source.ts meta.block.ts meta.brace.curly.ts +> + ^ + source.ts +>/** + ^^^ + source.ts comment.block.documentation.ts +> * Verify comments + ^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.documentation.ts +> */ + ^ + source.ts comment.block.documentation.ts + ^^ + source.ts comment.block.documentation.ts +> + ^ + source.ts +>module M { + ^^^^^^ + source.ts storage.type.ts + ^^^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts +> export function myFun(x: number) { + ^^^^ + source.ts meta.block.ts + ^^^^^^ + source.ts meta.block.ts meta.function.ts storage.type.ts + ^ + source.ts meta.block.ts meta.function.ts + ^^^^^^^^ + source.ts meta.block.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.block.ts meta.function.ts + ^^^^^ + source.ts meta.block.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.block.ts meta.function.ts + ^ + source.ts meta.block.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> return x; + ^^^^^^^^ + source.ts meta.block.ts meta.function.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.block.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^^^^ + source.ts meta.block.ts meta.function.ts meta.decl.block.ts +> } + ^^^^ + source.ts meta.block.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.block.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.block.ts meta.brace.curly.ts +> + ^ + source.ts +>var m: typeof M = M; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.others.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.name.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts +> + ^ + source.ts +>var adder = new Adder(3, 4); + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^ + source.ts +>delete (adder) + ^^^^^^ + source.ts keyword.others.ts + ^ + source.ts + ^ + source.ts meta.brace.paren.ts + ^^^^^ + source.ts + ^ + source.ts meta.brace.paren.ts +> + ^ + source.ts +>var s = typeof {}git + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.others.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts +>interface I {} + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>var j: I = {} + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.name.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts +> + ^ + source.ts +> + ^ + source.ts +>module Body { + ^^^^^^ + source.ts storage.type.ts + ^^^^^^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts +> export class Cell { + ^^^^ + source.ts meta.block.ts + ^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts + ^^^^^ + source.ts meta.block.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts + ^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> public parent: Cell; + ^^^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts +> + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts +> constructor(parent: Cell) { + ^^^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> this.parent = parent; + ^^^^^^^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + ^^^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + ^^^^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> if (typeof parent === 'object' || parent instanceof Error) { + ^^^^^^^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.others.ts + ^^^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.single.ts + ^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.single.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.single.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.arithmetic.ts + ^^^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.others.ts + ^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts +> + ^^^^^^^^^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> } + ^^^^^^^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts +> } + ^^^^^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> } + ^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +>} + ^ + source.ts meta.block.ts meta.brace.curly.ts +> + ^ + source.ts +>/* + ^^ + source.ts comment.block.ts +> + ^ + source.ts comment.block.ts +> End of file + ^^^^^^^^^^^^^^ + source.ts comment.block.ts +> + ^ + source.ts comment.block.ts +>*/ + ^^ + source.ts comment.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue44.baseline.txt b/tests/baselines/Issue44.baseline.txt new file mode 100644 index 00000000..e2eded49 --- /dev/null +++ b/tests/baselines/Issue44.baseline.txt @@ -0,0 +1,60 @@ +> + ^ + source.ts +>interface TestInterface { + ^^^^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> testvar: string; + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> testfunc(): string; + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>/* + ^^ + source.ts comment.block.ts +> Testing Comments + ^^^^^^^^^^^^^^^^^^ + source.ts comment.block.ts +>*/ + ^^ + source.ts comment.block.ts +> + ^ + source.ts \ No newline at end of file diff --git a/tests/baselines/Issue5.baseline.txt b/tests/baselines/Issue5.baseline.txt new file mode 100644 index 00000000..2be9bd65 --- /dev/null +++ b/tests/baselines/Issue5.baseline.txt @@ -0,0 +1,285 @@ +>let new_string = "New Changes" + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +> + ^ + source.ts +> + ^ + source.ts +>let plain_double_text = "Hello\ + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +>this link to github is https://github.com/\ + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +>hello\ + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +>World" + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +> + ^ + source.ts +>let plain_single_text= 'Try with single bracket\ + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +>hello world \\\\\ + ^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +>let this be ^\ + ^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +>a good test ^' + ^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts +> + ^ + source.ts +>let double_quote_issue = " qstring-double:\ + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +> name: string.double.ts\ + ^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +> begin: \'\"\'\ + ^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +> end: \'\"|(?:[^\r\n\\]$)'\ + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +> patterns:\ + ^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +> - include: '#string-character-escape'\ + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +> " + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +> + ^ + source.ts +>let single_quote_issue = 'qstring-single:\ + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> name: string.single.ts\ + ^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> begin: \"\'\"\ + ^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> end: \'|(?:[^\r\n\\]$)\ + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> endCaptures:\ + ^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> '0': {name: string-character-escape }\ + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> patterns:\ + ^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> - include: \'#string-character-escape\'\ + ^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + ^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> ' + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts +> + ^ + source.ts +>let new_string = "Changes End here" + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +> + ^ + source.ts +> + ^ + source.ts +> + ^ + source.ts \ No newline at end of file diff --git a/tests/baselines/Issue63.baseline.txt b/tests/baselines/Issue63.baseline.txt new file mode 100644 index 00000000..96f2c7fd --- /dev/null +++ b/tests/baselines/Issue63.baseline.txt @@ -0,0 +1,264 @@ +>type Callback = (error: Error, value: T) => any + ^^^^ + source.ts meta.type.declaration.ts keyword.other.ts + ^ + source.ts meta.type.declaration.ts + ^^^^^^^^ + source.ts meta.type.declaration.ts entity.name.class.ts + ^ + source.ts meta.type.declaration.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.type.declaration.ts + ^^ + source.ts meta.type.declaration.ts keyword.operator.comparison.ts + ^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^^^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^^^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^^^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^ + source.ts meta.type.declaration.ts + ^^ + source.ts meta.type.declaration.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.type.declaration.ts meta.type.function.return.ts + ^^^ + source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts +> + ^ + source.ts +>type Callback = (error: Error, value: T) => any + ^^^^ + source.ts meta.type.declaration.ts keyword.other.ts + ^ + source.ts meta.type.declaration.ts + ^^^^^^^^ + source.ts meta.type.declaration.ts entity.name.class.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.type.declaration.ts + ^^ + source.ts meta.type.declaration.ts keyword.operator.comparison.ts + ^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^^^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^^^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^^^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^ + source.ts meta.type.declaration.ts + ^^ + source.ts meta.type.declaration.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.type.declaration.ts meta.type.function.return.ts + ^^^ + source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts +> + ^ + source.ts +>type Callback = (error: Error, value: T) => any + ^^^^ + source.ts meta.type.declaration.ts keyword.other.ts + ^ + source.ts meta.type.declaration.ts + ^^^^^^^^ + source.ts meta.type.declaration.ts entity.name.class.ts + ^ + source.ts meta.type.declaration.ts + ^^ + source.ts meta.type.declaration.ts keyword.operator.comparison.ts + ^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^^^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^^^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^^^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^ + source.ts meta.type.declaration.ts + ^^ + source.ts meta.type.declaration.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.type.declaration.ts meta.type.function.return.ts + ^^^ + source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts +> + ^ + source.ts +>type Callback void> = (error: Error, value: T) => any + ^^^^ + source.ts meta.type.declaration.ts keyword.other.ts + ^ + source.ts meta.type.declaration.ts + ^^^^^^^^ + source.ts meta.type.declaration.ts entity.name.class.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts keyword.operator.type.ts + ^^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts + ^^^^^^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts + ^^^^^^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts + ^^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts + ^^^^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.type.declaration.ts + ^^ + source.ts meta.type.declaration.ts keyword.operator.comparison.ts + ^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^^^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^^^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^^^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + ^ + source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^ + source.ts meta.type.declaration.ts + ^^ + source.ts meta.type.declaration.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.type.declaration.ts meta.type.function.return.ts + ^^^ + source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts +> + ^ + source.ts +> type Foo = { + ^ + source.ts + ^^^^ + source.ts meta.type.declaration.ts keyword.other.ts + ^ + source.ts meta.type.declaration.ts + ^^^ + source.ts meta.type.declaration.ts entity.name.class.ts + ^ + source.ts meta.type.declaration.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.type.declaration.ts + ^^ + source.ts meta.type.declaration.ts keyword.operator.comparison.ts + ^ + source.ts meta.type.declaration.ts meta.object.type.ts meta.brace.curly.ts +> + ^ + source.ts meta.type.declaration.ts meta.object.type.ts +> foo: T, + ^ + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts + ^^^ + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts + ^^ + source.ts meta.type.declaration.ts meta.object.type.ts +> bar: number + ^ + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts + ^^^ + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^ + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts + ^^^^^^ + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.primitive.ts support.type.ts +> + ^ + source.ts meta.type.declaration.ts meta.object.type.ts +>} + ^ + source.ts meta.type.declaration.ts meta.object.type.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/Issue82.baseline.txt b/tests/baselines/Issue82.baseline.txt new file mode 100644 index 00000000..23f23ef9 --- /dev/null +++ b/tests/baselines/Issue82.baseline.txt @@ -0,0 +1,76 @@ +>class Foo { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> constructor( + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts +> test: number, // foo bar, + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.ts +> exitEditModeCallback: () => void // Used to re-enable View updates. + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.ts +> ) { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/Issue89.baseline.txt b/tests/baselines/Issue89.baseline.txt new file mode 100644 index 00000000..8376bf9a --- /dev/null +++ b/tests/baselines/Issue89.baseline.txt @@ -0,0 +1,210 @@ +>export class A extends /* */B implements/**/ C{ + ^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +> + ^ + source.ts +> + ^ + source.ts +>export class D implements/**/ F extends /**/G { + ^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +> + ^ + source.ts +>export class E extends /**/H implements/**/ One, Two, Three{ + ^^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +> + ^ + source.ts +>class className extends class1 implements class2 { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>/* + ^^ + source.ts comment.block.ts +> Checking comments + ^^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.ts +>*/ + ^^ + source.ts comment.block.ts +> + ^ + source.ts \ No newline at end of file diff --git a/tests/baselines/Issue90.baseline.txt b/tests/baselines/Issue90.baseline.txt new file mode 100644 index 00000000..6ea2b863 --- /dev/null +++ b/tests/baselines/Issue90.baseline.txt @@ -0,0 +1,59 @@ +> var a = 0; + ^ + source.ts meta.var.expr.ts + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts +> var b = 1; + ^ + source.ts meta.var.expr.ts + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts +> var c = a ^ b; + ^ + source.ts meta.var.expr.ts + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts +> + ^ + source.ts +> + ^ + source.ts \ No newline at end of file diff --git a/tests/baselines/Issue96.baseline.txt b/tests/baselines/Issue96.baseline.txt new file mode 100644 index 00000000..319699b7 --- /dev/null +++ b/tests/baselines/Issue96.baseline.txt @@ -0,0 +1,116 @@ +>var letter; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts +>let variable; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts +> + ^ + source.ts +>variable; + ^^^^^^^^^^ + source.ts +>letter; + ^^^^^^^^ + source.ts +> + ^ + source.ts +>var constenum = 10; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts +>constenum += 10; + ^^^^^^^^^^ + source.ts + ^ + source.ts keyword.operator.arithmetic.ts + ^ + source.ts keyword.operator.comparison.ts + ^ + source.ts + ^^ + source.ts constant.numeric.ts + ^^ + source.ts +>const enum E { } + ^^^^^ + source.ts meta.enum.declaration.ts storage.modifier.ts + ^ + source.ts meta.enum.declaration.ts + ^^^^ + source.ts meta.enum.declaration.ts storage.type.ts + ^ + source.ts meta.enum.declaration.ts + ^ + source.ts meta.enum.declaration.ts entity.name.class.ts + ^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts +> + ^ + source.ts +>var constable = "I am rrrrrroyal!"; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^ + source.ts +>constable += " Royal, I say!"; + ^^^^^^^^^^ + source.ts + ^ + source.ts keyword.operator.arithmetic.ts + ^ + source.ts keyword.operator.comparison.ts + ^ + source.ts + ^ + source.ts string.double.ts + ^^^^^^^^^^^^^^ + source.ts string.double.ts + ^ + source.ts string.double.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/ParameterProperties.baseline.txt b/tests/baselines/ParameterProperties.baseline.txt new file mode 100644 index 00000000..236a4f91 --- /dev/null +++ b/tests/baselines/ParameterProperties.baseline.txt @@ -0,0 +1,121 @@ +>class A { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> constructor(private a: string, protected b: string, public c: string) { + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> } + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> foo() { + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +> return this.a + this.b + this.c; + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.arithmetic.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.arithmetic.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> } + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt b/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt new file mode 100644 index 00000000..01842e75 --- /dev/null +++ b/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt @@ -0,0 +1,53 @@ +>// Test for https://github.com/Microsoft/TypeScript-Sublime-Plugin/pull/307 + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.line.ts +> + ^ + source.ts +>class SomeClass { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> "some string" + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts string.double.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts string.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts string.double.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>var y "some string 2" + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +> + ^ + source.ts +> + ^ + source.ts \ No newline at end of file diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt new file mode 100644 index 00000000..9469ccd2 --- /dev/null +++ b/tests/baselines/TsxSamples.baseline.txt @@ -0,0 +1,769 @@ +>class MyComponent extends React.Component{ + ^^^^^ + source.tsx meta.declaration.object.tsx storage.type.tsx + ^ + source.tsx meta.declaration.object.tsx + ^^^^^^^^^^^ + source.tsx meta.declaration.object.tsx meta.object.name.tsx entity.name.class.tsx + ^ + source.tsx meta.declaration.object.tsx + ^^^^^^^ + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx keyword.other.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx + ^^^^^ + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.object.heritage.parent.tsx support.type.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx + ^^^^^^^^^ + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx entity.name.type.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx meta.brace.angle.tsx + ^^^^^ + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx meta.type.name.tsx + ^^ + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx + ^^^^^ + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx meta.type.name.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.brace.curly.tsx +> render() { + ^^^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx + ^^^^^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx entity.name.function.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.function.type.parameter.tsx meta.brace.round.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.function.type.parameter.tsx meta.brace.round.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.brace.curly.tsx +> return
+ ^^^^^^^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx + ^^^^^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx keyword.control.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx entity.name.tag.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.tag.attribute-name.tsx + ^^^^^^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx keyword.operator.assignment.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + ^^^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.brace.curly.tsx constant.language.this.tsx + ^^^^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.brace.curly.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx punctuation.definition.tag.end.tsx +> This is a test: {this.state.count} + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + ^^^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx constant.language.this.tsx + ^^^^^^^^^^^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx +>
+ ^^^^^^^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx + ^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.close.tsx punctuation.definition.tag.begin.tsx + ^^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.close.tsx entity.name.tag.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.close.tsx punctuation.definition.tag.end.tsx +> } + ^^^^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.brace.curly.tsx +>} + ^ + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.brace.curly.tsx +> + ^ + source.tsx +>// JSX in Depth + ^^^^^^^^^^^^^^^^ + source.tsx comment.line.tsx +>// http://facebook.github.io/react/docs/jsx-in-depth.html + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.tsx comment.line.tsx +>var App = + ^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx +>
+ ^^^^ + source.tsx + ^ + source.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^ + source.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx +> + ^^^^^^^^ + source.tsx tag.without-attributes.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx +> + ^^^^^^^^^^^^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^^^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx + ^^^^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx keyword.operator.assignment.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx + ^^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.end.tsx +> + ^^^^^^^^^^^^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^^^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx + ^^^^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx keyword.operator.assignment.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx + ^^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.end.tsx +> + ^^^^^^^^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx + ^^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx +>
+ ^^^^ + source.tsx tag.without-attributes.tsx + ^^ + source.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^ + source.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx +> + ^ + source.tsx +>var App2 = ( + ^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.brace.paren.tsx +>
+ ^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx +> + ^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx +> + ^^^^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx + ^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx keyword.operator.assignment.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.end.tsx +> + ^^^^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx + ^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx keyword.operator.assignment.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.end.tsx +> + ^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx +>
+ ^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx +>) + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.brace.paren.tsx +> + ^ + source.tsx +>var content = ( + ^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.brace.paren.tsx +> + ^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx +>); + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.brace.paren.tsx + ^^ + source.tsx +> + ^ + source.tsx +>// JSX Spread Attributes + ^^^^^^^^^^^^^^^^^^^^^^^^^ + source.tsx comment.line.tsx +>// http://facebook.github.io/react/docs/jsx-spread.html + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.tsx comment.line.tsx +>var props = {}; + ^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.brace.curly.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.brace.curly.tsx + ^^ + source.tsx +>props.foo = x; + ^^^^^^^^^^ + source.tsx + ^ + source.tsx keyword.operator.comparison.tsx + ^^^^ + source.tsx +>props.bar = y; + ^^^^^^^^^^ + source.tsx + ^ + source.tsx keyword.operator.comparison.tsx + ^^^^ + source.tsx +>var component = ; + ^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + ^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.end.tsx + ^^ + source.tsx +> + ^ + source.tsx +>var props2 = { foo: 'default' } + ^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.brace.curly.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx + ^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx string.single.tsx + ^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.brace.curly.tsx +>var component2 = + ^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + ^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.tag.attribute-name.tsx + ^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx keyword.operator.assignment.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx string.single.tsx + ^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.end.tsx +> + ^ + source.tsx +>// JSX Gotchas + ^^^^^^^^^^^^^^^ + source.tsx comment.line.tsx +>// http://facebook.github.io/react/docs/jsx-gotchas.html + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.tsx comment.line.tsx +>var a =
{'First \u00b7 Second'}
+ ^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + ^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx constant.character.escape + ^^^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx +>var b =
{'First ' + String.fromCharCode(183) + ' Second'}
+ ^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + ^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx keyword.operator.arithmetic.tsx + ^^^^^^^^^^^^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.brace.paren.tsx + ^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx constant.numeric.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.brace.paren.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx keyword.operator.arithmetic.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + ^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx +>var c =
{['First ', ·, ' Second']}
+ ^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.brace.square.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.single.tsx + ^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.single.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx constant.character.entity.tsx punctuation.definition.entity.tsx + ^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx constant.character.entity.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx constant.character.entity.tsx punctuation.definition.entity.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.single.tsx + ^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.brace.square.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx +>var d =
+ ^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.tag.attribute-name.tsx + ^^^^^^^^^^^^^^^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx keyword.operator.assignment.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.brace.curly.tsx + ^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.single.tsx + ^^^^^^^^^^^^^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.single.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.brace.curly.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.end.tsx +>var e =
+ ^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.tag.attribute-name.tsx + ^^^^^^^^^^^^^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx keyword.operator.assignment.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx + ^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx string.quoted.double.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.end.tsx +> + ^ + source.tsx \ No newline at end of file diff --git a/tests/baselines/awaitColoring.baseline.txt b/tests/baselines/awaitColoring.baseline.txt new file mode 100644 index 00000000..40d2a938 --- /dev/null +++ b/tests/baselines/awaitColoring.baseline.txt @@ -0,0 +1,16 @@ +>await 1; + ^^^^^ + source.ts storage.modifier.ts + ^ + source.ts + ^ + source.ts constant.numeric.ts + ^^^ + source.ts +>awaiting 1; + ^^^^^^^^^ + source.ts + ^ + source.ts constant.numeric.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/javascript.baseline.txt b/tests/baselines/javascript.baseline.txt new file mode 100644 index 00000000..3bb4d632 --- /dev/null +++ b/tests/baselines/javascript.baseline.txt @@ -0,0 +1,64 @@ +>switch (x) { + ^^^^^^ + source.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts + ^^ + source.ts switch-statement.expr.ts switch-expression.expr.ts + ^ + source.ts switch-statement.expr.ts switch-expression.expr.ts + ^ + source.ts switch-statement.expr.ts switch-expression.expr.ts + ^ + source.ts switch-statement.expr.ts + ^ + source.ts switch-statement.expr.ts switch-block.expr.ts + ^^ + source.ts switch-statement.expr.ts switch-block.expr.ts +> case 0: + ^^^^ + source.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^ + source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + ^ + source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + ^ + source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.ts + ^ + source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + ^^ + source.ts switch-statement.expr.ts switch-block.expr.ts +> default: + ^^^^ + source.ts switch-statement.expr.ts switch-block.expr.ts + ^^^^^^^ + source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + ^ + source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + ^^ + source.ts switch-statement.expr.ts switch-block.expr.ts +>} + ^ + source.ts switch-statement.expr.ts + ^^ + source.ts +>typeof x; + ^^^^^^ + source.ts keyword.others.ts + ^^^^^ + source.ts +>void x; + ^^^^ + source.ts storage.type.ts + ^^^^^ + source.ts +>delete x.y; + ^^^^^^ + source.ts keyword.others.ts + ^^^^^^^ + source.ts +>x instanceof y; + ^^ + source.ts + ^^^^^^^^^^ + source.ts keyword.others.ts + ^^^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt new file mode 100644 index 00000000..0ce04e14 --- /dev/null +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -0,0 +1,214 @@ +>var a, b, c + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts +>var a1 = 1, b1 = function (x) { return 1; }, c1 = "string" + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts constant.numeric.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +>var a2: string = "test", b2: () => void = () => { console.log("hello"); }, c2: string | number; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^ + source.ts meta.var.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.function.return.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + ^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.paren.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.double.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.paren.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.var.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts +>var obj = { + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts +> foo: "10" + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts string.double.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts string.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts string.double.ts +>}, other = 10; + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts meta.var.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/namespaceAndModule.baseline.txt b/tests/baselines/namespaceAndModule.baseline.txt new file mode 100644 index 00000000..ed339660 --- /dev/null +++ b/tests/baselines/namespaceAndModule.baseline.txt @@ -0,0 +1,77 @@ +>namespace ts { } + ^^^^^^^^^ + source.ts storage.type.ts + ^^^^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts +>module ts { } + ^^^^^^ + source.ts storage.type.ts + ^^^^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts +>declare namespace ts {} + ^^^^^^^ + source.ts keyword.control.ts + ^ + source.ts + ^^^^^^^^^ + source.ts storage.type.ts + ^^^^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts +>declare module ts {} + ^^^^^^^ + source.ts keyword.control.ts + ^ + source.ts + ^^^^^^ + source.ts storage.type.ts + ^^^^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^^ + source.ts +>declare module "x" {} + ^^^^^^^ + source.ts keyword.control.ts + ^ + source.ts + ^^^^^^ + source.ts storage.type.ts + ^ + source.ts + ^ + source.ts string.double.ts + ^ + source.ts string.double.ts + ^ + source.ts string.double.ts + ^ + source.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.block.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt new file mode 100644 index 00000000..21d5bd1d --- /dev/null +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -0,0 +1,311 @@ +>class Test { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> private data: TemplateData[] = [] + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts meta.brace.square.ts +> private options: TemplateOptions = {} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts meta.brace.curly.ts +> private state = {} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts meta.brace.curly.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts meta.brace.curly.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> + ^ + source.ts +>export type Stats = fs.Stats + ^^^^^^ + source.ts storage.type.ts + ^ + source.ts + ^^^^ + source.ts meta.type.declaration.ts keyword.other.ts + ^ + source.ts meta.type.declaration.ts + ^^^^^ + source.ts meta.type.declaration.ts entity.name.class.ts + ^ + source.ts meta.type.declaration.ts + ^^ + source.ts meta.type.declaration.ts keyword.operator.comparison.ts + ^^^^^^^^ + source.ts meta.type.declaration.ts meta.type.name.ts +>export const touch = thenify(tch) + ^^^^^^ + source.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts +> + ^ + source.ts +>/** + ^^^ + source.ts comment.block.documentation.ts +> * Verify comments + ^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.documentation.ts +> */ + ^ + source.ts comment.block.documentation.ts + ^^ + source.ts comment.block.documentation.ts +>export function isFile(path: string): Promise { + ^^^^^^ + source.ts meta.function.ts storage.type.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> return stat(path).then(stat => stat.isFile(), () => false) + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^^ + source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^^^^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts keyword.operator.ts + ^^^^^^^^^^^^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts keyword.operator.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts constant.language.boolean.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts +>} + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts +> + ^ + source.ts +> + ^ + source.ts +>export const readFile = thenify(fs.readFile) + ^^^^^^ + source.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts +>export const writeFile = thenify(fs.writeFile) + ^^^^^^ + source.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.brace.angle.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts keyword.operator.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.name.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts +> + ^ + source.ts +> + ^ + source.ts \ No newline at end of file diff --git a/tests/build.ts b/tests/build.ts index 56d034f1..b466af1a 100644 --- a/tests/build.ts +++ b/tests/build.ts @@ -48,6 +48,36 @@ function getScopesAtMarkers(text: string, grammar: vt.IGrammar): string { return outputLines.join('\n'); } +function baselineWholeFile(text: string, grammar: vt.IGrammar): string { + let oriLines = text.split('\n'); + let ruleStack: vt.StackElement[] = undefined; + let outputLines: string[] = []; + for (let i in oriLines) { + let oriLine = oriLines[i]; + let markerLocations = getMarkerLocations(oriLine); + let line = oriLine.split(marker).join(''); + let lineTokens = grammar.tokenizeLine(line, ruleStack); + ruleStack = lineTokens.ruleStack; + + outputLines.push(">" + line); + for (let token of lineTokens.tokens) { + let startingSpaces = " "; + for (let j = 0; j < token.startIndex; j++) { + startingSpaces += " "; + } + + let locatingString = ""; + for (let j = token.startIndex; j < token.endIndex; j++) { + locatingString += "^"; + } + outputLines.push(startingSpaces + locatingString); + outputLines.push(startingSpaces + token.scopes.join(' ')); + } + } + + return outputLines.join('\n'); +} + for (var fileName of fs.readdirSync('cases')) { const text = fs.readFileSync(path.join('./cases', fileName), 'utf8'); let parsedFileName = path.parse(fileName); @@ -55,6 +85,12 @@ for (var fileName of fs.readdirSync('cases')) { if (!fs.existsSync('./generated')){ fs.mkdirSync('generated'); } + if (!fs.existsSync('./generatedBaselines')) { + fs.mkdirSync('generatedBaselines'); + } let outputFileName = path.join('./generated', parsedFileName.name + '.txt'); fs.writeFile(outputFileName, getScopesAtMarkers(text, grammar), "utf8"); + + let outputBaselineName = path.join('./generatedBaselines', parsedFileName.name + '.baseline.txt'); + fs.writeFile(outputBaselineName, baselineWholeFile(text, grammar), "utf8"); } diff --git a/tests/test.ts b/tests/test.ts index 3ccf0393..f59aa79d 100644 --- a/tests/test.ts +++ b/tests/test.ts @@ -19,6 +19,15 @@ describe("Compare generated with baselines", () => { } }) +describe("Compare generatedBaselines with baselines", () => { + for (var file of fs.readdirSync('generatedBaselines')) { + var generatedText = fs.readFileSync('generatedBaselines/' + file, 'utf8'); + var baselinesText = fs.readFileSync('baselines/' + file, 'utf8'); + + addTestCase(file, generatedText, baselinesText); + } +}) + function addTestCase(file: string, generatedText: string, baselinesText: string) { describe('Comparing ' + file, () => { it('should be the same', () => { diff --git a/tests/tsconfig.json b/tests/tsconfig.json index d33f1d00..4ba0b872 100644 --- a/tests/tsconfig.json +++ b/tests/tsconfig.json @@ -8,6 +8,7 @@ "cases", "baselines", "generated", + "generatedBaselines", "node_modules" ] } \ No newline at end of file From c0acaa221ef5beede08aa7ac5e17b9c305c7058e Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 28 Jul 2016 15:12:56 -0700 Subject: [PATCH 02/77] Add original file to baselines for easier diagnosing issues with baseline --- tests/baselines/Abstracts.baseline.txt | 20 +++++ tests/baselines/Abstracts.txt | 22 +++++- ...owFunctionInsideTypeAssertion.baseline.txt | 26 +++++++ .../ArrowFunctionInsideTypeAssertion.txt | 26 +++++++ tests/baselines/Comments.baseline.txt | 74 +++++++++++++++++++ tests/baselines/Comments.txt | 74 +++++++++++++++++++ .../FunctionMethodOverloads.baseline.txt | 54 ++++++++++++++ tests/baselines/FunctionMethodOverloads.txt | 54 ++++++++++++++ .../FunctionMethodParameters.baseline.txt | 35 +++++++++ tests/baselines/FunctionMethodParameters.txt | 37 +++++++++- .../FunctionMethodReturnTypes.baseline.txt | 35 +++++++++ tests/baselines/FunctionMethodReturnTypes.txt | 35 +++++++++ tests/baselines/Issue110.baseline.txt | 25 +++++++ tests/baselines/Issue110.txt | 25 +++++++ tests/baselines/Issue124.baseline.txt | 20 +++++ tests/baselines/Issue124.txt | 20 +++++ tests/baselines/Issue149.baseline.txt | 17 +++++ tests/baselines/Issue149.txt | 17 +++++ tests/baselines/Issue156.baseline.txt | 10 +++ tests/baselines/Issue156.txt | 10 +++ tests/baselines/Issue191.baseline.txt | 24 ++++++ tests/baselines/Issue191.txt | 24 ++++++ tests/baselines/Issue200.baseline.txt | 10 +++ tests/baselines/Issue200.txt | 10 +++ tests/baselines/Issue208.baseline.txt | 14 ++++ tests/baselines/Issue208.txt | 14 ++++ tests/baselines/Issue262.baseline.txt | 9 +++ tests/baselines/Issue262.txt | 11 ++- tests/baselines/Issue28.baseline.txt | 14 ++++ tests/baselines/Issue28.txt | 14 ++++ tests/baselines/Issue288.baseline.txt | 28 +++++++ tests/baselines/Issue288.txt | 28 +++++++ tests/baselines/Issue32.baseline.txt | 25 +++++++ tests/baselines/Issue32.txt | 25 +++++++ tests/baselines/Issue335.baseline.txt | 55 ++++++++++++++ tests/baselines/Issue335.txt | 57 +++++++++++++- tests/baselines/Issue37.baseline.txt | 72 ++++++++++++++++++ tests/baselines/Issue37.txt | 72 ++++++++++++++++++ tests/baselines/Issue44.baseline.txt | 14 ++++ tests/baselines/Issue44.txt | 14 ++++ tests/baselines/Issue5.baseline.txt | 39 ++++++++++ tests/baselines/Issue5.txt | 39 ++++++++++ tests/baselines/Issue63.baseline.txt | 18 +++++ tests/baselines/Issue63.txt | 18 +++++ tests/baselines/Issue82.baseline.txt | 12 +++ tests/baselines/Issue82.txt | 12 +++ tests/baselines/Issue89.baseline.txt | 28 +++++++ tests/baselines/Issue89.txt | 28 +++++++ tests/baselines/Issue90.baseline.txt | 9 +++ tests/baselines/Issue90.txt | 9 +++ tests/baselines/Issue96.baseline.txt | 16 ++++ tests/baselines/Issue96.txt | 16 ++++ .../ParameterProperties.baseline.txt | 11 +++ tests/baselines/ParameterProperties.txt | 13 +++- ...SyntacticallyIncorrectStrings.baseline.txt | 13 ++++ .../SyntacticallyIncorrectStrings.txt | 13 ++++ tests/baselines/TsxSamples.baseline.txt | 57 ++++++++++++++ tests/baselines/TsxSamples.txt | 57 ++++++++++++++ tests/baselines/awaitColoring.baseline.txt | 6 ++ tests/baselines/awaitColoring.txt | 6 ++ tests/baselines/javascript.baseline.txt | 12 +++ tests/baselines/javascript.txt | 12 +++ .../multipleVariableDeclaration.baseline.txt | 10 +++ .../baselines/multipleVariableDeclaration.txt | 10 +++ .../baselines/namespaceAndModule.baseline.txt | 9 +++ tests/baselines/namespaceAndModule.txt | 9 +++ tests/baselines/pr48_noSemiColon.baseline.txt | 25 +++++++ tests/baselines/pr48_noSemiColon.txt | 25 +++++++ tests/build.ts | 10 ++- 69 files changed, 1705 insertions(+), 7 deletions(-) diff --git a/tests/baselines/Abstracts.baseline.txt b/tests/baselines/Abstracts.baseline.txt index 0c6739f0..4ba9b3d0 100644 --- a/tests/baselines/Abstracts.baseline.txt +++ b/tests/baselines/Abstracts.baseline.txt @@ -1,3 +1,23 @@ +original file +----------------------------------- +^^abstract class Animal { + public age: number; + public yearsLeft() { return 20 - this.age; } + ^^abstract makeSound(): string; +} + +class Cow extends Animal { + makeSound() { return "Moo"; } +} + +class Cat extends Animal { + makeSound() { return "Meow"; } +} + +let cow = new Cow(); +cow.makeSound(); +----------------------------------- + >abstract class Animal { ^^^^^^^^ source.ts meta.declaration.object.ts storage.modifier.ts diff --git a/tests/baselines/Abstracts.txt b/tests/baselines/Abstracts.txt index 0f1480f2..6ca14417 100644 --- a/tests/baselines/Abstracts.txt +++ b/tests/baselines/Abstracts.txt @@ -1,2 +1,22 @@ +original file +----------------------------------- +^^abstract class Animal { + public age: number; + public yearsLeft() { return 20 - this.age; } + ^^abstract makeSound(): string; +} + +class Cow extends Animal { + makeSound() { return "Moo"; } +} + +class Cat extends Animal { + makeSound() { return "Meow"; } +} + +let cow = new Cow(); +cow.makeSound(); +----------------------------------- + [1, 1]: source.ts meta.declaration.object.ts storage.modifier.ts -[4, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts +[4, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts \ No newline at end of file diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index f0b917d7..fb8ebd46 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -1,3 +1,29 @@ +original file +----------------------------------- +// Issue: https://github.com/Microsoft/TypeScript-Sublime-Plugin/issues/292 + +var object = { + setTransform: ^^<^^(^^domNode: ^^HTMLElement, ^^desiredValue: ^^string) ^^=> ^^void>^^null, + setDisplay: (domNode: HTMLElement, desiredValue: string) => { + if (domNode.style.display !== desiredValue) { + domNode.style.display = desiredValue; + } + } +} + +function f(x: string | ((value: string) => number)) { + if (typeof x === "string") { + return +x + } + else { + let f = ^^<^^(^^v: ^^string) ^^=> ^^number^^> ^^x + return f("hello world") + } +} + + +----------------------------------- + >// Issue: https://github.com/Microsoft/TypeScript-Sublime-Plugin/issues/292 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts comment.line.ts diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt index 1d37a855..4f301e8a 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt @@ -1,3 +1,29 @@ +original file +----------------------------------- +// Issue: https://github.com/Microsoft/TypeScript-Sublime-Plugin/issues/292 + +var object = { + setTransform: ^^<^^(^^domNode: ^^HTMLElement, ^^desiredValue: ^^string) ^^=> ^^void>^^null, + setDisplay: (domNode: HTMLElement, desiredValue: string) => { + if (domNode.style.display !== desiredValue) { + domNode.style.display = desiredValue; + } + } +} + +function f(x: string | ((value: string) => number)) { + if (typeof x === "string") { + return +x + } + else { + let f = ^^<^^(^^v: ^^string) ^^=> ^^number^^> ^^x + return f("hello world") + } +} + + +----------------------------------- + [4, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts [4, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts [4, 21]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts diff --git a/tests/baselines/Comments.baseline.txt b/tests/baselines/Comments.baseline.txt index a8c0f10d..ee9cedef 100644 --- a/tests/baselines/Comments.baseline.txt +++ b/tests/baselines/Comments.baseline.txt @@ -1,3 +1,77 @@ +original file +----------------------------------- +/* +Tests for comments in general. + +Pull requests: + - https://github.com/Microsoft/TypeScript-Sublime-Plugin/pull/307 + - https://github.com/Microsoft/TypeScript-Sublime-Plugin/pull/308 +*/ + +var ^^/* comment */ x: string = "yahoo"; +var x ^^/* comment */: string = "yahoo"; +var x: ^^/* comment */ string = "yahoo"; +var x: string ^^/* comment */ = "yahoo"; +var x: string = ^^/* comment */ "yahoo"; +var x: string = "yahoo" ^^/* comment */; +var x: string = "yahoo"; ^^/* comment */ + +var ^^/* comment */ x: string = "yahoo" +var x ^^/* comment */: string = "yahoo" +var x: ^^/* comment */ string = "yahoo" +var x: string ^^/* comment */ = "yahoo" +var x: string = ^^/* comment */ "yahoo" +var x: string = "yahoo" ^^/* comment */ + +^^/**/ interface i extends i1, i2, i3 {} +interface ^^/**/ i extends i1, i2, i3 {} +interface i ^^/**/ extends i1, i2, i3 {} +interface i extends ^^/**/ i1, i2, i3 {} +interface i extends i1 ^^/**/, i2, i3 {} +interface i extends i1, ^^/**/ i2, i3 {} +interface i extends i1, i2 ^^/**/, i3 {} +interface i extends i1, i2, ^^/**/ i3 {} +interface i extends i1, i2, i3 ^^/**/ {} +^^/**/ interface ^^/**/ i ^^/**/ extends ^^/**/ i1, ^^/**/ i2, ^^/**/ i3 ^^/**/ {} +^^/**/ interface ^^/**/ i ^^/**/ extends ^^/**/ i1 ^^/**/ , ^^/**/ i2 ^^/**/ , ^^/**/ i3 ^^/**/ {} + +^^/**/class i extends c1,c2,c3{} +class^^/**/i extends c1,c2,c3{} +class i^^/**/extends c1,c2,c3{} +class i extends^^/**/c1,c2,c3{} +class i extends c1^^/**/,c2,c3{} +class i extends c1,^^/**/c2,c3{} +class i extends c1,c2^^/**/,c3{} +class i extends c1,c2,^^/**/c3{} +class i extends c1,c2,c3^^/**/{} +^^/**/class^^/**/i^^/**/extends^^/**/c1,^^/**/c2,^^/**/c3^^/**/{} +^^/**/class^^/**/i^^/**/extends^^/**/c1^^/**/,^^/**/c2^^/**/,^^/**/c3^^/**/{} + +interface KeyValuePair^^/**/ extends Array { 0: K; 1: V; } +interface KeyValuePair^^/**/extends Array { 0: K; 1: V; } +interface KeyValuePair extends^^/**/Array { 0: K; 1: V; } +interface KeyValuePair extends Array^^/**/ { 0: K; 1: V; } +interface KeyValuePair extends Array^^/**/{ 0: K; 1: V; } + +interface G^^/**/ { + f(x: V): V; +} +interface G { + f(x: V): V; +} +interface G { + f(x: V): V; +} + +var x^^/*comments*/=new String(); +var x=^^/*comments*/new String(); +var x= new^^/*comments*/String(); + +var x ^^/* comments */ = new String(); +var x = ^^/* comments */ new String(); +var x = new ^^/* comments */ String(); +----------------------------------- + >/* ^^ source.ts comment.block.ts diff --git a/tests/baselines/Comments.txt b/tests/baselines/Comments.txt index 0fff0acf..0e2ac749 100644 --- a/tests/baselines/Comments.txt +++ b/tests/baselines/Comments.txt @@ -1,3 +1,77 @@ +original file +----------------------------------- +/* +Tests for comments in general. + +Pull requests: + - https://github.com/Microsoft/TypeScript-Sublime-Plugin/pull/307 + - https://github.com/Microsoft/TypeScript-Sublime-Plugin/pull/308 +*/ + +var ^^/* comment */ x: string = "yahoo"; +var x ^^/* comment */: string = "yahoo"; +var x: ^^/* comment */ string = "yahoo"; +var x: string ^^/* comment */ = "yahoo"; +var x: string = ^^/* comment */ "yahoo"; +var x: string = "yahoo" ^^/* comment */; +var x: string = "yahoo"; ^^/* comment */ + +var ^^/* comment */ x: string = "yahoo" +var x ^^/* comment */: string = "yahoo" +var x: ^^/* comment */ string = "yahoo" +var x: string ^^/* comment */ = "yahoo" +var x: string = ^^/* comment */ "yahoo" +var x: string = "yahoo" ^^/* comment */ + +^^/**/ interface i extends i1, i2, i3 {} +interface ^^/**/ i extends i1, i2, i3 {} +interface i ^^/**/ extends i1, i2, i3 {} +interface i extends ^^/**/ i1, i2, i3 {} +interface i extends i1 ^^/**/, i2, i3 {} +interface i extends i1, ^^/**/ i2, i3 {} +interface i extends i1, i2 ^^/**/, i3 {} +interface i extends i1, i2, ^^/**/ i3 {} +interface i extends i1, i2, i3 ^^/**/ {} +^^/**/ interface ^^/**/ i ^^/**/ extends ^^/**/ i1, ^^/**/ i2, ^^/**/ i3 ^^/**/ {} +^^/**/ interface ^^/**/ i ^^/**/ extends ^^/**/ i1 ^^/**/ , ^^/**/ i2 ^^/**/ , ^^/**/ i3 ^^/**/ {} + +^^/**/class i extends c1,c2,c3{} +class^^/**/i extends c1,c2,c3{} +class i^^/**/extends c1,c2,c3{} +class i extends^^/**/c1,c2,c3{} +class i extends c1^^/**/,c2,c3{} +class i extends c1,^^/**/c2,c3{} +class i extends c1,c2^^/**/,c3{} +class i extends c1,c2,^^/**/c3{} +class i extends c1,c2,c3^^/**/{} +^^/**/class^^/**/i^^/**/extends^^/**/c1,^^/**/c2,^^/**/c3^^/**/{} +^^/**/class^^/**/i^^/**/extends^^/**/c1^^/**/,^^/**/c2^^/**/,^^/**/c3^^/**/{} + +interface KeyValuePair^^/**/ extends Array { 0: K; 1: V; } +interface KeyValuePair^^/**/extends Array { 0: K; 1: V; } +interface KeyValuePair extends^^/**/Array { 0: K; 1: V; } +interface KeyValuePair extends Array^^/**/ { 0: K; 1: V; } +interface KeyValuePair extends Array^^/**/{ 0: K; 1: V; } + +interface G^^/**/ { + f(x: V): V; +} +interface G { + f(x: V): V; +} +interface G { + f(x: V): V; +} + +var x^^/*comments*/=new String(); +var x=^^/*comments*/new String(); +var x= new^^/*comments*/String(); + +var x ^^/* comments */ = new String(); +var x = ^^/* comments */ new String(); +var x = new ^^/* comments */ String(); +----------------------------------- + [9, 5]: source.ts meta.var.expr.ts comment.block.ts [10, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts [11, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts diff --git a/tests/baselines/FunctionMethodOverloads.baseline.txt b/tests/baselines/FunctionMethodOverloads.baseline.txt index e055f711..8832f268 100644 --- a/tests/baselines/FunctionMethodOverloads.baseline.txt +++ b/tests/baselines/FunctionMethodOverloads.baseline.txt @@ -1,3 +1,57 @@ +original file +----------------------------------- +/* Function overload tests */ +^^export function ^^testFunctionOverload(p: number): new() => any +^^export function ^^testFunctionOverload(p: string) +^^export function ^^testFunctionOverload(p: string []) +^^export function ^^testFunctionOverload(p: {}) +^^export function ^^testFunctionOverload(p: {a: A, b:B} | string []) +^^export function ^^testFunctionOverload(p: any): new() => any { + ^^throw new Error("") +} + +^^export function ^^testFunctionOverloadWithSemicolon(p: number): new () => any; +^^export function ^^testFunctionOverloadWithSemicolon(p: string); +^^export function ^^testFunctionOverloadWithSemicolon(p: string[]); +^^export function ^^testFunctionOverloadWithSemicolon(p: {}); +^^export function ^^testFunctionOverloadWithSemicolon(p: { a: A, b: B } | string[]); +^^export function ^^testFunctionOverloadWithSemicolon(p: any): new () => any { + ^^throw new Error("") +} + + +class testClass { + /* Function overload tests */ + ^^public ^^testMethodOverload(p: number): new() => any + ^^public ^^testMethodOverload(p: string) + ^^public ^^testMethodOverload(p: string []) + ^^public ^^testMethodOverload(p: {}) + ^^public ^^testMethodOverload(p: {a: A, b:B} | string []) + ^^public ^^testMethodOverload(p: any): new() => any { + ^^throw new Error("") + } + + ^^public ^^testMethodOverloadWithSemicolon(p: number): new () => any; + ^^public ^^testMethodOverloadWithSemicolon(p: string); + ^^public ^^testMethodOverloadWithSemicolon(p: string[]); + ^^public ^^testMethodOverloadWithSemicolon(p: {}); + ^^public ^^testMethodOverloadWithSemicolon(p: { a: A, b: B } | string[]); + ^^public ^^testMethodOverloadWithSemicolon(p: any): new () => any { + ^^throw new Error("") + } +} + +interface I { + ^^foo(): number + ^^bar(): string; +} + +abstract class C { + ^^abstract ^^foo() + ^^abstract ^^bar() +} +----------------------------------- + >/* Function overload tests */ ^^ source.ts comment.block.ts diff --git a/tests/baselines/FunctionMethodOverloads.txt b/tests/baselines/FunctionMethodOverloads.txt index e734f9de..7ebad679 100644 --- a/tests/baselines/FunctionMethodOverloads.txt +++ b/tests/baselines/FunctionMethodOverloads.txt @@ -1,3 +1,57 @@ +original file +----------------------------------- +/* Function overload tests */ +^^export function ^^testFunctionOverload(p: number): new() => any +^^export function ^^testFunctionOverload(p: string) +^^export function ^^testFunctionOverload(p: string []) +^^export function ^^testFunctionOverload(p: {}) +^^export function ^^testFunctionOverload(p: {a: A, b:B} | string []) +^^export function ^^testFunctionOverload(p: any): new() => any { + ^^throw new Error("") +} + +^^export function ^^testFunctionOverloadWithSemicolon(p: number): new () => any; +^^export function ^^testFunctionOverloadWithSemicolon(p: string); +^^export function ^^testFunctionOverloadWithSemicolon(p: string[]); +^^export function ^^testFunctionOverloadWithSemicolon(p: {}); +^^export function ^^testFunctionOverloadWithSemicolon(p: { a: A, b: B } | string[]); +^^export function ^^testFunctionOverloadWithSemicolon(p: any): new () => any { + ^^throw new Error("") +} + + +class testClass { + /* Function overload tests */ + ^^public ^^testMethodOverload(p: number): new() => any + ^^public ^^testMethodOverload(p: string) + ^^public ^^testMethodOverload(p: string []) + ^^public ^^testMethodOverload(p: {}) + ^^public ^^testMethodOverload(p: {a: A, b:B} | string []) + ^^public ^^testMethodOverload(p: any): new() => any { + ^^throw new Error("") + } + + ^^public ^^testMethodOverloadWithSemicolon(p: number): new () => any; + ^^public ^^testMethodOverloadWithSemicolon(p: string); + ^^public ^^testMethodOverloadWithSemicolon(p: string[]); + ^^public ^^testMethodOverloadWithSemicolon(p: {}); + ^^public ^^testMethodOverloadWithSemicolon(p: { a: A, b: B } | string[]); + ^^public ^^testMethodOverloadWithSemicolon(p: any): new () => any { + ^^throw new Error("") + } +} + +interface I { + ^^foo(): number + ^^bar(): string; +} + +abstract class C { + ^^abstract ^^foo() + ^^abstract ^^bar() +} +----------------------------------- + [2, 1]: source.ts meta.function.ts storage.type.ts [2, 17]: source.ts meta.function.ts entity.name.function.ts [3, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts diff --git a/tests/baselines/FunctionMethodParameters.baseline.txt b/tests/baselines/FunctionMethodParameters.baseline.txt index baa5e279..05b13b46 100644 --- a/tests/baselines/FunctionMethodParameters.baseline.txt +++ b/tests/baselines/FunctionMethodParameters.baseline.txt @@ -1,3 +1,38 @@ +original file +----------------------------------- +/* Function parameter tests */ +function testFunctionParamType( + ^^m1: string, + ^^m2: {}, + ^^m3: any [], + ^^m4: {a: A, b: B}, + ^^m5: () => void, + ^^m6: (x:(string), y:[number, string]) => number, + ^^m7: Array, + ^^m8: [number, number], + ^^m9: {a: A, b: B} | [number, number], + ^^m10: (() => void) | string[]): number { + ^^return m6.length; +} + +class testClass { + /* method param type tests */ + public testMethodParamType( + ^^m1: string, + ^^m2: {}, + ^^m3: any [], + ^^m4: {a: A, b: B}, + ^^m5: () => void, + ^^m6: (x:(string), y:[number, string]) => number, + ^^m7: Array, + ^^m8: [number, number], + ^^m9: {a: A, b: B} | [number, number], + ^^m10: (() => void) | string[]): number { + ^^return m6.length; + } +} +----------------------------------- + >/* Function parameter tests */ ^^ source.ts comment.block.ts diff --git a/tests/baselines/FunctionMethodParameters.txt b/tests/baselines/FunctionMethodParameters.txt index 4e009180..eea97aea 100644 --- a/tests/baselines/FunctionMethodParameters.txt +++ b/tests/baselines/FunctionMethodParameters.txt @@ -1,3 +1,38 @@ +original file +----------------------------------- +/* Function parameter tests */ +function testFunctionParamType( + ^^m1: string, + ^^m2: {}, + ^^m3: any [], + ^^m4: {a: A, b: B}, + ^^m5: () => void, + ^^m6: (x:(string), y:[number, string]) => number, + ^^m7: Array, + ^^m8: [number, number], + ^^m9: {a: A, b: B} | [number, number], + ^^m10: (() => void) | string[]): number { + ^^return m6.length; +} + +class testClass { + /* method param type tests */ + public testMethodParamType( + ^^m1: string, + ^^m2: {}, + ^^m3: any [], + ^^m4: {a: A, b: B}, + ^^m5: () => void, + ^^m6: (x:(string), y:[number, string]) => number, + ^^m7: Array, + ^^m8: [number, number], + ^^m9: {a: A, b: B} | [number, number], + ^^m10: (() => void) | string[]): number { + ^^return m6.length; + } +} +----------------------------------- + [3, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts [4, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts [5, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts @@ -19,4 +54,4 @@ [26, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts [27, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts [28, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +[29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts \ No newline at end of file diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt index 4f70968c..d2f9a56a 100644 --- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -1,3 +1,38 @@ +original file +----------------------------------- +/* Function return type tests */ +^^export function ^^testFunctionReturnType1(): string [] { ^^return [""] } +^^export function ^^testFunctionReturnType2(): {} { ^^return {} } +^^export function ^^testFunctionReturnType3(): {a: A, b: B} { ^^return {a: {m: "" }, b: {m1: "" }} } +^^export function ^^testFunctionReturnType4(): [number, number] { ^^return [1, 1] } +^^export function ^^testFunctionReturnType5(): Array { ^^return [{ m: "" }] } +^^export function ^^testFunctionReturnType6(): new () => number { ^^throw new Error(""); } +^^export function ^^testFunctionReturnType7(): (() => number) { ^^throw new Error(""); } +^^export function ^^testFunctionReturnType8(): (() => number) [] { ^^throw new Error(""); } +^^export function ^^testFunctionReturnType9(): (() => number) | (() => string) { ^^throw new Error(""); } +^^export function ^^testFunctionReturnType10(): {a: A, b: B} [] { ^^return [{a: {m: "" }, b: {m1: "" }}] } +^^export function ^^testFunctionReturnType11(): number | string { ^^return 1 } +^^export function ^^testFunctionReturnType12(): number | string [] { ^^return } +^^export function ^^testFunctionReturnType13(): [number, number] | string [] { ^^return [""] } + +class TestClass { + /* method return type tests */ + ^^public ^^testMethodReturnType1(): string [] { ^^return [""] } + ^^public ^^testMethodReturnType2(): {} { ^^return {} } + ^^public ^^testMethodReturnType3(): {a: A, b: B} { ^^return {a: {m: "" }, b: {m1: "" }} } + ^^public ^^testMethodReturnType4(): [number, number] { ^^return [1, 1] } + ^^public ^^testMethodReturnType5(): Array { ^^return [{ m: "" }] } + ^^public ^^testMethodReturnType6(): new () => number { ^^throw new Error(""); } + ^^public ^^testMethodReturnType7(): (() => number) { ^^throw new Error(""); } + ^^public ^^testMethodReturnType8(): (() => number) [] { ^^throw new Error(""); } + ^^public ^^testMethodReturnType9(): (() => number) | (() => string) { ^^throw new Error(""); } + ^^public ^^testMethodReturnType10(): {a: A, b: B} [] { ^^return [{a: {m: "" }, b: {m1: "" }}] } + ^^public ^^testMethodReturnType11(): number | string { ^^return 1 } + ^^public ^^testMethodReturnType12(): number | string [] { ^^return } + ^^public ^^testMethodReturnType13(): [number, number] | string [] { ^^return [""] } +} +----------------------------------- + >/* Function return type tests */ ^^ source.ts comment.block.ts diff --git a/tests/baselines/FunctionMethodReturnTypes.txt b/tests/baselines/FunctionMethodReturnTypes.txt index 6b35d12b..2b1950e6 100644 --- a/tests/baselines/FunctionMethodReturnTypes.txt +++ b/tests/baselines/FunctionMethodReturnTypes.txt @@ -1,3 +1,38 @@ +original file +----------------------------------- +/* Function return type tests */ +^^export function ^^testFunctionReturnType1(): string [] { ^^return [""] } +^^export function ^^testFunctionReturnType2(): {} { ^^return {} } +^^export function ^^testFunctionReturnType3(): {a: A, b: B} { ^^return {a: {m: "" }, b: {m1: "" }} } +^^export function ^^testFunctionReturnType4(): [number, number] { ^^return [1, 1] } +^^export function ^^testFunctionReturnType5(): Array { ^^return [{ m: "" }] } +^^export function ^^testFunctionReturnType6(): new () => number { ^^throw new Error(""); } +^^export function ^^testFunctionReturnType7(): (() => number) { ^^throw new Error(""); } +^^export function ^^testFunctionReturnType8(): (() => number) [] { ^^throw new Error(""); } +^^export function ^^testFunctionReturnType9(): (() => number) | (() => string) { ^^throw new Error(""); } +^^export function ^^testFunctionReturnType10(): {a: A, b: B} [] { ^^return [{a: {m: "" }, b: {m1: "" }}] } +^^export function ^^testFunctionReturnType11(): number | string { ^^return 1 } +^^export function ^^testFunctionReturnType12(): number | string [] { ^^return } +^^export function ^^testFunctionReturnType13(): [number, number] | string [] { ^^return [""] } + +class TestClass { + /* method return type tests */ + ^^public ^^testMethodReturnType1(): string [] { ^^return [""] } + ^^public ^^testMethodReturnType2(): {} { ^^return {} } + ^^public ^^testMethodReturnType3(): {a: A, b: B} { ^^return {a: {m: "" }, b: {m1: "" }} } + ^^public ^^testMethodReturnType4(): [number, number] { ^^return [1, 1] } + ^^public ^^testMethodReturnType5(): Array { ^^return [{ m: "" }] } + ^^public ^^testMethodReturnType6(): new () => number { ^^throw new Error(""); } + ^^public ^^testMethodReturnType7(): (() => number) { ^^throw new Error(""); } + ^^public ^^testMethodReturnType8(): (() => number) [] { ^^throw new Error(""); } + ^^public ^^testMethodReturnType9(): (() => number) | (() => string) { ^^throw new Error(""); } + ^^public ^^testMethodReturnType10(): {a: A, b: B} [] { ^^return [{a: {m: "" }, b: {m1: "" }}] } + ^^public ^^testMethodReturnType11(): number | string { ^^return 1 } + ^^public ^^testMethodReturnType12(): number | string [] { ^^return } + ^^public ^^testMethodReturnType13(): [number, number] | string [] { ^^return [""] } +} +----------------------------------- + [2, 1]: source.ts meta.function.ts storage.type.ts [2, 17]: source.ts meta.function.ts entity.name.function.ts [2, 56]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts diff --git a/tests/baselines/Issue110.baseline.txt b/tests/baselines/Issue110.baseline.txt index 6dc92121..adc1b0f1 100644 --- a/tests/baselines/Issue110.baseline.txt +++ b/tests/baselines/Issue110.baseline.txt @@ -1,3 +1,28 @@ +original file +----------------------------------- +let number1 = ^^0x100 +let number2 = ^^14e15 +let number3 = ^^10.42e41.5 +let number4 = ^^4 +let number5 = ^^51.4 +let number6 = ^^12.4E10.2 +let number7 = ^^14.6e+10 +let number8 = ^^12E4 +let number9 = ^^10e10 +let number10 = ^^14e14.5 +let number11 = ^^12E-10 +let number12 = ^^13.4e-14.2 +let number13 = ^^14.12 +let number14 = ^^10.2E+4 +let number6 = ^^5.00567789e+2 +let i = ^^1, j = ^^1e3 + +/* +^^ + Testing comments +*/ +----------------------------------- + >let number1 = 0x100 ^^^ source.ts meta.var.expr.ts storage.type.ts diff --git a/tests/baselines/Issue110.txt b/tests/baselines/Issue110.txt index 4702f7be..e82f52fe 100644 --- a/tests/baselines/Issue110.txt +++ b/tests/baselines/Issue110.txt @@ -1,3 +1,28 @@ +original file +----------------------------------- +let number1 = ^^0x100 +let number2 = ^^14e15 +let number3 = ^^10.42e41.5 +let number4 = ^^4 +let number5 = ^^51.4 +let number6 = ^^12.4E10.2 +let number7 = ^^14.6e+10 +let number8 = ^^12E4 +let number9 = ^^10e10 +let number10 = ^^14e14.5 +let number11 = ^^12E-10 +let number12 = ^^13.4e-14.2 +let number13 = ^^14.12 +let number14 = ^^10.2E+4 +let number6 = ^^5.00567789e+2 +let i = ^^1, j = ^^1e3 + +/* +^^ + Testing comments +*/ +----------------------------------- + [1, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts [2, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts [3, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts diff --git a/tests/baselines/Issue124.baseline.txt b/tests/baselines/Issue124.baseline.txt index 4d875ecd..e5c916f2 100644 --- a/tests/baselines/Issue124.baseline.txt +++ b/tests/baselines/Issue124.baseline.txt @@ -1,3 +1,23 @@ +original file +----------------------------------- +/* + Solving Issue #124, #80, #81 + Adding capability of ternary strings. +*/ + +let a = ^^true ? ^^true : ^^true; +let b = ^^true ? ^^true : ^^`^^this is ^^${} highlighted` +let c = ^^true ? ^^`^^hello` : ^^`^^this ${DEPENDENCY_SEPARATOR}${moduleName} is highlighted`; + +var ^^newVar = ^^a ^^? ^^(b == `hello`) : ^^true; + +var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; + +/* + ^^Comment +*/ +----------------------------------- + >/* ^^ source.ts comment.block.ts diff --git a/tests/baselines/Issue124.txt b/tests/baselines/Issue124.txt index e01630c5..175eccf7 100644 --- a/tests/baselines/Issue124.txt +++ b/tests/baselines/Issue124.txt @@ -1,3 +1,23 @@ +original file +----------------------------------- +/* + Solving Issue #124, #80, #81 + Adding capability of ternary strings. +*/ + +let a = ^^true ? ^^true : ^^true; +let b = ^^true ? ^^true : ^^`^^this is ^^${} highlighted` +let c = ^^true ? ^^`^^hello` : ^^`^^this ${DEPENDENCY_SEPARATOR}${moduleName} is highlighted`; + +var ^^newVar = ^^a ^^? ^^(b == `hello`) : ^^true; + +var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; + +/* + ^^Comment +*/ +----------------------------------- + [6, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts [6, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts [6, 23]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts diff --git a/tests/baselines/Issue149.baseline.txt b/tests/baselines/Issue149.baseline.txt index 273ffe15..1e57bc82 100644 --- a/tests/baselines/Issue149.baseline.txt +++ b/tests/baselines/Issue149.baseline.txt @@ -1,3 +1,20 @@ +original file +----------------------------------- +^^export function ^^fn(s: ^^string): ^^new() => ^^View +^^export function ^^fn(s: string) +^^export function ^^fn(n: number) +^^export function ^^fn(s: any) { + ^^return ""; +} + +^^export function ^^fn(s: string): ^^new () => ^^View; +^^export function ^^fn(s: string); +^^export function ^^fn(n: number); +^^export function ^^fn(s: any) { + ^^return ""; +} +----------------------------------- + >export function fn(s: string): new() => View ^^^^^^ source.ts meta.function.ts storage.type.ts diff --git a/tests/baselines/Issue149.txt b/tests/baselines/Issue149.txt index 0db9e5a0..74c66348 100644 --- a/tests/baselines/Issue149.txt +++ b/tests/baselines/Issue149.txt @@ -1,3 +1,20 @@ +original file +----------------------------------- +^^export function ^^fn(s: ^^string): ^^new() => ^^View +^^export function ^^fn(s: string) +^^export function ^^fn(n: number) +^^export function ^^fn(s: any) { + ^^return ""; +} + +^^export function ^^fn(s: string): ^^new () => ^^View; +^^export function ^^fn(s: string); +^^export function ^^fn(n: number); +^^export function ^^fn(s: any) { + ^^return ""; +} +----------------------------------- + [1, 1]: source.ts meta.function.ts storage.type.ts [1, 17]: source.ts meta.function.ts entity.name.function.ts [1, 23]: source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts diff --git a/tests/baselines/Issue156.baseline.txt b/tests/baselines/Issue156.baseline.txt index 62a6463a..688103a3 100644 --- a/tests/baselines/Issue156.baseline.txt +++ b/tests/baselines/Issue156.baseline.txt @@ -1,3 +1,13 @@ +original file +----------------------------------- +class Test { + ^^mmm(^^p1: ^^string | ^^{}, ^^p2: ^^string) + { + ^^ + } +} +----------------------------------- + >class Test { ^^^^^ source.ts meta.declaration.object.ts storage.type.ts diff --git a/tests/baselines/Issue156.txt b/tests/baselines/Issue156.txt index 18e1180b..a1b570b9 100644 --- a/tests/baselines/Issue156.txt +++ b/tests/baselines/Issue156.txt @@ -1,3 +1,13 @@ +original file +----------------------------------- +class Test { + ^^mmm(^^p1: ^^string | ^^{}, ^^p2: ^^string) + { + ^^ + } +} +----------------------------------- + [2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts [2, 6]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts [2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index 7db8af19..0d4b3665 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -1,3 +1,27 @@ +original file +----------------------------------- +class Thing { + ^^constructor(^^public ^^content: ^^string){ + var ^^prop = Q.defer<^^boolean>(^^); + ^^this.store = new ^^Data(); + ^^gaze(path.join(this.content, "^^**/*.json"^^), (err, watch) => { + ^^process.stuout.write(`^^Watching for changes in:`^^); + }) + }; +} + +class Thing<^^T, ^^U> { + ^^constructor(^^public ^^content: ^^string){ + var ^^prop = Q.defer<^^boolean>(^^); + ^^this.store = new ^^Data(); + ^^gaze(path.join(this.content, "^^**/*.json"^^), (err, watch) => { + ^^process.stuout.write(`^^Watching for changes in:`^^); + }) + }; +} + +----------------------------------- + >class Thing { ^^^^^ source.ts meta.declaration.object.ts storage.type.ts diff --git a/tests/baselines/Issue191.txt b/tests/baselines/Issue191.txt index 4bc56603..6636750f 100644 --- a/tests/baselines/Issue191.txt +++ b/tests/baselines/Issue191.txt @@ -1,3 +1,27 @@ +original file +----------------------------------- +class Thing { + ^^constructor(^^public ^^content: ^^string){ + var ^^prop = Q.defer<^^boolean>(^^); + ^^this.store = new ^^Data(); + ^^gaze(path.join(this.content, "^^**/*.json"^^), (err, watch) => { + ^^process.stuout.write(`^^Watching for changes in:`^^); + }) + }; +} + +class Thing<^^T, ^^U> { + ^^constructor(^^public ^^content: ^^string){ + var ^^prop = Q.defer<^^boolean>(^^); + ^^this.store = new ^^Data(); + ^^gaze(path.join(this.content, "^^**/*.json"^^), (err, watch) => { + ^^process.stuout.write(`^^Watching for changes in:`^^); + }) + }; +} + +----------------------------------- + [2, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts [2, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts [2, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts diff --git a/tests/baselines/Issue200.baseline.txt b/tests/baselines/Issue200.baseline.txt index 04e8fc6d..673f62c6 100644 --- a/tests/baselines/Issue200.baseline.txt +++ b/tests/baselines/Issue200.baseline.txt @@ -1,3 +1,13 @@ +original file +----------------------------------- +^^ + +^^declare ^^module ^^'goog:goog.i18n.NumberFormatSymbols_en_TT' { + ^^import ^^alias = ^^lool.clutz.goog.i18n.NumberFormatSymbols_en_TT; + ^^export ^^default ^^alias; +^^}^^ +----------------------------------- + > ^^ source.ts diff --git a/tests/baselines/Issue200.txt b/tests/baselines/Issue200.txt index ee7a0bac..5082c97f 100644 --- a/tests/baselines/Issue200.txt +++ b/tests/baselines/Issue200.txt @@ -1,3 +1,13 @@ +original file +----------------------------------- +^^ + +^^declare ^^module ^^'goog:goog.i18n.NumberFormatSymbols_en_TT' { + ^^import ^^alias = ^^lool.clutz.goog.i18n.NumberFormatSymbols_en_TT; + ^^export ^^default ^^alias; +^^}^^ +----------------------------------- + [1, 1]: source.ts [3, 1]: source.ts keyword.control.ts [3, 9]: source.ts storage.type.ts diff --git a/tests/baselines/Issue208.baseline.txt b/tests/baselines/Issue208.baseline.txt index 384d7914..a57ab972 100644 --- a/tests/baselines/Issue208.baseline.txt +++ b/tests/baselines/Issue208.baseline.txt @@ -1,3 +1,17 @@ +original file +----------------------------------- +var someVar = ^^new ^^Thing<^^number, ^^string>('^^data'^^); +var someVar = ^^makeThing<^^number, ^^string>('^^data'^^); + +class MyClass { + static ^^someProp = new ^^Thing<^^number, ^^string>('data'); + static ^^someProp = ^^makeThing<^^number, ^^string>('data'); + + someProp = new ^^Thing<^^number, ^^string>('data'); + someProp = ^^makeThing<^^number, ^^string>('data'); +} +----------------------------------- + >var someVar = new Thing('data'); ^^^ source.ts meta.var.expr.ts storage.type.ts diff --git a/tests/baselines/Issue208.txt b/tests/baselines/Issue208.txt index c5f26c9e..7b178e5b 100644 --- a/tests/baselines/Issue208.txt +++ b/tests/baselines/Issue208.txt @@ -1,3 +1,17 @@ +original file +----------------------------------- +var someVar = ^^new ^^Thing<^^number, ^^string>('^^data'^^); +var someVar = ^^makeThing<^^number, ^^string>('^^data'^^); + +class MyClass { + static ^^someProp = new ^^Thing<^^number, ^^string>('data'); + static ^^someProp = ^^makeThing<^^number, ^^string>('data'); + + someProp = new ^^Thing<^^number, ^^string>('data'); + someProp = ^^makeThing<^^number, ^^string>('data'); +} +----------------------------------- + [1, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts [1, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts [1, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts diff --git a/tests/baselines/Issue262.baseline.txt b/tests/baselines/Issue262.baseline.txt index 3343926c..40bf8164 100644 --- a/tests/baselines/Issue262.baseline.txt +++ b/tests/baselines/Issue262.baseline.txt @@ -1,3 +1,12 @@ +original file +----------------------------------- +for (^^let a = 1; a ^^< 10; a++) { + ^^for (^^let b = 1; b < a; b++) { + ^^ + } +} +----------------------------------- + >for (let a = 1; a < 10; a++) { ^^^ source.ts keyword.control.ts diff --git a/tests/baselines/Issue262.txt b/tests/baselines/Issue262.txt index ccad30f4..e9fd360a 100644 --- a/tests/baselines/Issue262.txt +++ b/tests/baselines/Issue262.txt @@ -1,5 +1,14 @@ +original file +----------------------------------- +for (^^let a = 1; a ^^< 10; a++) { + ^^for (^^let b = 1; b < a; b++) { + ^^ + } +} +----------------------------------- + [1, 6]: source.ts storage.type.ts [1, 19]: source.ts keyword.operator.comparison.ts [2, 5]: source.ts meta.block.ts keyword.control.ts [2, 10]: source.ts meta.block.ts storage.type.ts -[3, 9]: source.ts meta.block.ts meta.block.ts +[3, 9]: source.ts meta.block.ts meta.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue28.baseline.txt b/tests/baselines/Issue28.baseline.txt index c53c665c..0cc0c156 100644 --- a/tests/baselines/Issue28.baseline.txt +++ b/tests/baselines/Issue28.baseline.txt @@ -1,3 +1,17 @@ +original file +----------------------------------- + +/* Testing octals */ + +var x = ^^123; +var y = ^^0x123; +var z = ^^0b10101; +var z = ^^0B00000; +var j = ^^0o474774; +var w = ^^0O767; +^^ +----------------------------------- + > ^ source.ts diff --git a/tests/baselines/Issue28.txt b/tests/baselines/Issue28.txt index 1c8d244a..90e6fdd1 100644 --- a/tests/baselines/Issue28.txt +++ b/tests/baselines/Issue28.txt @@ -1,3 +1,17 @@ +original file +----------------------------------- + +/* Testing octals */ + +var x = ^^123; +var y = ^^0x123; +var z = ^^0b10101; +var z = ^^0B00000; +var j = ^^0o474774; +var w = ^^0O767; +^^ +----------------------------------- + [4, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts [5, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts [6, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts diff --git a/tests/baselines/Issue288.baseline.txt b/tests/baselines/Issue288.baseline.txt index ec571c4e..8bf35e59 100644 --- a/tests/baselines/Issue288.baseline.txt +++ b/tests/baselines/Issue288.baseline.txt @@ -1,3 +1,31 @@ +original file +----------------------------------- +// Issue 288: "function" in "functionName" gets highlighted. +// Fixed in pull request #289. + +function ^^Name(){ +} +var AnotherName = function^^(){ +} + +export function ^^eName(){ +} +export var eAnotherName = function^^(){ +} + +var function^^Name=1; +function^^Name=1; + +export var function^^Name2=1; + +var export^^Name="hello"; +export^^Name2="hello"; + +var return^^Name=1; +return^^Name+=1; + +----------------------------------- + >// Issue 288: "function" in "functionName" gets highlighted. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts comment.line.ts diff --git a/tests/baselines/Issue288.txt b/tests/baselines/Issue288.txt index ceefa59c..dd491afd 100644 --- a/tests/baselines/Issue288.txt +++ b/tests/baselines/Issue288.txt @@ -1,3 +1,31 @@ +original file +----------------------------------- +// Issue 288: "function" in "functionName" gets highlighted. +// Fixed in pull request #289. + +function ^^Name(){ +} +var AnotherName = function^^(){ +} + +export function ^^eName(){ +} +export var eAnotherName = function^^(){ +} + +var function^^Name=1; +function^^Name=1; + +export var function^^Name2=1; + +var export^^Name="hello"; +export^^Name2="hello"; + +var return^^Name=1; +return^^Name+=1; + +----------------------------------- + [4, 10]: source.ts meta.function.ts entity.name.function.ts [6, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts [9, 17]: source.ts meta.function.ts entity.name.function.ts diff --git a/tests/baselines/Issue32.baseline.txt b/tests/baselines/Issue32.baseline.txt index 47e276e9..abb76bb2 100644 --- a/tests/baselines/Issue32.baseline.txt +++ b/tests/baselines/Issue32.baseline.txt @@ -1,3 +1,28 @@ +original file +----------------------------------- +/* + Testing Isuue 32: Adding constructor as a support.type keword +*/ + +^^interface ^^NewInterface{ + ^^currentData: Data; + ^^setVal(d: Data) +} + + +^^class NewClass implements NewInterface { + ^^currentData: Data; + ^^setVal(d: Data){ + ^^this.currentData = d; + } + ^^constructor(^^m: ^^number, ^^n: ^^string){} +} +^^ +/* + Testing comments +*/ +----------------------------------- + >/* ^^ source.ts comment.block.ts diff --git a/tests/baselines/Issue32.txt b/tests/baselines/Issue32.txt index 8a06873f..2b465b2b 100644 --- a/tests/baselines/Issue32.txt +++ b/tests/baselines/Issue32.txt @@ -1,3 +1,28 @@ +original file +----------------------------------- +/* + Testing Isuue 32: Adding constructor as a support.type keword +*/ + +^^interface ^^NewInterface{ + ^^currentData: Data; + ^^setVal(d: Data) +} + + +^^class NewClass implements NewInterface { + ^^currentData: Data; + ^^setVal(d: Data){ + ^^this.currentData = d; + } + ^^constructor(^^m: ^^number, ^^n: ^^string){} +} +^^ +/* + Testing comments +*/ +----------------------------------- + [5, 1]: source.ts meta.declaration.object.ts storage.type.ts [5, 11]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts [6, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts diff --git a/tests/baselines/Issue335.baseline.txt b/tests/baselines/Issue335.baseline.txt index 8d81f396..c12cd896 100644 --- a/tests/baselines/Issue335.baseline.txt +++ b/tests/baselines/Issue335.baseline.txt @@ -1,3 +1,58 @@ +original file +----------------------------------- +class A1 { + b() { + let d; + d.^^default = 1; + } + + ^^private ^^static c() { + } +} + +class A2 { + b() { + let d; + d.^^case = 1 + } + + ^^private ^^static c() { + } +} + +class A3 { + b() { + let d + d.^^default = 1 + switch (d.^^default) { + ^^case 1: + ^^case 2: + ^^default: + break; + } + } + + ^^private ^^static c() { + } +} + +class A4 { + b() { + let d + d.^^case = 1 + switch (d.^^default) { + ^^case 1: + ^^case 2: + ^^default: + break; + } + } + + ^^private ^^static c() { + } +} +----------------------------------- + >class A1 { ^^^^^ source.ts meta.declaration.object.ts storage.type.ts diff --git a/tests/baselines/Issue335.txt b/tests/baselines/Issue335.txt index 3461b3d6..f362dc44 100644 --- a/tests/baselines/Issue335.txt +++ b/tests/baselines/Issue335.txt @@ -1,3 +1,58 @@ +original file +----------------------------------- +class A1 { + b() { + let d; + d.^^default = 1; + } + + ^^private ^^static c() { + } +} + +class A2 { + b() { + let d; + d.^^case = 1 + } + + ^^private ^^static c() { + } +} + +class A3 { + b() { + let d + d.^^default = 1 + switch (d.^^default) { + ^^case 1: + ^^case 2: + ^^default: + break; + } + } + + ^^private ^^static c() { + } +} + +class A4 { + b() { + let d + d.^^case = 1 + switch (d.^^default) { + ^^case 1: + ^^case 2: + ^^default: + break; + } + } + + ^^private ^^static c() { + } +} +----------------------------------- + [4, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts [7, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts [7, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts @@ -17,4 +72,4 @@ [43, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts [44, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts [49, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts -[49, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts +[49, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts \ No newline at end of file diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index 0ce73062..4966a9ba 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -1,3 +1,75 @@ +original file +----------------------------------- +//Test For Scopes + +^^import ^^* ^^as req ^^from "./Required" +import { Scale } from "./scale"; + +^^if (object.^^instanceof(ClassNew)) { +} + +^^class ^^class1(){ + ^^static ^^functioname(){ + + } +} + +^^export ^^class className(){ + ^^private ^^state = { } +} + +^^void ^^newFunctionName(){ + + ^^var c = a ^^+ b; + + ^^switch (someNum) { + ^^case 1: break; + ^^case 2: break; + ^^default: break; + } + +} + +/** + * Verify comments + */ + +^^module M { + ^^export function myFun(x: number) { + return x; + } +} + +var m: ^^typeof M = M; + +var adder = ^^new Adder(3, 4); +^^delete (adder) + +var s = typeof {}git +interface I {} +var j: I = {} + + +^^module ^^Body { + ^^export ^^class ^^Cell { + ^^public ^^parent: ^^Cell; + + ^^constructor(^^parent: ^^Cell) { + ^^this.parent = ^^parent; + if (^^typeof ^^parent ^^=== ^^'object' || ^^parent ^^instanceof ^^Error) { + ^^ + } + } + } +} + +/* +^^ + End of file + +*/ +----------------------------------- + >//Test For Scopes ^^^^^^^^^^^^^^^^^^ source.ts comment.line.ts diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt index f8b6d422..92a4e488 100644 --- a/tests/baselines/Issue37.txt +++ b/tests/baselines/Issue37.txt @@ -1,3 +1,75 @@ +original file +----------------------------------- +//Test For Scopes + +^^import ^^* ^^as req ^^from "./Required" +import { Scale } from "./scale"; + +^^if (object.^^instanceof(ClassNew)) { +} + +^^class ^^class1(){ + ^^static ^^functioname(){ + + } +} + +^^export ^^class className(){ + ^^private ^^state = { } +} + +^^void ^^newFunctionName(){ + + ^^var c = a ^^+ b; + + ^^switch (someNum) { + ^^case 1: break; + ^^case 2: break; + ^^default: break; + } + +} + +/** + * Verify comments + */ + +^^module M { + ^^export function myFun(x: number) { + return x; + } +} + +var m: ^^typeof M = M; + +var adder = ^^new Adder(3, 4); +^^delete (adder) + +var s = typeof {}git +interface I {} +var j: I = {} + + +^^module ^^Body { + ^^export ^^class ^^Cell { + ^^public ^^parent: ^^Cell; + + ^^constructor(^^parent: ^^Cell) { + ^^this.parent = ^^parent; + if (^^typeof ^^parent ^^=== ^^'object' || ^^parent ^^instanceof ^^Error) { + ^^ + } + } + } +} + +/* +^^ + End of file + +*/ +----------------------------------- + [3, 1]: source.ts keyword.control.import.include.ts [3, 8]: source.ts keyword.operator.arithmetic.ts [3, 10]: source.ts keyword.others.ts diff --git a/tests/baselines/Issue44.baseline.txt b/tests/baselines/Issue44.baseline.txt index e2eded49..e58adae7 100644 --- a/tests/baselines/Issue44.baseline.txt +++ b/tests/baselines/Issue44.baseline.txt @@ -1,3 +1,17 @@ +original file +----------------------------------- + +^^interface ^^TestInterface { + ^^testvar: ^^string; + ^^testfunc(): ^^string; +^^} + +/* + Testing Comments +*/ + +----------------------------------- + > ^ source.ts diff --git a/tests/baselines/Issue44.txt b/tests/baselines/Issue44.txt index c3e1e74a..dc00afe0 100644 --- a/tests/baselines/Issue44.txt +++ b/tests/baselines/Issue44.txt @@ -1,3 +1,17 @@ +original file +----------------------------------- + +^^interface ^^TestInterface { + ^^testvar: ^^string; + ^^testfunc(): ^^string; +^^} + +/* + Testing Comments +*/ + +----------------------------------- + [2, 1]: source.ts meta.declaration.object.ts storage.type.ts [2, 11]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts [3, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts diff --git a/tests/baselines/Issue5.baseline.txt b/tests/baselines/Issue5.baseline.txt index 2be9bd65..9c971e10 100644 --- a/tests/baselines/Issue5.baseline.txt +++ b/tests/baselines/Issue5.baseline.txt @@ -1,3 +1,42 @@ +original file +----------------------------------- +let new_string = ^^"^^New Changes" +^^ + +let plain_double_text = "Hello\ +this link to github is^^ https://github.com/\ +hello^^\ +World" + +let plain_single_text= ^^'Try with single bracket\ +hello world ^^\\\\\ +let this be ^\ +a good test ^' + +let double_quote_issue = " ^^ qstring-double:\ + ^^name: ^^string.double.ts^^\ + ^^begin: ^^\'\"\'\ + ^^end: ^^\'\"|(?:[^\r\n\\]$)'\ + ^^patterns:^^\ + ^^- include: ^^'#string-character-escape'^^\ + ^^" +^^ +let single_quote_issue = '^^qstring-single:^^\ + ^^name: string.single.ts^^\ + ^^begin: \"\'\"\ + ^^end: \'|(?:[^\r\n\\]$)^^\ + ^^endCaptures:^^\ + ^^ '0': {name: string-character-escape }^^\ + ^^patterns:^^\ + ^^- include: \'#string-character-escape\'^^\ + ^^' +^^ +let new_string = ^^"^^Changes End here^^" +^^ + + +----------------------------------- + >let new_string = "New Changes" ^^^ source.ts meta.var.expr.ts storage.type.ts diff --git a/tests/baselines/Issue5.txt b/tests/baselines/Issue5.txt index 5fff9547..e3ec3df1 100644 --- a/tests/baselines/Issue5.txt +++ b/tests/baselines/Issue5.txt @@ -1,3 +1,42 @@ +original file +----------------------------------- +let new_string = ^^"^^New Changes" +^^ + +let plain_double_text = "Hello\ +this link to github is^^ https://github.com/\ +hello^^\ +World" + +let plain_single_text= ^^'Try with single bracket\ +hello world ^^\\\\\ +let this be ^\ +a good test ^' + +let double_quote_issue = " ^^ qstring-double:\ + ^^name: ^^string.double.ts^^\ + ^^begin: ^^\'\"\'\ + ^^end: ^^\'\"|(?:[^\r\n\\]$)'\ + ^^patterns:^^\ + ^^- include: ^^'#string-character-escape'^^\ + ^^" +^^ +let single_quote_issue = '^^qstring-single:^^\ + ^^name: string.single.ts^^\ + ^^begin: \"\'\"\ + ^^end: \'|(?:[^\r\n\\]$)^^\ + ^^endCaptures:^^\ + ^^ '0': {name: string-character-escape }^^\ + ^^patterns:^^\ + ^^- include: \'#string-character-escape\'^^\ + ^^' +^^ +let new_string = ^^"^^Changes End here^^" +^^ + + +----------------------------------- + [1, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts [1, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts [2, 1]: source.ts diff --git a/tests/baselines/Issue63.baseline.txt b/tests/baselines/Issue63.baseline.txt index 96f2c7fd..3d275a6c 100644 --- a/tests/baselines/Issue63.baseline.txt +++ b/tests/baselines/Issue63.baseline.txt @@ -1,3 +1,21 @@ +original file +----------------------------------- +^^type ^^Callback <^^T> = ^^(error: Error, value: T) => any + +^^type Callback^^ = ^^(error: Error, value: T) ^^=> ^^any + +type Callback = ^^(error: Error, value: T) => ^^any + +^^type ^^Callback^^ ^^void> = ^^(error: Error, value: T) => ^^any + +^^ type ^^Foo <^^T > = ^^{ + + ^^foo: ^^T, + ^^bar: ^^number + +^^} +----------------------------------- + >type Callback = (error: Error, value: T) => any ^^^^ source.ts meta.type.declaration.ts keyword.other.ts diff --git a/tests/baselines/Issue63.txt b/tests/baselines/Issue63.txt index d13bcee3..f68fc935 100644 --- a/tests/baselines/Issue63.txt +++ b/tests/baselines/Issue63.txt @@ -1,3 +1,21 @@ +original file +----------------------------------- +^^type ^^Callback <^^T> = ^^(error: Error, value: T) => any + +^^type Callback^^ = ^^(error: Error, value: T) ^^=> ^^any + +type Callback = ^^(error: Error, value: T) => ^^any + +^^type ^^Callback^^ ^^void> = ^^(error: Error, value: T) => ^^any + +^^ type ^^Foo <^^T > = ^^{ + + ^^foo: ^^T, + ^^bar: ^^number + +^^} +----------------------------------- + [1, 1]: source.ts meta.type.declaration.ts keyword.other.ts [1, 6]: source.ts meta.type.declaration.ts entity.name.class.ts [1, 16]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts diff --git a/tests/baselines/Issue82.baseline.txt b/tests/baselines/Issue82.baseline.txt index 23f23ef9..64afbb03 100644 --- a/tests/baselines/Issue82.baseline.txt +++ b/tests/baselines/Issue82.baseline.txt @@ -1,3 +1,15 @@ +original file +----------------------------------- +class Foo { + constructor( + ^^test: ^^number, //^^ foo bar, + ^^exitEditModeCallback: ^^() => void //^^ Used to re-enable View updates. + ) { + ^^ + } +} +----------------------------------- + >class Foo { ^^^^^ source.ts meta.declaration.object.ts storage.type.ts diff --git a/tests/baselines/Issue82.txt b/tests/baselines/Issue82.txt index 20d295d9..2d6c5e45 100644 --- a/tests/baselines/Issue82.txt +++ b/tests/baselines/Issue82.txt @@ -1,3 +1,15 @@ +original file +----------------------------------- +class Foo { + constructor( + ^^test: ^^number, //^^ foo bar, + ^^exitEditModeCallback: ^^() => void //^^ Used to re-enable View updates. + ) { + ^^ + } +} +----------------------------------- + [3, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts [3, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts [3, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.ts diff --git a/tests/baselines/Issue89.baseline.txt b/tests/baselines/Issue89.baseline.txt index 8376bf9a..63431b91 100644 --- a/tests/baselines/Issue89.baseline.txt +++ b/tests/baselines/Issue89.baseline.txt @@ -1,3 +1,31 @@ +original file +----------------------------------- +export ^^class ^^A ^^extends /* ^^ */^^B ^^implements/**/ ^^C{ + ^^ +} +^^ + + +export class ^^D ^^implements/**/ ^^ F ^^extends /**/^^G ^^ { + ^^ +} +^^ + +export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ + ^^ +} +^^ + +^^class ^^className ^^extends ^^class1 ^^implements ^^class2 { + ^^ +} + +/* + Checking comments ^^ +*/ + +----------------------------------- + >export class A extends /* */B implements/**/ C{ ^^^^^^ source.ts meta.declaration.object.ts storage.type.ts diff --git a/tests/baselines/Issue89.txt b/tests/baselines/Issue89.txt index 89b18c41..aea46b79 100644 --- a/tests/baselines/Issue89.txt +++ b/tests/baselines/Issue89.txt @@ -1,3 +1,31 @@ +original file +----------------------------------- +export ^^class ^^A ^^extends /* ^^ */^^B ^^implements/**/ ^^C{ + ^^ +} +^^ + + +export class ^^D ^^implements/**/ ^^ F ^^extends /**/^^G ^^ { + ^^ +} +^^ + +export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ + ^^ +} +^^ + +^^class ^^className ^^extends ^^class1 ^^implements ^^class2 { + ^^ +} + +/* + Checking comments ^^ +*/ + +----------------------------------- + [1, 8]: source.ts meta.declaration.object.ts storage.type.ts [1, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts [1, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts diff --git a/tests/baselines/Issue90.baseline.txt b/tests/baselines/Issue90.baseline.txt index 6ea2b863..29ff1b42 100644 --- a/tests/baselines/Issue90.baseline.txt +++ b/tests/baselines/Issue90.baseline.txt @@ -1,3 +1,12 @@ +original file +----------------------------------- +^^ var a = 0; +^^ var ^^b = ^^1; +^^ var ^^c = ^^a ^^^ ^^b; +^^ + +----------------------------------- + > var a = 0; ^ source.ts meta.var.expr.ts diff --git a/tests/baselines/Issue90.txt b/tests/baselines/Issue90.txt index 01f9e05a..e27b0c04 100644 --- a/tests/baselines/Issue90.txt +++ b/tests/baselines/Issue90.txt @@ -1,3 +1,12 @@ +original file +----------------------------------- +^^ var a = 0; +^^ var ^^b = ^^1; +^^ var ^^c = ^^a ^^^ ^^b; +^^ + +----------------------------------- + [1, 1]: source.ts meta.var.expr.ts [2, 1]: source.ts meta.var.expr.ts [2, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts diff --git a/tests/baselines/Issue96.baseline.txt b/tests/baselines/Issue96.baseline.txt index 319699b7..dfb4675d 100644 --- a/tests/baselines/Issue96.baseline.txt +++ b/tests/baselines/Issue96.baseline.txt @@ -1,3 +1,19 @@ +original file +----------------------------------- +var^^ letter; +let^^ variable; + +var^^iable; +let^^ter; + +var const^^enum^^ = 10; +const^^enum^^ += 10; +const^^ enum^^ E { } + +var const^^able^^ = "I am rrrrrroyal!"; +const^^able^^ += " Royal, I say!"; +----------------------------------- + >var letter; ^^^ source.ts meta.var.expr.ts storage.type.ts diff --git a/tests/baselines/Issue96.txt b/tests/baselines/Issue96.txt index 64a9fb05..a8ef34d3 100644 --- a/tests/baselines/Issue96.txt +++ b/tests/baselines/Issue96.txt @@ -1,3 +1,19 @@ +original file +----------------------------------- +var^^ letter; +let^^ variable; + +var^^iable; +let^^ter; + +var const^^enum^^ = 10; +const^^enum^^ += 10; +const^^ enum^^ E { } + +var const^^able^^ = "I am rrrrrroyal!"; +const^^able^^ += " Royal, I say!"; +----------------------------------- + [1, 4]: source.ts meta.var.expr.ts [2, 4]: source.ts meta.var.expr.ts [4, 4]: source.ts diff --git a/tests/baselines/ParameterProperties.baseline.txt b/tests/baselines/ParameterProperties.baseline.txt index 236a4f91..b75d020d 100644 --- a/tests/baselines/ParameterProperties.baseline.txt +++ b/tests/baselines/ParameterProperties.baseline.txt @@ -1,3 +1,14 @@ +original file +----------------------------------- +class A { + constructor(^^private a: string, ^^protected b: string, ^^public c: string) { + } + foo() { + return this.a + this.b + this.c; + } +} +----------------------------------- + >class A { ^^^^^ source.ts meta.declaration.object.ts storage.type.ts diff --git a/tests/baselines/ParameterProperties.txt b/tests/baselines/ParameterProperties.txt index 49854aa1..82e725d1 100644 --- a/tests/baselines/ParameterProperties.txt +++ b/tests/baselines/ParameterProperties.txt @@ -1,3 +1,14 @@ +original file +----------------------------------- +class A { + constructor(^^private a: string, ^^protected b: string, ^^public c: string) { + } + foo() { + return this.a + this.b + this.c; + } +} +----------------------------------- + [2, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts -[2, 54]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts +[2, 54]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts \ No newline at end of file diff --git a/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt b/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt index 01842e75..380aded0 100644 --- a/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt +++ b/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt @@ -1,3 +1,16 @@ +original file +----------------------------------- +// Test for https://github.com/Microsoft/TypeScript-Sublime-Plugin/pull/307 + +class SomeClass { + ^^"some string" +} + +var y ^^"some string 2" + + +----------------------------------- + >// Test for https://github.com/Microsoft/TypeScript-Sublime-Plugin/pull/307 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts comment.line.ts diff --git a/tests/baselines/SyntacticallyIncorrectStrings.txt b/tests/baselines/SyntacticallyIncorrectStrings.txt index 655f8b89..230a7cdd 100644 --- a/tests/baselines/SyntacticallyIncorrectStrings.txt +++ b/tests/baselines/SyntacticallyIncorrectStrings.txt @@ -1,2 +1,15 @@ +original file +----------------------------------- +// Test for https://github.com/Microsoft/TypeScript-Sublime-Plugin/pull/307 + +class SomeClass { + ^^"some string" +} + +var y ^^"some string 2" + + +----------------------------------- + [4, 5]: source.ts meta.declaration.object.ts meta.object.body.ts string.double.ts [7, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts \ No newline at end of file diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index 9469ccd2..53f00ae6 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -1,3 +1,60 @@ +original file +----------------------------------- +class MyComponent extends React.Component{ + render() { + return ^^<^^div ^^onClick={^^this.stop}> + ^^This is a test: {this.state.count} +
+ } +} + +// JSX in Depth +// http://facebook.github.io/react/docs/jsx-in-depth.html +var App = + ^^<^^Form> + ^^<^^FormRow> + ^^<^^FormLabel ^^data="^^1" /> + ^^<^^FormInput ^^data="^^2" /> + ^^ + ^^ + +var App2 = ( + ^^<^^Form> + ^^<^^FormRow> + ^^<^^FormLabel ^^data='^^1' /> + ^^<^^FormInput ^^data='^^2' /> + ^^ + ^^ +) + +var content = ( + ^^<^^Nav> + {/* child comment, put {} around */} + ^^<^^Person ^^name={^^window.isLoggedIn ? window.name : ''} + ^^/> + ^^ +); + +// JSX Spread Attributes +// http://facebook.github.io/react/docs/jsx-spread.html +var props = {}; +props.foo = x; +props.bar = y; +var component = ^^<^^Component {^^...props} ^^/>; + +var props2 = { foo: 'default' } +var component2 = ^^<^^Component {^^...props} foo={'override'} ^^/> + +// JSX Gotchas +// http://facebook.github.io/react/docs/jsx-gotchas.html +var a =
{^^'First \u00b7 Second'}
+var b =
{'First ' + ^^String.fromCharCode(183) + ' Second'}
+var c =
{['First ', ^^·, ' Second']}
+var d =
+var e =
+ +----------------------------------- + >class MyComponent extends React.Component{ ^^^^^ source.tsx meta.declaration.object.tsx storage.type.tsx diff --git a/tests/baselines/TsxSamples.txt b/tests/baselines/TsxSamples.txt index c51d4f01..0393fbbd 100644 --- a/tests/baselines/TsxSamples.txt +++ b/tests/baselines/TsxSamples.txt @@ -1,3 +1,60 @@ +original file +----------------------------------- +class MyComponent extends React.Component{ + render() { + return ^^<^^div ^^onClick={^^this.stop}> + ^^This is a test: {this.state.count} +
+ } +} + +// JSX in Depth +// http://facebook.github.io/react/docs/jsx-in-depth.html +var App = + ^^<^^Form> + ^^<^^FormRow> + ^^<^^FormLabel ^^data="^^1" /> + ^^<^^FormInput ^^data="^^2" /> + ^^ + ^^ + +var App2 = ( + ^^<^^Form> + ^^<^^FormRow> + ^^<^^FormLabel ^^data='^^1' /> + ^^<^^FormInput ^^data='^^2' /> + ^^ + ^^ +) + +var content = ( + ^^<^^Nav> + {/* child comment, put {} around */} + ^^<^^Person ^^name={^^window.isLoggedIn ? window.name : ''} + ^^/> + ^^ +); + +// JSX Spread Attributes +// http://facebook.github.io/react/docs/jsx-spread.html +var props = {}; +props.foo = x; +props.bar = y; +var component = ^^<^^Component {^^...props} ^^/>; + +var props2 = { foo: 'default' } +var component2 = ^^<^^Component {^^...props} foo={'override'} ^^/> + +// JSX Gotchas +// http://facebook.github.io/react/docs/jsx-gotchas.html +var a =
{^^'First \u00b7 Second'}
+var b =
{'First ' + ^^String.fromCharCode(183) + ' Second'}
+var c =
{['First ', ^^·, ' Second']}
+var d =
+var e =
+ +----------------------------------- + [3, 16]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx punctuation.definition.tag.begin.tsx [3, 17]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx entity.name.tag.tsx [3, 21]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx diff --git a/tests/baselines/awaitColoring.baseline.txt b/tests/baselines/awaitColoring.baseline.txt index 40d2a938..5dfb0e0c 100644 --- a/tests/baselines/awaitColoring.baseline.txt +++ b/tests/baselines/awaitColoring.baseline.txt @@ -1,3 +1,9 @@ +original file +----------------------------------- +^^await 1; +^^awaiting 1; +----------------------------------- + >await 1; ^^^^^ source.ts storage.modifier.ts diff --git a/tests/baselines/awaitColoring.txt b/tests/baselines/awaitColoring.txt index 9ef7dacb..782a902e 100644 --- a/tests/baselines/awaitColoring.txt +++ b/tests/baselines/awaitColoring.txt @@ -1,2 +1,8 @@ +original file +----------------------------------- +^^await 1; +^^awaiting 1; +----------------------------------- + [1, 1]: source.ts storage.modifier.ts [2, 1]: source.ts \ No newline at end of file diff --git a/tests/baselines/javascript.baseline.txt b/tests/baselines/javascript.baseline.txt index 3bb4d632..ab782845 100644 --- a/tests/baselines/javascript.baseline.txt +++ b/tests/baselines/javascript.baseline.txt @@ -1,3 +1,15 @@ +original file +----------------------------------- +^^switch (x) { + ^^case 0: + ^^default: +} +^^typeof x; +^^void x; +^^delete x.y; +x ^^instanceof y; +----------------------------------- + >switch (x) { ^^^^^^ source.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts diff --git a/tests/baselines/javascript.txt b/tests/baselines/javascript.txt index 94b7e047..d41b83fd 100644 --- a/tests/baselines/javascript.txt +++ b/tests/baselines/javascript.txt @@ -1,3 +1,15 @@ +original file +----------------------------------- +^^switch (x) { + ^^case 0: + ^^default: +} +^^typeof x; +^^void x; +^^delete x.y; +x ^^instanceof y; +----------------------------------- + [1, 1]: source.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts [2, 5]: source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts [3, 5]: source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index 0ce04e14..9fca48e2 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -1,3 +1,13 @@ +original file +----------------------------------- +var ^^a, ^^b, ^^c +var ^^a1 = 1, ^^b1 = function (x) { return 1; }, ^^c1 = "string" +var ^^a2: string = "test", ^^b2: () => void = () => { console.log("hello"); }, ^^c2: string | number; +var ^^obj = { + foo: "10" +}, ^^other = 10; +----------------------------------- + >var a, b, c ^^^ source.ts meta.var.expr.ts storage.type.ts diff --git a/tests/baselines/multipleVariableDeclaration.txt b/tests/baselines/multipleVariableDeclaration.txt index cc74745c..df174414 100644 --- a/tests/baselines/multipleVariableDeclaration.txt +++ b/tests/baselines/multipleVariableDeclaration.txt @@ -1,3 +1,13 @@ +original file +----------------------------------- +var ^^a, ^^b, ^^c +var ^^a1 = 1, ^^b1 = function (x) { return 1; }, ^^c1 = "string" +var ^^a2: string = "test", ^^b2: () => void = () => { console.log("hello"); }, ^^c2: string | number; +var ^^obj = { + foo: "10" +}, ^^other = 10; +----------------------------------- + [1, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts [1, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts [1, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts diff --git a/tests/baselines/namespaceAndModule.baseline.txt b/tests/baselines/namespaceAndModule.baseline.txt index ed339660..eae3650d 100644 --- a/tests/baselines/namespaceAndModule.baseline.txt +++ b/tests/baselines/namespaceAndModule.baseline.txt @@ -1,3 +1,12 @@ +original file +----------------------------------- +^^namespace ts { } +^^module ts { } +declare ^^namespace ts {} +declare ^^module ts {} +declare ^^module "x" {} +----------------------------------- + >namespace ts { } ^^^^^^^^^ source.ts storage.type.ts diff --git a/tests/baselines/namespaceAndModule.txt b/tests/baselines/namespaceAndModule.txt index f24e0dee..c864bfd1 100644 --- a/tests/baselines/namespaceAndModule.txt +++ b/tests/baselines/namespaceAndModule.txt @@ -1,3 +1,12 @@ +original file +----------------------------------- +^^namespace ts { } +^^module ts { } +declare ^^namespace ts {} +declare ^^module ts {} +declare ^^module "x" {} +----------------------------------- + [1, 1]: source.ts storage.type.ts [2, 1]: source.ts storage.type.ts [3, 9]: source.ts storage.type.ts diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index 21d5bd1d..13703c76 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -1,3 +1,28 @@ +original file +----------------------------------- +class Test { + ^^private ^^data: TemplateData[] = [] + ^^private ^^options: TemplateOptions = {} + ^^private ^^state = {} +} + +^^export ^^type ^^Stats = fs.Stats +^^export ^^const ^^touch = thenify(tch) + +/** + * Verify comments + */ +^^export ^^function isFile(path: string): ^^Promise { + ^^return stat(path).then(stat => stat.isFile(), () => false) +} + + +^^export ^^const readFile = thenify<^^string, string, string>(fs.readFile) +^^export ^^const writeFile = thenify<^^string, string | Buffer, void>(fs.writeFile) + + +----------------------------------- + >class Test { ^^^^^ source.ts meta.declaration.object.ts storage.type.ts diff --git a/tests/baselines/pr48_noSemiColon.txt b/tests/baselines/pr48_noSemiColon.txt index b343431b..b8a0051f 100644 --- a/tests/baselines/pr48_noSemiColon.txt +++ b/tests/baselines/pr48_noSemiColon.txt @@ -1,3 +1,28 @@ +original file +----------------------------------- +class Test { + ^^private ^^data: TemplateData[] = [] + ^^private ^^options: TemplateOptions = {} + ^^private ^^state = {} +} + +^^export ^^type ^^Stats = fs.Stats +^^export ^^const ^^touch = thenify(tch) + +/** + * Verify comments + */ +^^export ^^function isFile(path: string): ^^Promise { + ^^return stat(path).then(stat => stat.isFile(), () => false) +} + + +^^export ^^const readFile = thenify<^^string, string, string>(fs.readFile) +^^export ^^const writeFile = thenify<^^string, string | Buffer, void>(fs.writeFile) + + +----------------------------------- + [2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts [2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts [3, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts diff --git a/tests/build.ts b/tests/build.ts index b466af1a..d36832c9 100644 --- a/tests/build.ts +++ b/tests/build.ts @@ -25,6 +25,12 @@ function getMarkerLocations(str: string): number[] { return locations; } +function getInputFile(oriLines: string[]): string { + return "original file\n-----------------------------------\n" + + oriLines.join("\n") + + "\n-----------------------------------\n\n"; +} + function getScopesAtMarkers(text: string, grammar: vt.IGrammar): string { let oriLines = text.split('\n'); let ruleStack:vt.StackElement[] = undefined; @@ -45,7 +51,7 @@ function getScopesAtMarkers(text: string, grammar: vt.IGrammar): string { } } - return outputLines.join('\n'); + return getInputFile(oriLines) + outputLines.join('\n'); } function baselineWholeFile(text: string, grammar: vt.IGrammar): string { @@ -75,7 +81,7 @@ function baselineWholeFile(text: string, grammar: vt.IGrammar): string { } } - return outputLines.join('\n'); + return getInputFile(oriLines) + outputLines.join('\n'); } for (var fileName of fs.readdirSync('cases')) { From b08936f39f5ec25174926d7ac3387f2307a78af7 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 28 Jul 2016 15:12:56 -0700 Subject: [PATCH 03/77] Stop running old baselines along with making better baseline for markers too --- tests/baselines/Abstracts.txt | 22 +- .../ArrowFunctionInsideTypeAssertion.txt | 73 ++++- tests/baselines/Comments.txt | 301 +++++++++++++----- tests/baselines/FunctionMethodOverloads.txt | 224 +++++++++---- tests/baselines/FunctionMethodParameters.txt | 97 ++++-- tests/baselines/FunctionMethodReturnTypes.txt | 265 ++++++++++----- tests/baselines/Issue110.txt | 75 +++-- tests/baselines/Issue124.txt | 97 ++++-- tests/baselines/Issue149.txt | 82 +++-- tests/baselines/Issue156.txt | 27 +- tests/baselines/Issue191.txt | 116 +++++-- tests/baselines/Issue200.txt | 39 ++- tests/baselines/Issue208.txt | 85 +++-- tests/baselines/Issue262.txt | 20 +- tests/baselines/Issue28.txt | 31 +- tests/baselines/Issue288.txt | 57 +++- tests/baselines/Issue32.txt | 63 +++- tests/baselines/Issue335.txt | 111 +++++-- tests/baselines/Issue37.txt | 215 ++++++++++--- tests/baselines/Issue44.txt | 31 +- tests/baselines/Issue5.txt | 164 +++++++--- tests/baselines/Issue63.txt | 98 ++++-- tests/baselines/Issue82.txt | 29 +- tests/baselines/Issue89.txt | 129 ++++++-- tests/baselines/Issue90.txt | 35 +- tests/baselines/Issue96.txt | 54 +++- tests/baselines/ParameterProperties.txt | 16 +- .../SyntacticallyIncorrectStrings.txt | 15 +- tests/baselines/TsxSamples.txt | 230 +++++++++---- tests/baselines/awaitColoring.txt | 8 +- tests/baselines/javascript.txt | 29 +- .../baselines/multipleVariableDeclaration.txt | 39 ++- tests/baselines/namespaceAndModule.txt | 20 +- tests/baselines/pr48_noSemiColon.txt | 87 +++-- tests/build.ts | 29 +- 35 files changed, 2243 insertions(+), 770 deletions(-) diff --git a/tests/baselines/Abstracts.txt b/tests/baselines/Abstracts.txt index 6ca14417..04acadff 100644 --- a/tests/baselines/Abstracts.txt +++ b/tests/baselines/Abstracts.txt @@ -18,5 +18,23 @@ let cow = new Cow(); cow.makeSound(); ----------------------------------- -[1, 1]: source.ts meta.declaration.object.ts storage.modifier.ts -[4, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts \ No newline at end of file +>abstract class Animal { + ^^^^^^^^ + [1, 1]: source.ts meta.declaration.object.ts storage.modifier.ts +> public age: number; +> public yearsLeft() { return 20 - this.age; } +> abstract makeSound(): string; + ^^^^^^^^ + [4, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts +>} +> +>class Cow extends Animal { +> makeSound() { return "Moo"; } +>} +> +>class Cat extends Animal { +> makeSound() { return "Meow"; } +>} +> +>let cow = new Cow(); +>cow.makeSound(); \ No newline at end of file diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt index 4f301e8a..8d24d9e7 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt @@ -24,20 +24,59 @@ function f(x: string | ((value: string) => number)) { ----------------------------------- -[4, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts -[4, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts -[4, 21]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts -[4, 30]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts -[4, 43]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts -[4, 57]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts -[4, 65]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts keyword.operator.ts -[4, 68]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts -[4, 73]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts constant.language.null.ts -[17, 17]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts -[17, 18]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts -[17, 19]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts -[17, 22]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts -[17, 30]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts keyword.operator.ts -[17, 33]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts -[17, 39]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts -[17, 41]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts \ No newline at end of file +>// Issue: https://github.com/Microsoft/TypeScript-Sublime-Plugin/issues/292 +> +>var object = { +> setTransform: <(domNode: HTMLElement, desiredValue: string) => void>null, + ^ + [4, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts + ^ + [4, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts + ^^^^^^^ + [4, 21]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + ^^^^^^^^^^^ + [4, 30]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + ^^^^^^^^^^^^ + [4, 43]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + ^^^^^^ + [4, 57]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + ^^ + [4, 65]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts keyword.operator.ts + ^^^^ + [4, 68]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^^^^ + [4, 73]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts constant.language.null.ts +> setDisplay: (domNode: HTMLElement, desiredValue: string) => { +> if (domNode.style.display !== desiredValue) { +> domNode.style.display = desiredValue; +> } +> } +>} +> +>function f(x: string | ((value: string) => number)) { +> if (typeof x === "string") { +> return +x +> } +> else { +> let f = <(v: string) => number> x + ^ + [17, 17]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts + ^ + [17, 18]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts + ^ + [17, 19]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + ^^^^^^ + [17, 22]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + ^^ + [17, 30]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts keyword.operator.ts + ^^^^^^ + [17, 33]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + [17, 39]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts + ^^ + [17, 41]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts +> return f("hello world") +> } +>} +> +> \ No newline at end of file diff --git a/tests/baselines/Comments.txt b/tests/baselines/Comments.txt index 0e2ac749..f7779c10 100644 --- a/tests/baselines/Comments.txt +++ b/tests/baselines/Comments.txt @@ -72,80 +72,227 @@ var x = ^^/* comments */ new String(); var x = new ^^/* comments */ String(); ----------------------------------- -[9, 5]: source.ts meta.var.expr.ts comment.block.ts -[10, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts -[11, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts -[12, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts -[13, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts -[14, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts -[15, 26]: source.ts comment.block.ts -[17, 5]: source.ts meta.var.expr.ts comment.block.ts -[18, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts -[19, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts -[20, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts -[21, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts -[22, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts -[24, 1]: source.ts comment.block.ts -[25, 11]: source.ts meta.declaration.object.ts comment.block.ts -[26, 13]: source.ts meta.declaration.object.ts comment.block.ts -[27, 21]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[28, 24]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[29, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[30, 28]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[31, 29]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[32, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[33, 1]: source.ts comment.block.ts -[33, 16]: source.ts meta.declaration.object.ts comment.block.ts -[33, 23]: source.ts meta.declaration.object.ts comment.block.ts -[33, 36]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[33, 45]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[33, 54]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[33, 62]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[34, 1]: source.ts comment.block.ts -[34, 16]: source.ts meta.declaration.object.ts comment.block.ts -[34, 23]: source.ts meta.declaration.object.ts comment.block.ts -[34, 36]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[34, 44]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[34, 51]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[34, 59]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[34, 66]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[34, 74]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[36, 1]: source.ts comment.block.ts -[37, 6]: source.ts meta.declaration.object.ts comment.block.ts -[38, 8]: source.ts meta.declaration.object.ts comment.block.ts -[39, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[40, 19]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[41, 20]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[42, 22]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[43, 23]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[44, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[45, 1]: source.ts comment.block.ts -[45, 10]: source.ts meta.declaration.object.ts comment.block.ts -[45, 15]: source.ts meta.declaration.object.ts comment.block.ts -[45, 26]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[45, 33]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[45, 40]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[45, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[46, 1]: source.ts comment.block.ts -[46, 10]: source.ts meta.declaration.object.ts comment.block.ts -[46, 15]: source.ts meta.declaration.object.ts comment.block.ts -[46, 26]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[46, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[46, 37]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[46, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[46, 48]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[46, 54]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[48, 23]: source.ts meta.declaration.object.ts comment.block.ts -[49, 29]: source.ts meta.declaration.object.ts comment.block.ts -[50, 37]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[51, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[52, 50]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[54, 12]: source.ts meta.declaration.object.ts comment.block.ts -[57, 31]: source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts -[60, 39]: source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts -[64, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts -[65, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts -[66, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts -[68, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts -[69, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts -[70, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts \ No newline at end of file +>/* +>Tests for comments in general. +> +>Pull requests: +> - https://github.com/Microsoft/TypeScript-Sublime-Plugin/pull/307 +> - https://github.com/Microsoft/TypeScript-Sublime-Plugin/pull/308 +>*/ +> +>var /* comment */ x: string = "yahoo"; + ^^ + [9, 5]: source.ts meta.var.expr.ts comment.block.ts +>var x /* comment */: string = "yahoo"; + ^^ + [10, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts +>var x: /* comment */ string = "yahoo"; + ^^ + [11, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts +>var x: string /* comment */ = "yahoo"; + ^^ + [12, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts +>var x: string = /* comment */ "yahoo"; + ^^ + [13, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts +>var x: string = "yahoo" /* comment */; + ^^ + [14, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts +>var x: string = "yahoo"; /* comment */ + ^^ + [15, 26]: source.ts comment.block.ts +> +>var /* comment */ x: string = "yahoo" + ^^ + [17, 5]: source.ts meta.var.expr.ts comment.block.ts +>var x /* comment */: string = "yahoo" + ^^ + [18, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts +>var x: /* comment */ string = "yahoo" + ^^ + [19, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts +>var x: string /* comment */ = "yahoo" + ^^ + [20, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts +>var x: string = /* comment */ "yahoo" + ^^ + [21, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts +>var x: string = "yahoo" /* comment */ + ^^ + [22, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts +> +>/**/ interface i extends i1, i2, i3 {} + ^^ + [24, 1]: source.ts comment.block.ts +>interface /**/ i extends i1, i2, i3 {} + ^^ + [25, 11]: source.ts meta.declaration.object.ts comment.block.ts +>interface i /**/ extends i1, i2, i3 {} + ^^ + [26, 13]: source.ts meta.declaration.object.ts comment.block.ts +>interface i extends /**/ i1, i2, i3 {} + ^^ + [27, 21]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>interface i extends i1 /**/, i2, i3 {} + ^^ + [28, 24]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>interface i extends i1, /**/ i2, i3 {} + ^^ + [29, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>interface i extends i1, i2 /**/, i3 {} + ^^ + [30, 28]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>interface i extends i1, i2, /**/ i3 {} + ^^ + [31, 29]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>interface i extends i1, i2, i3 /**/ {} + ^^ + [32, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>/**/ interface /**/ i /**/ extends /**/ i1, /**/ i2, /**/ i3 /**/ {} + ^^ + [33, 1]: source.ts comment.block.ts + ^^ + [33, 16]: source.ts meta.declaration.object.ts comment.block.ts + ^^ + [33, 23]: source.ts meta.declaration.object.ts comment.block.ts + ^^ + [33, 36]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [33, 45]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [33, 54]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [33, 62]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>/**/ interface /**/ i /**/ extends /**/ i1 /**/ , /**/ i2 /**/ , /**/ i3 /**/ {} + ^^ + [34, 1]: source.ts comment.block.ts + ^^ + [34, 16]: source.ts meta.declaration.object.ts comment.block.ts + ^^ + [34, 23]: source.ts meta.declaration.object.ts comment.block.ts + ^^ + [34, 36]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [34, 44]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [34, 51]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [34, 59]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [34, 66]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [34, 74]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +> +>/**/class i extends c1,c2,c3{} + ^^ + [36, 1]: source.ts comment.block.ts +>class/**/i extends c1,c2,c3{} + ^^ + [37, 6]: source.ts meta.declaration.object.ts comment.block.ts +>class i/**/extends c1,c2,c3{} + ^^ + [38, 8]: source.ts meta.declaration.object.ts comment.block.ts +>class i extends/**/c1,c2,c3{} + ^^ + [39, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>class i extends c1/**/,c2,c3{} + ^^ + [40, 19]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>class i extends c1,/**/c2,c3{} + ^^ + [41, 20]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>class i extends c1,c2/**/,c3{} + ^^ + [42, 22]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>class i extends c1,c2,/**/c3{} + ^^ + [43, 23]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>class i extends c1,c2,c3/**/{} + ^^ + [44, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>/**/class/**/i/**/extends/**/c1,/**/c2,/**/c3/**/{} + ^^ + [45, 1]: source.ts comment.block.ts + ^^ + [45, 10]: source.ts meta.declaration.object.ts comment.block.ts + ^^ + [45, 15]: source.ts meta.declaration.object.ts comment.block.ts + ^^ + [45, 26]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [45, 33]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [45, 40]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [45, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>/**/class/**/i/**/extends/**/c1/**/,/**/c2/**/,/**/c3/**/{} + ^^ + [46, 1]: source.ts comment.block.ts + ^^ + [46, 10]: source.ts meta.declaration.object.ts comment.block.ts + ^^ + [46, 15]: source.ts meta.declaration.object.ts comment.block.ts + ^^ + [46, 26]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [46, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [46, 37]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [46, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [46, 48]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^^ + [46, 54]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +> +>interface KeyValuePair/**/ extends Array { 0: K; 1: V; } + ^^ + [48, 23]: source.ts meta.declaration.object.ts comment.block.ts +>interface KeyValuePair/**/extends Array { 0: K; 1: V; } + ^^ + [49, 29]: source.ts meta.declaration.object.ts comment.block.ts +>interface KeyValuePair extends/**/Array { 0: K; 1: V; } + ^^ + [50, 37]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>interface KeyValuePair extends Array/**/ { 0: K; 1: V; } + ^^ + [51, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +>interface KeyValuePair extends Array/**/{ 0: K; 1: V; } + ^^ + [52, 50]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts +> +>interface G/**/ { + ^^ + [54, 12]: source.ts meta.declaration.object.ts comment.block.ts +> f(x: V): V; +>} +>interface G { + ^^ + [57, 31]: source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts +> f(x: V): V; +>} +>interface G { + ^^ + [60, 39]: source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts +> f(x: V): V; +>} +> +>var x/*comments*/=new String(); + ^^ + [64, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts +>var x=/*comments*/new String(); + ^^ + [65, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts +>var x= new/*comments*/String(); + ^^ + [66, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts +> +>var x /* comments */ = new String(); + ^^ + [68, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts +>var x = /* comments */ new String(); + ^^ + [69, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts +>var x = new /* comments */ String(); + ^^ + [70, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts \ No newline at end of file diff --git a/tests/baselines/FunctionMethodOverloads.txt b/tests/baselines/FunctionMethodOverloads.txt index 7ebad679..807b7658 100644 --- a/tests/baselines/FunctionMethodOverloads.txt +++ b/tests/baselines/FunctionMethodOverloads.txt @@ -52,61 +52,169 @@ abstract class C { } ----------------------------------- -[2, 1]: source.ts meta.function.ts storage.type.ts -[2, 17]: source.ts meta.function.ts entity.name.function.ts -[3, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts -[3, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts -[4, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts -[4, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts -[5, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts -[5, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts -[6, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts -[6, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts -[7, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts -[7, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts -[8, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[11, 1]: source.ts meta.function.ts storage.type.ts -[11, 17]: source.ts meta.function.ts entity.name.function.ts -[12, 1]: source.ts meta.function.ts storage.type.ts -[12, 17]: source.ts meta.function.ts entity.name.function.ts -[13, 1]: source.ts meta.function.ts storage.type.ts -[13, 17]: source.ts meta.function.ts entity.name.function.ts -[14, 1]: source.ts meta.function.ts storage.type.ts -[14, 17]: source.ts meta.function.ts entity.name.function.ts -[15, 1]: source.ts meta.function.ts storage.type.ts -[15, 17]: source.ts meta.function.ts entity.name.function.ts -[16, 1]: source.ts meta.function.ts storage.type.ts -[16, 17]: source.ts meta.function.ts entity.name.function.ts -[17, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[23, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[23, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[24, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts -[24, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts -[25, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts -[25, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts -[26, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts -[26, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts -[27, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts -[27, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts -[28, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts -[28, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts -[29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts -[32, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[32, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[33, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[33, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[34, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[34, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[35, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[35, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[36, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[36, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[37, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[37, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[38, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts -[43, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[44, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts -[48, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[48, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[49, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts -[49, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts \ No newline at end of file +>/* Function overload tests */ +>export function testFunctionOverload(p: number): new() => any + ^^^^^^ + [2, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^ + [2, 17]: source.ts meta.function.ts entity.name.function.ts +>export function testFunctionOverload(p: string) + ^^^^^^ + [3, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^ + [3, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts +>export function testFunctionOverload(p: string []) + ^^^^^^ + [4, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^ + [4, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts +>export function testFunctionOverload(p: {}) + ^^^^^^ + [5, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^ + [5, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts +>export function testFunctionOverload(p: {a: A, b:B} | string []) + ^^^^^^ + [6, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^ + [6, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts +>export function testFunctionOverload(p: any): new() => any { + ^^^^^^ + [7, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^ + [7, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts +> throw new Error("") + ^^^^^ + [8, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>} +> +>export function testFunctionOverloadWithSemicolon(p: number): new () => any; + ^^^^^^ + [11, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [11, 17]: source.ts meta.function.ts entity.name.function.ts +>export function testFunctionOverloadWithSemicolon(p: string); + ^^^^^^ + [12, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [12, 17]: source.ts meta.function.ts entity.name.function.ts +>export function testFunctionOverloadWithSemicolon(p: string[]); + ^^^^^^ + [13, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [13, 17]: source.ts meta.function.ts entity.name.function.ts +>export function testFunctionOverloadWithSemicolon(p: {}); + ^^^^^^ + [14, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [14, 17]: source.ts meta.function.ts entity.name.function.ts +>export function testFunctionOverloadWithSemicolon(p: { a: A, b: B } | string[]); + ^^^^^^ + [15, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [15, 17]: source.ts meta.function.ts entity.name.function.ts +>export function testFunctionOverloadWithSemicolon(p: any): new () => any { + ^^^^^^ + [16, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [16, 17]: source.ts meta.function.ts entity.name.function.ts +> throw new Error("") + ^^^^^ + [17, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>} +> +> +>class testClass { +> /* Function overload tests */ +> public testMethodOverload(p: number): new() => any + ^^^^^^ + [23, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^ + [23, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts +> public testMethodOverload(p: string) + ^^^^^^ + [24, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^ + [24, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts +> public testMethodOverload(p: string []) + ^^^^^^ + [25, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^ + [25, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts +> public testMethodOverload(p: {}) + ^^^^^^ + [26, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^ + [26, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts +> public testMethodOverload(p: {a: A, b:B} | string []) + ^^^^^^ + [27, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^ + [27, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts +> public testMethodOverload(p: any): new() => any { + ^^^^^^ + [28, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^ + [28, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts +> throw new Error("") + ^^^^^ + [29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> } +> +> public testMethodOverloadWithSemicolon(p: number): new () => any; + ^^^^^^ + [32, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [32, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts +> public testMethodOverloadWithSemicolon(p: string); + ^^^^^^ + [33, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [33, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts +> public testMethodOverloadWithSemicolon(p: string[]); + ^^^^^^ + [34, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [34, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts +> public testMethodOverloadWithSemicolon(p: {}); + ^^^^^^ + [35, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [35, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts +> public testMethodOverloadWithSemicolon(p: { a: A, b: B } | string[]); + ^^^^^^ + [36, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [36, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts +> public testMethodOverloadWithSemicolon(p: any): new () => any { + ^^^^^^ + [37, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [37, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts +> throw new Error("") + ^^^^^ + [38, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> } +>} +> +>interface I { +> foo(): number + ^^^ + [43, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts +> bar(): string; + ^^^ + [44, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts +>} +> +>abstract class C { +> abstract foo() + ^^^^^^^^ + [48, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^ + [48, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts +> abstract bar() + ^^^^^^^^ + [49, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts storage.modifier.ts + ^^^ + [49, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts +>} \ No newline at end of file diff --git a/tests/baselines/FunctionMethodParameters.txt b/tests/baselines/FunctionMethodParameters.txt index eea97aea..6a5f1733 100644 --- a/tests/baselines/FunctionMethodParameters.txt +++ b/tests/baselines/FunctionMethodParameters.txt @@ -33,25 +33,78 @@ class testClass { } ----------------------------------- -[3, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[4, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[5, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[6, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[7, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[8, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[9, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[10, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[11, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[12, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[13, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[19, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[20, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[21, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[22, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[23, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[24, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[25, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[26, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[27, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[28, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts \ No newline at end of file +>/* Function parameter tests */ +>function testFunctionParamType( +> m1: string, + ^^ + [3, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m2: {}, + ^^ + [4, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m3: any [], + ^^ + [5, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m4: {a: A, b: B}, + ^^ + [6, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m5: () => void, + ^^ + [7, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m6: (x:(string), y:[number, string]) => number, + ^^ + [8, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m7: Array, + ^^ + [9, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m8: [number, number], + ^^ + [10, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m9: {a: A, b: B} | [number, number], + ^^ + [11, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m10: (() => void) | string[]): number { + ^^^ + [12, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> return m6.length; + ^^^^^^ + [13, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>} +> +>class testClass { +> /* method param type tests */ +> public testMethodParamType( +> m1: string, + ^^ + [19, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m2: {}, + ^^ + [20, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m3: any [], + ^^ + [21, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m4: {a: A, b: B}, + ^^ + [22, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m5: () => void, + ^^ + [23, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m6: (x:(string), y:[number, string]) => number, + ^^ + [24, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m7: Array, + ^^ + [25, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m8: [number, number], + ^^ + [26, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m9: {a: A, b: B} | [number, number], + ^^ + [27, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> m10: (() => void) | string[]): number { + ^^^ + [28, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts +> return m6.length; + ^^^^^^ + [29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> } +>} \ No newline at end of file diff --git a/tests/baselines/FunctionMethodReturnTypes.txt b/tests/baselines/FunctionMethodReturnTypes.txt index 2b1950e6..3f9d9bb7 100644 --- a/tests/baselines/FunctionMethodReturnTypes.txt +++ b/tests/baselines/FunctionMethodReturnTypes.txt @@ -33,81 +33,190 @@ class TestClass { } ----------------------------------- -[2, 1]: source.ts meta.function.ts storage.type.ts -[2, 17]: source.ts meta.function.ts entity.name.function.ts -[2, 56]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[3, 1]: source.ts meta.function.ts storage.type.ts -[3, 17]: source.ts meta.function.ts entity.name.function.ts -[3, 49]: source.ts meta.block.ts keyword.control.ts -[4, 1]: source.ts meta.function.ts storage.type.ts -[4, 17]: source.ts meta.function.ts entity.name.function.ts -[4, 59]: source.ts meta.block.ts keyword.control.ts -[5, 1]: source.ts meta.function.ts storage.type.ts -[5, 17]: source.ts meta.function.ts entity.name.function.ts -[5, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[6, 1]: source.ts meta.function.ts storage.type.ts -[6, 17]: source.ts meta.function.ts entity.name.function.ts -[6, 55]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[7, 1]: source.ts meta.function.ts storage.type.ts -[7, 17]: source.ts meta.function.ts entity.name.function.ts -[7, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[8, 1]: source.ts meta.function.ts storage.type.ts -[8, 17]: source.ts meta.function.ts entity.name.function.ts -[8, 61]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[9, 1]: source.ts meta.function.ts storage.type.ts -[9, 17]: source.ts meta.function.ts entity.name.function.ts -[9, 64]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[10, 1]: source.ts meta.function.ts storage.type.ts -[10, 17]: source.ts meta.function.ts entity.name.function.ts -[10, 78]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[11, 1]: source.ts meta.function.ts storage.type.ts -[11, 17]: source.ts meta.function.ts entity.name.function.ts -[11, 63]: source.ts meta.block.ts keyword.control.ts -[12, 1]: source.ts meta.function.ts storage.type.ts -[12, 17]: source.ts meta.function.ts entity.name.function.ts -[12, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[13, 1]: source.ts meta.function.ts storage.type.ts -[13, 17]: source.ts meta.function.ts entity.name.function.ts -[13, 66]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[14, 1]: source.ts meta.function.ts storage.type.ts -[14, 17]: source.ts meta.function.ts entity.name.function.ts -[14, 76]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[18, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[18, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[18, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts -[19, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[19, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[19, 42]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts -[20, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[20, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[20, 52]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts -[21, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[21, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[21, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts -[22, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[22, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[22, 48]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts -[23, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[23, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[23, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts -[24, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[24, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[24, 54]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts -[25, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[25, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[25, 57]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts -[26, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[26, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[26, 71]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts -[27, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[27, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[27, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts -[28, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[28, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[28, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts -[29, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[29, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[29, 59]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts -[30, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts -[30, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[30, 69]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts \ No newline at end of file +>/* Function return type tests */ +>export function testFunctionReturnType1(): string [] { return [""] } + ^^^^^^ + [2, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + [2, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^^^^ + [2, 56]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>export function testFunctionReturnType2(): {} { return {} } + ^^^^^^ + [3, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + [3, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^^^^ + [3, 49]: source.ts meta.block.ts keyword.control.ts +>export function testFunctionReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} } + ^^^^^^ + [4, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + [4, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^^^^ + [4, 59]: source.ts meta.block.ts keyword.control.ts +>export function testFunctionReturnType4(): [number, number] { return [1, 1] } + ^^^^^^ + [5, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + [5, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^^^^ + [5, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>export function testFunctionReturnType5(): Array { return [{ m: "" }] } + ^^^^^^ + [6, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + [6, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^^^^ + [6, 55]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>export function testFunctionReturnType6(): new () => number { throw new Error(""); } + ^^^^^^ + [7, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + [7, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^^^ + [7, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>export function testFunctionReturnType7(): (() => number) { throw new Error(""); } + ^^^^^^ + [8, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + [8, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^^^ + [8, 61]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>export function testFunctionReturnType8(): (() => number) [] { throw new Error(""); } + ^^^^^^ + [9, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + [9, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^^^ + [9, 64]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>export function testFunctionReturnType9(): (() => number) | (() => string) { throw new Error(""); } + ^^^^^^ + [10, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^ + [10, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^^^ + [10, 78]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>export function testFunctionReturnType10(): {a: A, b: B} [] { return [{a: {m: "" }, b: {m1: "" }}] } + ^^^^^^ + [11, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^^ + [11, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^^^^ + [11, 63]: source.ts meta.block.ts keyword.control.ts +>export function testFunctionReturnType11(): number | string { return 1 } + ^^^^^^ + [12, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^^ + [12, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^^^^ + [12, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>export function testFunctionReturnType12(): number | string [] { return } + ^^^^^^ + [13, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^^ + [13, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^^^^ + [13, 66]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>export function testFunctionReturnType13(): [number, number] | string [] { return [""] } + ^^^^^^ + [14, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^^^^^^^^^^^^^^^^^ + [14, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^^^^ + [14, 76]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +> +>class TestClass { +> /* method return type tests */ +> public testMethodReturnType1(): string [] { return [""] } + ^^^^^^ + [18, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^ + [18, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^^^^^ + [18, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> public testMethodReturnType2(): {} { return {} } + ^^^^^^ + [19, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^ + [19, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^^^^^ + [19, 42]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> public testMethodReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} } + ^^^^^^ + [20, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^ + [20, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^^^^^ + [20, 52]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> public testMethodReturnType4(): [number, number] { return [1, 1] } + ^^^^^^ + [21, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^ + [21, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^^^^^ + [21, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> public testMethodReturnType5(): Array { return [{ m: "" }] } + ^^^^^^ + [22, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^ + [22, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^^^^^ + [22, 48]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> public testMethodReturnType6(): new () => number { throw new Error(""); } + ^^^^^^ + [23, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^ + [23, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^^^^ + [23, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> public testMethodReturnType7(): (() => number) { throw new Error(""); } + ^^^^^^ + [24, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^ + [24, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^^^^ + [24, 54]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> public testMethodReturnType8(): (() => number) [] { throw new Error(""); } + ^^^^^^ + [25, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^ + [25, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^^^^ + [25, 57]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> public testMethodReturnType9(): (() => number) | (() => string) { throw new Error(""); } + ^^^^^^ + [26, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^ + [26, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^^^^ + [26, 71]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> public testMethodReturnType10(): {a: A, b: B} [] { return [{a: {m: "" }, b: {m1: "" }}] } + ^^^^^^ + [27, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^^ + [27, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^^^^^ + [27, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> public testMethodReturnType11(): number | string { return 1 } + ^^^^^^ + [28, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^^ + [28, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^^^^^ + [28, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> public testMethodReturnType12(): number | string [] { return } + ^^^^^^ + [29, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^^ + [29, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^^^^^ + [29, 59]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +> public testMethodReturnType13(): [number, number] | string [] { return [""] } + ^^^^^^ + [30, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^^^^^^^^^^^^^^^^^^^^^^ + [30, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^^^^^ + [30, 69]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts +>} \ No newline at end of file diff --git a/tests/baselines/Issue110.txt b/tests/baselines/Issue110.txt index e82f52fe..e6708781 100644 --- a/tests/baselines/Issue110.txt +++ b/tests/baselines/Issue110.txt @@ -23,21 +23,60 @@ let i = ^^1, j = ^^1e3 */ ----------------------------------- -[1, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[2, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[3, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[4, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[5, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[6, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[7, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[8, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[9, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[10, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[11, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[12, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[13, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[14, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[15, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[16, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[16, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[19, 1]: source.ts comment.block.ts \ No newline at end of file +>let number1 = 0x100 + ^^^^^ + [1, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number2 = 14e15 + ^^^^^ + [2, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number3 = 10.42e41.5 + ^^^^^^^^^^ + [3, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number4 = 4 + ^ + [4, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number5 = 51.4 + ^^^^ + [5, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number6 = 12.4E10.2 + ^^^^^^^^^ + [6, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number7 = 14.6e+10 + ^^^^^^^^ + [7, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number8 = 12E4 + ^^^^ + [8, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number9 = 10e10 + ^^^^^ + [9, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number10 = 14e14.5 + ^^^^^^^ + [10, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number11 = 12E-10 + ^^^^^^ + [11, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number12 = 13.4e-14.2 + ^^^^^^^^^^ + [12, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number13 = 14.12 + ^^^^^ + [13, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number14 = 10.2E+4 + ^^^^^^^ + [14, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let number6 = 5.00567789e+2 + ^^^^^^^^^^^^^ + [15, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>let i = 1, j = 1e3 + ^ + [16, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^^ + [16, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +> +>/* +> + ^ + [19, 1]: source.ts comment.block.ts +> Testing comments +>*/ \ No newline at end of file diff --git a/tests/baselines/Issue124.txt b/tests/baselines/Issue124.txt index 175eccf7..a84781de 100644 --- a/tests/baselines/Issue124.txt +++ b/tests/baselines/Issue124.txt @@ -18,30 +18,73 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; */ ----------------------------------- -[6, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts -[6, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts -[6, 23]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts -[7, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts -[7, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts -[7, 23]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts -[7, 24]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts -[7, 32]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts -[8, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts -[8, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts -[8, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts -[8, 26]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts -[8, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts -[10, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[10, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts -[10, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts -[10, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts -[10, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts -[12, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[12, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts -[12, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts -[12, 24]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[12, 30]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts -[12, 32]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[12, 40]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts -[12, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[15, 2]: source.ts comment.block.ts \ No newline at end of file +>/* +> Solving Issue #124, #80, #81 +> Adding capability of ternary strings. +>*/ +> +>let a = true ? true : true; + ^^^^ + [6, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + ^^^^ + [6, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + ^^^^ + [6, 23]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts +>let b = true ? true : `this is ${} highlighted` + ^^^^ + [7, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + ^^^^ + [7, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + ^ + [7, 23]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^^^^^^^^ + [7, 24]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^^ + [7, 32]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts +>let c = true ? `hello` : `this ${DEPENDENCY_SEPARATOR}${moduleName} is highlighted`; + ^^^^ + [8, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + ^ + [8, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^^^^^ + [8, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^ + [8, 26]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + ^^^^^ + [8, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts +> +>var newVar = a ? (b == `hello`) : true; + ^^^^^^ + [10, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^^ + [10, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + [10, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + [10, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + ^^^^ + [10, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts +> +>var debArch = arch === 'x64' ? 'amd64' : 'i386'; + ^^^^^^^ + [12, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^^^^^ + [12, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + [12, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + ^ + [12, 24]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + [12, 30]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + [12, 32]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + [12, 40]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + [12, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts +> +>/* +> Comment + ^^^^^^^^^ + [15, 2]: source.ts comment.block.ts +>*/ \ No newline at end of file diff --git a/tests/baselines/Issue149.txt b/tests/baselines/Issue149.txt index 74c66348..864af557 100644 --- a/tests/baselines/Issue149.txt +++ b/tests/baselines/Issue149.txt @@ -15,26 +15,62 @@ original file } ----------------------------------- -[1, 1]: source.ts meta.function.ts storage.type.ts -[1, 17]: source.ts meta.function.ts entity.name.function.ts -[1, 23]: source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts -[1, 32]: source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts -[1, 41]: source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.name.ts -[2, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts -[2, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts -[3, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts -[3, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts -[4, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts -[4, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts -[5, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[8, 1]: source.ts meta.function.ts storage.type.ts -[8, 17]: source.ts meta.function.ts entity.name.function.ts -[8, 32]: source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts -[8, 42]: source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.name.ts -[9, 1]: source.ts meta.function.ts storage.type.ts -[9, 17]: source.ts meta.function.ts entity.name.function.ts -[10, 1]: source.ts meta.function.ts storage.type.ts -[10, 17]: source.ts meta.function.ts entity.name.function.ts -[11, 1]: source.ts meta.function.ts storage.type.ts -[11, 17]: source.ts meta.function.ts entity.name.function.ts -[12, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts \ No newline at end of file +>export function fn(s: string): new() => View + ^^^^^^ + [1, 1]: source.ts meta.function.ts storage.type.ts + ^^ + [1, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^^^^ + [1, 23]: source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^^^ + [1, 32]: source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts + ^^^^ + [1, 41]: source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.name.ts +>export function fn(s: string) + ^^^^^^ + [2, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^^ + [2, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts +>export function fn(n: number) + ^^^^^^ + [3, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^^ + [3, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts +>export function fn(s: any) { + ^^^^^^ + [4, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + ^^ + [4, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts +> return ""; + ^^^^^^ + [5, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>} +> +>export function fn(s: string): new () => View; + ^^^^^^ + [8, 1]: source.ts meta.function.ts storage.type.ts + ^^ + [8, 17]: source.ts meta.function.ts entity.name.function.ts + ^^^ + [8, 32]: source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts + ^^^^ + [8, 42]: source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.name.ts +>export function fn(s: string); + ^^^^^^ + [9, 1]: source.ts meta.function.ts storage.type.ts + ^^ + [9, 17]: source.ts meta.function.ts entity.name.function.ts +>export function fn(n: number); + ^^^^^^ + [10, 1]: source.ts meta.function.ts storage.type.ts + ^^ + [10, 17]: source.ts meta.function.ts entity.name.function.ts +>export function fn(s: any) { + ^^^^^^ + [11, 1]: source.ts meta.function.ts storage.type.ts + ^^ + [11, 17]: source.ts meta.function.ts entity.name.function.ts +> return ""; + ^^^^^^ + [12, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>} \ No newline at end of file diff --git a/tests/baselines/Issue156.txt b/tests/baselines/Issue156.txt index a1b570b9..ba9c6439 100644 --- a/tests/baselines/Issue156.txt +++ b/tests/baselines/Issue156.txt @@ -8,10 +8,23 @@ class Test { } ----------------------------------- -[2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[2, 6]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts -[2, 19]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts -[2, 23]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[2, 27]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts -[4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts \ No newline at end of file +>class Test { +> mmm(p1: string | {}, p2: string) + ^^^ + [2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^ + [2, 6]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^^^^^^ + [2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + [2, 19]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + ^^ + [2, 23]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^^^^^^ + [2, 27]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts +> { +> + ^^^^^^^^^ + [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> } +>} \ No newline at end of file diff --git a/tests/baselines/Issue191.txt b/tests/baselines/Issue191.txt index 6636750f..0a8598cd 100644 --- a/tests/baselines/Issue191.txt +++ b/tests/baselines/Issue191.txt @@ -22,35 +22,87 @@ class Thing<^^T, ^^U> { ----------------------------------- -[2, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts -[2, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts -[2, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts -[3, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[3, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts -[3, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts -[4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts -[4, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts -[5, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts -[5, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts -[5, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts -[6, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts -[6, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts -[6, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts -[11, 13]: source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts -[11, 16]: source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts -[12, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts -[12, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts -[12, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[12, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts -[13, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[13, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts -[13, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts -[14, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts -[14, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts -[15, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts -[15, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts -[15, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts -[16, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts -[16, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts -[16, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts \ No newline at end of file +>class Thing { +> constructor(public content: string){ + ^^^^^^^^^^^ + [2, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + ^^^^^^ + [2, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + ^^^^^^^ + [2, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^^^^^^ + [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts +> var prop = Q.defer(); + ^^^^ + [3, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^^^^^^ + [3, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + [3, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts +> this.store = new Data(); + ^^^^ + [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + ^^^^ + [4, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts +> gaze(path.join(this.content, "**/*.json"), (err, watch) => { + ^^^^^^^^^^^^ + [5, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^^^^ + [5, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + [5, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts +> process.stuout.write(`Watching for changes in:`); + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [6, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^^^^^^^^^^^^^^^^^^^^^ + [6, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + ^ + [6, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts +> }) +> }; +>} +> +>class Thing { + ^ + [11, 13]: source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + ^ + [11, 16]: source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts +> constructor(public content: string){ + ^^^^^^^^^^^ + [12, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + ^^^^^^ + [12, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + ^^^^^^^ + [12, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^^^^^^ + [12, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts +> var prop = Q.defer(); + ^^^^ + [13, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^^^^^^ + [13, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^ + [13, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts +> this.store = new Data(); + ^^^^ + [14, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + ^^^^ + [14, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts +> gaze(path.join(this.content, "**/*.json"), (err, watch) => { + ^^^^^^^^^^^^ + [15, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^^^^ + [15, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + ^ + [15, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts +> process.stuout.write(`Watching for changes in:`); + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [16, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^^^^^^^^^^^^^^^^^^^^^ + [16, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + ^ + [16, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts +> }) +> }; +>} +> \ No newline at end of file diff --git a/tests/baselines/Issue200.txt b/tests/baselines/Issue200.txt index 5082c97f..2ae3ef19 100644 --- a/tests/baselines/Issue200.txt +++ b/tests/baselines/Issue200.txt @@ -8,14 +8,31 @@ original file ^^}^^ ----------------------------------- -[1, 1]: source.ts -[3, 1]: source.ts keyword.control.ts -[3, 9]: source.ts storage.type.ts -[3, 16]: source.ts string.single.ts -[4, 3]: source.ts meta.block.ts keyword.control.import.include.ts -[4, 10]: source.ts meta.block.ts -[4, 18]: source.ts meta.block.ts -[5, 3]: source.ts meta.block.ts storage.type.ts -[5, 10]: source.ts meta.block.ts keyword.control.ts -[5, 18]: source.ts meta.block.ts -[6, 1]: source.ts meta.block.ts meta.brace.curly.ts \ No newline at end of file +> + ^^ + [1, 1]: source.ts +> +>declare module 'goog:goog.i18n.NumberFormatSymbols_en_TT' { + ^^^^^^^ + [3, 1]: source.ts keyword.control.ts + ^^^^^^ + [3, 9]: source.ts storage.type.ts + ^ + [3, 16]: source.ts string.single.ts +> import alias = lool.clutz.goog.i18n.NumberFormatSymbols_en_TT; + ^^^^^^ + [4, 3]: source.ts meta.block.ts keyword.control.import.include.ts + ^^^^^^^ + [4, 10]: source.ts meta.block.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [4, 18]: source.ts meta.block.ts +> export default alias; + ^^^^^^ + [5, 3]: source.ts meta.block.ts storage.type.ts + ^^^^^^^ + [5, 10]: source.ts meta.block.ts keyword.control.ts + ^^^^^^^^^ + [5, 18]: source.ts meta.block.ts +>} + ^ + [6, 1]: source.ts meta.block.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/Issue208.txt b/tests/baselines/Issue208.txt index 7b178e5b..159ebe57 100644 --- a/tests/baselines/Issue208.txt +++ b/tests/baselines/Issue208.txt @@ -12,28 +12,63 @@ class MyClass { } ----------------------------------- -[1, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts -[1, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts -[1, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts -[1, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts -[1, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[1, 47]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts -[2, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts -[2, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts -[2, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts -[2, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[2, 47]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts -[5, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts -[5, 27]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts -[5, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts -[5, 41]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts -[6, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts -[6, 23]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.type.ts -[6, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts -[6, 41]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts -[8, 20]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts -[8, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts -[8, 34]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts -[9, 16]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.type.ts -[9, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts -[9, 34]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts \ No newline at end of file +>var someVar = new Thing('data'); + ^^^ + [1, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + ^^^^^ + [1, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts + ^^^^^^ + [1, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^^^^^ + [1, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^^^ + [1, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + [1, 47]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts +>var someVar = makeThing('data'); + ^^^^^^^^^ + [2, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts + ^^^^^^ + [2, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^^^^^ + [2, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^^^ + [2, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + [2, 47]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts +> +>class MyClass { +> static someProp = new Thing('data'); + ^^^^^^^^ + [5, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^^^^^ + [5, 27]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts + ^^^^^^ + [5, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^^^^^ + [5, 41]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts +> static someProp = makeThing('data'); + ^^^^^^^^ + [6, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^^^^^^^^^ + [6, 23]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.type.ts + ^^^^^^ + [6, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^^^^^ + [6, 41]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts +> +> someProp = new Thing('data'); + ^^^^^ + [8, 20]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts + ^^^^^^ + [8, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^^^^^ + [8, 34]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts +> someProp = makeThing('data'); + ^^^^^^^^^ + [9, 16]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.type.ts + ^^^^^^ + [9, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + ^^^^^^ + [9, 34]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts +>} \ No newline at end of file diff --git a/tests/baselines/Issue262.txt b/tests/baselines/Issue262.txt index e9fd360a..a86e1491 100644 --- a/tests/baselines/Issue262.txt +++ b/tests/baselines/Issue262.txt @@ -7,8 +7,18 @@ for (^^let a = 1; a ^^< 10; a++) { } ----------------------------------- -[1, 6]: source.ts storage.type.ts -[1, 19]: source.ts keyword.operator.comparison.ts -[2, 5]: source.ts meta.block.ts keyword.control.ts -[2, 10]: source.ts meta.block.ts storage.type.ts -[3, 9]: source.ts meta.block.ts meta.block.ts \ No newline at end of file +>for (let a = 1; a < 10; a++) { + ^^^ + [1, 6]: source.ts storage.type.ts + ^ + [1, 19]: source.ts keyword.operator.comparison.ts +> for (let b = 1; b < a; b++) { + ^^^ + [2, 5]: source.ts meta.block.ts keyword.control.ts + ^^^ + [2, 10]: source.ts meta.block.ts storage.type.ts +> + ^^^^^^^^^ + [3, 9]: source.ts meta.block.ts meta.block.ts +> } +>} \ No newline at end of file diff --git a/tests/baselines/Issue28.txt b/tests/baselines/Issue28.txt index 90e6fdd1..f05e448f 100644 --- a/tests/baselines/Issue28.txt +++ b/tests/baselines/Issue28.txt @@ -12,10 +12,27 @@ var w = ^^0O767; ^^ ----------------------------------- -[4, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[5, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[6, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[7, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[8, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[9, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[10, 1]: source.ts \ No newline at end of file +> +>/* Testing octals */ +> +>var x = 123; + ^^^ + [4, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>var y = 0x123; + ^^^^^ + [5, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>var z = 0b10101; + ^^^^^^^ + [6, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>var z = 0B00000; + ^^^^^^^ + [7, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>var j = 0o474774; + ^^^^^^^^ + [8, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +>var w = 0O767; + ^^^^^ + [9, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +> + ^ + [10, 1]: source.ts \ No newline at end of file diff --git a/tests/baselines/Issue288.txt b/tests/baselines/Issue288.txt index dd491afd..fdfcb3bb 100644 --- a/tests/baselines/Issue288.txt +++ b/tests/baselines/Issue288.txt @@ -26,14 +26,49 @@ return^^Name+=1; ----------------------------------- -[4, 10]: source.ts meta.function.ts entity.name.function.ts -[6, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts -[9, 17]: source.ts meta.function.ts entity.name.function.ts -[11, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts -[14, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[15, 9]: source.ts -[17, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[19, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[20, 7]: source.ts -[22, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[23, 7]: source.ts \ No newline at end of file +>// Issue 288: "function" in "functionName" gets highlighted. +>// Fixed in pull request #289. +> +>function Name(){ + ^^^^ + [4, 10]: source.ts meta.function.ts entity.name.function.ts +>} +>var AnotherName = function(){ + ^ + [6, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts +>} +> +>export function eName(){ + ^^^^^ + [9, 17]: source.ts meta.function.ts entity.name.function.ts +>} +>export var eAnotherName = function(){ + ^ + [11, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts +>} +> +>var functionName=1; + ^^^^^^^^^^^^ + [14, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts +>functionName=1; + ^^^^^^^^^^^^ + [15, 9]: source.ts +> +>export var functionName2=1; + ^^^^^^^^^^^^^ + [17, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts +> +>var exportName="hello"; + ^^^^^^^^^^ + [19, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts +>exportName2="hello"; + ^^^^^^^^^^^ + [20, 7]: source.ts +> +>var returnName=1; + ^^^^^^^^^^ + [22, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts +>returnName+=1; + ^^^^^^^^^^ + [23, 7]: source.ts +> \ No newline at end of file diff --git a/tests/baselines/Issue32.txt b/tests/baselines/Issue32.txt index 2b465b2b..ae9ac84a 100644 --- a/tests/baselines/Issue32.txt +++ b/tests/baselines/Issue32.txt @@ -23,17 +23,52 @@ original file */ ----------------------------------- -[5, 1]: source.ts meta.declaration.object.ts storage.type.ts -[5, 11]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts -[6, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts -[7, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[11, 1]: source.ts meta.declaration.object.ts storage.type.ts -[12, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts -[13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[14, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts -[16, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts -[16, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[16, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts -[16, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[16, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts -[18, 1]: source.ts \ No newline at end of file +>/* +> Testing Isuue 32: Adding constructor as a support.type keword +>*/ +> +>interface NewInterface{ + ^^^^^^^^^ + [5, 1]: source.ts meta.declaration.object.ts storage.type.ts + ^^^^^^^^^^^^ + [5, 11]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts +> currentData: Data; + ^^^^^^^^^^^ + [6, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts +> setVal(d: Data) + ^^^^^^ + [7, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts +>} +> +> +>class NewClass implements NewInterface { + ^^^^^ + [11, 1]: source.ts meta.declaration.object.ts storage.type.ts +> currentData: Data; + ^^^^^^^^^^^ + [12, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts +> setVal(d: Data){ + ^^^^^^ + [13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts +> this.currentData = d; + ^^^^ + [14, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts +> } +> constructor(m: number, n: string){} + ^^^^^^^^^^^ + [16, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + ^ + [16, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^^^^^^ + [16, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + [16, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^^^^^^ + [16, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts +>} +> + ^ + [18, 1]: source.ts +>/* +> Testing comments +>*/ \ No newline at end of file diff --git a/tests/baselines/Issue335.txt b/tests/baselines/Issue335.txt index f362dc44..97efb4cd 100644 --- a/tests/baselines/Issue335.txt +++ b/tests/baselines/Issue335.txt @@ -53,23 +53,94 @@ class A4 { } ----------------------------------- -[4, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts -[7, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts -[7, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts -[14, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts -[17, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts -[17, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts -[24, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts -[25, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts -[26, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts -[27, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts -[28, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts -[33, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts -[33, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts -[40, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts -[41, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts -[42, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts -[43, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts -[44, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts -[49, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts -[49, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts \ No newline at end of file +>class A1 { +> b() { +> let d; +> d.default = 1; + ^^^^^^^^^^^^ + [4, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> } +> +> private static c() { + ^^^^^^^ + [7, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^^^^^^ + [7, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts +> } +>} +> +>class A2 { +> b() { +> let d; +> d.case = 1 + ^^^^^^^^^ + [14, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> } +> +> private static c() { + ^^^^^^^ + [17, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^^^^^^ + [17, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts +> } +>} +> +>class A3 { +> b() { +> let d +> d.default = 1 + ^^^^^^^^^^^^ + [24, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts +> switch (d.default) { + ^^^^^^^^^ + [25, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts +> case 1: + ^^^^ + [26, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts +> case 2: + ^^^^ + [27, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts +> default: + ^^^^^^^ + [28, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts +> break; +> } +> } +> +> private static c() { + ^^^^^^^ + [33, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^^^^^^ + [33, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts +> } +>} +> +>class A4 { +> b() { +> let d +> d.case = 1 + ^^^^^^^^^ + [40, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts +> switch (d.default) { + ^^^^^^^^^ + [41, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts +> case 1: + ^^^^ + [42, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts +> case 2: + ^^^^ + [43, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts +> default: + ^^^^^^^ + [44, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts +> break; +> } +> } +> +> private static c() { + ^^^^^^^ + [49, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^^^^^^ + [49, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts +> } +>} \ No newline at end of file diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt index 92a4e488..13d77ab7 100644 --- a/tests/baselines/Issue37.txt +++ b/tests/baselines/Issue37.txt @@ -70,52 +70,169 @@ var j: I = {} */ ----------------------------------- -[3, 1]: source.ts keyword.control.import.include.ts -[3, 8]: source.ts keyword.operator.arithmetic.ts -[3, 10]: source.ts keyword.others.ts -[3, 17]: source.ts keyword.control.import.include.ts -[6, 1]: source.ts keyword.control.ts -[6, 12]: source.ts keyword.others.ts -[9, 1]: source.ts meta.declaration.object.ts storage.type.ts -[9, 7]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts -[10, 2]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts -[10, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[15, 1]: source.ts meta.declaration.object.ts storage.type.ts -[15, 8]: source.ts meta.declaration.object.ts storage.type.ts -[16, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts -[16, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts -[19, 1]: source.ts storage.type.ts -[19, 6]: source.ts -[21, 2]: source.ts meta.block.ts meta.var.expr.ts storage.type.ts -[21, 12]: source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts -[23, 2]: source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts -[24, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts -[25, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts -[26, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts -[35, 1]: source.ts storage.type.ts -[36, 5]: source.ts meta.block.ts meta.function.ts storage.type.ts -[41, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.others.ts -[43, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts -[44, 1]: source.ts keyword.others.ts -[51, 1]: source.ts storage.type.ts -[51, 8]: source.ts -[52, 5]: source.ts meta.block.ts meta.declaration.object.ts storage.type.ts -[52, 12]: source.ts meta.block.ts meta.declaration.object.ts storage.type.ts -[52, 18]: source.ts meta.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts -[53, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts -[53, 16]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts -[53, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts -[55, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts -[55, 21]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[55, 29]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts -[56, 13]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts -[56, 27]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts -[57, 17]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.others.ts -[57, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts -[57, 31]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts -[57, 35]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.single.ts -[57, 47]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts -[57, 54]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.others.ts -[57, 65]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts -[58, 14]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts -[65, 1]: source.ts comment.block.ts \ No newline at end of file +>//Test For Scopes +> +>import * as req from "./Required" + ^^^^^^ + [3, 1]: source.ts keyword.control.import.include.ts + ^ + [3, 8]: source.ts keyword.operator.arithmetic.ts + ^^ + [3, 10]: source.ts keyword.others.ts + ^^^^ + [3, 17]: source.ts keyword.control.import.include.ts +>import { Scale } from "./scale"; +> +>if (object.instanceof(ClassNew)) { + ^^ + [6, 1]: source.ts keyword.control.ts + ^^^^^^^^^^ + [6, 12]: source.ts keyword.others.ts +>} +> +>class class1(){ + ^^^^^ + [9, 1]: source.ts meta.declaration.object.ts storage.type.ts + ^^^^^^ + [9, 7]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts +> static functioname(){ + ^^^^^^ + [10, 2]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + ^^^^^^^^^^^ + [10, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts +> +> } +>} +> +>export class className(){ + ^^^^^^ + [15, 1]: source.ts meta.declaration.object.ts storage.type.ts + ^^^^^ + [15, 8]: source.ts meta.declaration.object.ts storage.type.ts +> private state = { } + ^^^^^^^ + [16, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^^^^^ + [16, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts +>} +> +>void newFunctionName(){ + ^^^^ + [19, 1]: source.ts storage.type.ts + ^^^^^^^^^^^^^^^^ + [19, 6]: source.ts +> +> var c = a + b; + ^^^ + [21, 2]: source.ts meta.block.ts meta.var.expr.ts storage.type.ts + ^ + [21, 12]: source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts +> +> switch (someNum) { + ^^^^^^ + [23, 2]: source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts +> case 1: break; + ^^^^ + [24, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts +> case 2: break; + ^^^^ + [25, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts +> default: break; + ^^^^^^^ + [26, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts +> } +> +>} +> +>/** +> * Verify comments +> */ +> +>module M { + ^^^^^^ + [35, 1]: source.ts storage.type.ts +> export function myFun(x: number) { + ^^^^^^ + [36, 5]: source.ts meta.block.ts meta.function.ts storage.type.ts +> return x; +> } +>} +> +>var m: typeof M = M; + ^^^^^^ + [41, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.others.ts +> +>var adder = new Adder(3, 4); + ^^^ + [43, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts +>delete (adder) + ^^^^^^ + [44, 1]: source.ts keyword.others.ts +> +>var s = typeof {}git +>interface I {} +>var j: I = {} +> +> +>module Body { + ^^^^^^ + [51, 1]: source.ts storage.type.ts + ^^^^^^ + [51, 8]: source.ts +> export class Cell { + ^^^^^^ + [52, 5]: source.ts meta.block.ts meta.declaration.object.ts storage.type.ts + ^^^^^ + [52, 12]: source.ts meta.block.ts meta.declaration.object.ts storage.type.ts + ^^^^ + [52, 18]: source.ts meta.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts +> public parent: Cell; + ^^^^^^ + [53, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^^^^^^ + [53, 16]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^^^^^^ + [53, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts +> +> constructor(parent: Cell) { + ^^^^^^^^^^^ + [55, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + ^^^^^^ + [55, 21]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^^^^ + [55, 29]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts +> this.parent = parent; + ^^^^ + [56, 13]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + ^^^^^^^^^ + [56, 27]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> if (typeof parent === 'object' || parent instanceof Error) { + ^^^^^^ + [57, 17]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.others.ts + ^^^^^^^^ + [57, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^ + [57, 31]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + ^ + [57, 35]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.single.ts + ^^^^^^^^ + [57, 47]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^^^^^^^ + [57, 54]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.others.ts + ^^^^^^ + [57, 65]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> + ^^^^^^^^^^^^^^ + [58, 14]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> } +> } +> } +>} +> +>/* +> + ^ + [65, 1]: source.ts comment.block.ts +> End of file +> +>*/ \ No newline at end of file diff --git a/tests/baselines/Issue44.txt b/tests/baselines/Issue44.txt index dc00afe0..013b0bfa 100644 --- a/tests/baselines/Issue44.txt +++ b/tests/baselines/Issue44.txt @@ -12,10 +12,27 @@ original file ----------------------------------- -[2, 1]: source.ts meta.declaration.object.ts storage.type.ts -[2, 11]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts -[3, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts -[3, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.primitive.ts support.type.ts -[4, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts -[4, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts -[5, 1]: source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file +> +>interface TestInterface { + ^^^^^^^^^ + [2, 1]: source.ts meta.declaration.object.ts storage.type.ts + ^^^^^^^^^^^^^ + [2, 11]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts +> testvar: string; + ^^^^^^^ + [3, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + ^^^^^^ + [3, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.primitive.ts support.type.ts +> testfunc(): string; + ^^^^^^^^ + [4, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^^^^^^ + [4, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts +>} + ^ + [5, 1]: source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts +> +>/* +> Testing Comments +>*/ +> \ No newline at end of file diff --git a/tests/baselines/Issue5.txt b/tests/baselines/Issue5.txt index e3ec3df1..ded11646 100644 --- a/tests/baselines/Issue5.txt +++ b/tests/baselines/Issue5.txt @@ -37,46 +37,124 @@ let new_string = ^^"^^Changes End here^^" ----------------------------------- -[1, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[1, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[2, 1]: source.ts -[5, 23]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[6, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape -[9, 24]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[10, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape -[14, 28]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[15, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[15, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[15, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape -[16, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[16, 12]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape -[17, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[17, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape -[18, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[18, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape -[19, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[19, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[19, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape -[20, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[21, 1]: source.ts -[22, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[22, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape -[23, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[23, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape -[24, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[25, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[25, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape -[26, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[26, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape -[27, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[27, 44]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape -[28, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[28, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape -[29, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[29, 44]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape -[30, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts -[31, 1]: source.ts -[32, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[32, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[32, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts -[33, 1]: source.ts \ No newline at end of file +>let new_string = "New Changes" + ^ + [1, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^^^^^^^ + [1, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +> + ^ + [2, 1]: source.ts +> +>let plain_double_text = "Hello\ +>this link to github is https://github.com/\ + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [5, 23]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +>hello\ + ^ + [6, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +>World" +> +>let plain_single_text= 'Try with single bracket\ + ^ + [9, 24]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts +>hello world \\\\\ + ^^ + [10, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +>let this be ^\ +>a good test ^' +> +>let double_quote_issue = " qstring-double:\ + ^^^^^^^^^^^^^^^^^ + [14, 28]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +> name: string.double.ts\ + ^^^^^^^^^^^^^^^^^^^^^^^^^^ + [15, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^ + [15, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + [15, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +> begin: \'\"\'\ + ^^^^^^^^^^^ + [16, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^ + [16, 12]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +> end: \'\"|(?:[^\r\n\\]$)'\ + ^^^^^^^^^ + [17, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^ + [17, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +> patterns:\ + ^^^^^^^^^^^^^ + [18, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + [18, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +> - include: '#string-character-escape'\ + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [19, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [19, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + [19, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape +> " + ^ + [20, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +> + ^ + [21, 1]: source.ts +>let single_quote_issue = 'qstring-single:\ + ^^^^^^^^^^^^^^^ + [22, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + [22, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> name: string.single.ts\ + ^^^^^^^^^^^^^^^^^^^^^^^^^^ + [23, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + [23, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> begin: \"\'\"\ + ^^^^^^^^^^^ + [24, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts +> end: \'|(?:[^\r\n\\]$)\ + ^^^^^^^^^ + [25, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + [25, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> endCaptures:\ + ^^^^^^^^^^^^^^^^ + [26, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + [26, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> '0': {name: string-character-escape }\ + ^^^^^^ + [27, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + [27, 44]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> patterns:\ + ^^^^^^^^^^^^^ + [28, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + [28, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> - include: \'#string-character-escape\'\ + ^^^^^^^^^^^^^^^ + [29, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + ^ + [29, 44]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape +> ' + ^ + [30, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts +> + ^ + [31, 1]: source.ts +>let new_string = "Changes End here" + ^ + [32, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^^^^^^^^^^^^^^^^ + [32, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + ^ + [32, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +> + ^ + [33, 1]: source.ts +> +> \ No newline at end of file diff --git a/tests/baselines/Issue63.txt b/tests/baselines/Issue63.txt index f68fc935..1eff86a5 100644 --- a/tests/baselines/Issue63.txt +++ b/tests/baselines/Issue63.txt @@ -16,31 +16,73 @@ type Callback = ^^(error: Error, value: T) => ^^any ^^} ----------------------------------- -[1, 1]: source.ts meta.type.declaration.ts keyword.other.ts -[1, 6]: source.ts meta.type.declaration.ts entity.name.class.ts -[1, 16]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts -[1, 21]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts -[3, 1]: source.ts meta.type.declaration.ts keyword.other.ts -[3, 14]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts -[3, 21]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts -[3, 46]: source.ts meta.type.declaration.ts meta.type.function.return.ts keyword.operator.ts -[3, 49]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts -[5, 17]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts -[5, 45]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts -[7, 1]: source.ts meta.type.declaration.ts keyword.other.ts -[7, 6]: source.ts meta.type.declaration.ts entity.name.class.ts -[7, 14]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts -[7, 22]: source.ts meta.type.declaration.ts meta.type.parameters.ts keyword.operator.type.ts -[7, 24]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts -[7, 50]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts -[7, 58]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts -[7, 86]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts -[9, 1]: source.ts -[9, 7]: source.ts meta.type.declaration.ts entity.name.class.ts -[9, 12]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts -[9, 18]: source.ts meta.type.declaration.ts meta.object.type.ts meta.brace.curly.ts -[11, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.ts -[11, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts -[12, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.ts -[12, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.primitive.ts support.type.ts -[14, 1]: source.ts meta.type.declaration.ts meta.object.type.ts meta.brace.curly.ts \ No newline at end of file +>type Callback = (error: Error, value: T) => any + ^^^^ + [1, 1]: source.ts meta.type.declaration.ts keyword.other.ts + ^^^^^^^^ + [1, 6]: source.ts meta.type.declaration.ts entity.name.class.ts + ^ + [1, 16]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts + ^ + [1, 21]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts +> +>type Callback = (error: Error, value: T) => any + ^^^^ + [3, 1]: source.ts meta.type.declaration.ts keyword.other.ts + ^ + [3, 14]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + [3, 21]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^ + [3, 46]: source.ts meta.type.declaration.ts meta.type.function.return.ts keyword.operator.ts + ^^^ + [3, 49]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts +> +>type Callback = (error: Error, value: T) => any + ^ + [5, 17]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^^ + [5, 45]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts +> +>type Callback void> = (error: Error, value: T) => any + ^^^^ + [7, 1]: source.ts meta.type.declaration.ts keyword.other.ts + ^^^^^^^^ + [7, 6]: source.ts meta.type.declaration.ts entity.name.class.ts + ^ + [7, 14]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + ^ + [7, 22]: source.ts meta.type.declaration.ts meta.type.parameters.ts keyword.operator.type.ts + ^^ + [7, 24]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts + ^^^^ + [7, 50]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + ^ + [7, 58]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts + ^^^ + [7, 86]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts +> +> type Foo = { + ^ + [9, 1]: source.ts + ^^^ + [9, 7]: source.ts meta.type.declaration.ts entity.name.class.ts + ^ + [9, 12]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts + ^ + [9, 18]: source.ts meta.type.declaration.ts meta.object.type.ts meta.brace.curly.ts +> +> foo: T, + ^^^ + [11, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^ + [11, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts +> bar: number + ^^^ + [12, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.ts + ^^^^^^ + [12, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.primitive.ts support.type.ts +> +>} + ^ + [14, 1]: source.ts meta.type.declaration.ts meta.object.type.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/Issue82.txt b/tests/baselines/Issue82.txt index 2d6c5e45..06a2d519 100644 --- a/tests/baselines/Issue82.txt +++ b/tests/baselines/Issue82.txt @@ -10,10 +10,25 @@ class Foo { } ----------------------------------- -[3, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[3, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts -[3, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.ts -[4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts -[4, 31]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts -[4, 44]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.ts -[6, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts \ No newline at end of file +>class Foo { +> constructor( +> test: number, // foo bar, + ^^^^ + [3, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^^^^^^ + [3, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^^^^^^^^^^^^ + [3, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.ts +> exitEditModeCallback: () => void // Used to re-enable View updates. + ^^^^^^^^^^^^^^^^^^^^ + [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^^ + [4, 31]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [4, 44]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.ts +> ) { +> + ^^^^^^^^^ + [6, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> } +>} \ No newline at end of file diff --git a/tests/baselines/Issue89.txt b/tests/baselines/Issue89.txt index aea46b79..0013d5b1 100644 --- a/tests/baselines/Issue89.txt +++ b/tests/baselines/Issue89.txt @@ -26,38 +26,97 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ----------------------------------- -[1, 8]: source.ts meta.declaration.object.ts storage.type.ts -[1, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts -[1, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts -[1, 27]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts -[1, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts -[1, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts -[1, 47]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts -[2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts -[4, 1]: source.ts -[7, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts -[7, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts -[7, 31]: source.ts meta.declaration.object.ts meta.object.heritage.ts -[7, 34]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts -[7, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts -[7, 48]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts -[8, 2]: source.ts meta.declaration.object.ts meta.object.body.ts -[10, 1]: source.ts -[12, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts -[12, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts -[12, 28]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts -[12, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts -[12, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts -[12, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts -[12, 51]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts -[12, 56]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts -[13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts -[15, 1]: source.ts -[17, 1]: source.ts meta.declaration.object.ts storage.type.ts -[17, 7]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts -[17, 17]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts -[17, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts -[17, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts -[17, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts -[18, 5]: source.ts meta.declaration.object.ts meta.object.body.ts -[22, 20]: source.ts comment.block.ts \ No newline at end of file +>export class A extends /* */B implements/**/ C{ + ^^^^^ + [1, 8]: source.ts meta.declaration.object.ts storage.type.ts + ^ + [1, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^^^^^^^ + [1, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^^ + [1, 27]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + ^ + [1, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^^^^^^^^^ + [1, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts + ^ + [1, 47]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts +> + ^^^ + [2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts +>} +> + ^ + [4, 1]: source.ts +> +> +>export class D implements/**/ F extends /**/G { + ^ + [7, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^^^^^^^^^^ + [7, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^^ + [7, 31]: source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^^^^^^ + [7, 34]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts + ^ + [7, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + [7, 48]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts +> + ^^^ + [8, 2]: source.ts meta.declaration.object.ts meta.object.body.ts +>} +> + ^ + [10, 1]: source.ts +> +>export class E extends /**/H implements/**/ One, Two, Three{ + ^ + [12, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^^^^^^^ + [12, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^ + [12, 28]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^ + [12, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts + ^^ + [12, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts + ^^^ + [12, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^^ + [12, 51]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^^^^ + [12, 56]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts +> + ^^^ + [13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts +>} +> + ^ + [15, 1]: source.ts +> +>class className extends class1 implements class2 { + ^^^^^ + [17, 1]: source.ts meta.declaration.object.ts storage.type.ts + ^^^^^^^^^ + [17, 7]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^^^^^^^ + [17, 17]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + ^^^^^^ + [17, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + ^^^^^^^^^^ + [17, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts + ^^^^^^ + [17, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts +> + ^^^^^ + [18, 5]: source.ts meta.declaration.object.ts meta.object.body.ts +>} +> +>/* +> Checking comments + ^^^^^^^^^^^^^^^^^^^^ + [22, 20]: source.ts comment.block.ts +>*/ +> \ No newline at end of file diff --git a/tests/baselines/Issue90.txt b/tests/baselines/Issue90.txt index e27b0c04..91b98ff2 100644 --- a/tests/baselines/Issue90.txt +++ b/tests/baselines/Issue90.txt @@ -7,13 +7,28 @@ original file ----------------------------------- -[1, 1]: source.ts meta.var.expr.ts -[2, 1]: source.ts meta.var.expr.ts -[2, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[2, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts -[3, 1]: source.ts meta.var.expr.ts -[3, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[3, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts -[3, 12]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts -[3, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts -[4, 1]: source.ts \ No newline at end of file +> var a = 0; + ^ + [1, 1]: source.ts meta.var.expr.ts +> var b = 1; + ^ + [2, 1]: source.ts meta.var.expr.ts + ^ + [2, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + [2, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts +> var c = a ^ b; + ^ + [3, 1]: source.ts meta.var.expr.ts + ^ + [3, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^^ + [3, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + [3, 12]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts + ^^ + [3, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts +> + ^ + [4, 1]: source.ts +> \ No newline at end of file diff --git a/tests/baselines/Issue96.txt b/tests/baselines/Issue96.txt index a8ef34d3..5def80ee 100644 --- a/tests/baselines/Issue96.txt +++ b/tests/baselines/Issue96.txt @@ -14,17 +14,43 @@ var const^^able^^ = "I am rrrrrroyal!"; const^^able^^ += " Royal, I say!"; ----------------------------------- -[1, 4]: source.ts meta.var.expr.ts -[2, 4]: source.ts meta.var.expr.ts -[4, 4]: source.ts -[5, 4]: source.ts -[7, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[7, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts -[8, 6]: source.ts -[8, 10]: source.ts -[9, 6]: source.ts meta.enum.declaration.ts -[9, 11]: source.ts meta.enum.declaration.ts -[11, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[11, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts -[12, 6]: source.ts -[12, 10]: source.ts \ No newline at end of file +>var letter; + ^ + [1, 4]: source.ts meta.var.expr.ts +>let variable; + ^ + [2, 4]: source.ts meta.var.expr.ts +> +>variable; + ^^^^^^^^^^ + [4, 4]: source.ts +>letter; + ^^^^^^^^ + [5, 4]: source.ts +> +>var constenum = 10; + ^^^^^^^^^ + [7, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + [7, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts +>constenum += 10; + ^^^^^^^^^^ + [8, 6]: source.ts + ^^^^^^^^^^ + [8, 10]: source.ts +>const enum E { } + ^ + [9, 6]: source.ts meta.enum.declaration.ts + ^ + [9, 11]: source.ts meta.enum.declaration.ts +> +>var constable = "I am rrrrrroyal!"; + ^^^^^^^^^ + [11, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + [11, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts +>constable += " Royal, I say!"; + ^^^^^^^^^^ + [12, 6]: source.ts + ^^^^^^^^^^ + [12, 10]: source.ts \ No newline at end of file diff --git a/tests/baselines/ParameterProperties.txt b/tests/baselines/ParameterProperties.txt index 82e725d1..26a4c1ed 100644 --- a/tests/baselines/ParameterProperties.txt +++ b/tests/baselines/ParameterProperties.txt @@ -9,6 +9,16 @@ class A { } ----------------------------------- -[2, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts -[2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts -[2, 54]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts \ No newline at end of file +>class A { +> constructor(private a: string, protected b: string, public c: string) { + ^^^^^^^ + [2, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + ^^^^^^^^^ + [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + ^^^^^^ + [2, 54]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts +> } +> foo() { +> return this.a + this.b + this.c; +> } +>} \ No newline at end of file diff --git a/tests/baselines/SyntacticallyIncorrectStrings.txt b/tests/baselines/SyntacticallyIncorrectStrings.txt index 230a7cdd..90c41d1e 100644 --- a/tests/baselines/SyntacticallyIncorrectStrings.txt +++ b/tests/baselines/SyntacticallyIncorrectStrings.txt @@ -11,5 +11,16 @@ var y ^^"some string 2" ----------------------------------- -[4, 5]: source.ts meta.declaration.object.ts meta.object.body.ts string.double.ts -[7, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts \ No newline at end of file +>// Test for https://github.com/Microsoft/TypeScript-Sublime-Plugin/pull/307 +> +>class SomeClass { +> "some string" + ^ + [4, 5]: source.ts meta.declaration.object.ts meta.object.body.ts string.double.ts +>} +> +>var y "some string 2" + ^ + [7, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts +> +> \ No newline at end of file diff --git a/tests/baselines/TsxSamples.txt b/tests/baselines/TsxSamples.txt index 0393fbbd..df2475d0 100644 --- a/tests/baselines/TsxSamples.txt +++ b/tests/baselines/TsxSamples.txt @@ -55,62 +55,174 @@ var e =
----------------------------------- -[3, 16]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx punctuation.definition.tag.begin.tsx -[3, 17]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx entity.name.tag.tsx -[3, 21]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx -[3, 30]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.brace.curly.tsx constant.language.this.tsx -[4, 13]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx -[12, 5]: source.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx -[12, 6]: source.tsx tag.without-attributes.tsx entity.name.tag.tsx -[13, 9]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx -[13, 10]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx -[14, 13]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx -[14, 14]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx -[14, 24]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx -[14, 30]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx -[15, 13]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx -[15, 14]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx -[15, 24]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx -[15, 30]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx -[16, 9]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx -[16, 11]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx -[17, 5]: source.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx -[17, 7]: source.tsx tag.without-attributes.tsx entity.name.tag.tsx -[20, 5]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx -[20, 6]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx -[21, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx -[21, 10]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx -[22, 13]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx -[22, 14]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx -[22, 24]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx -[22, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx -[23, 13]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx -[23, 14]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx -[23, 24]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx -[23, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx -[24, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx -[24, 11]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx -[25, 7]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx -[25, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx -[29, 5]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx -[29, 6]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx -[31, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx -[31, 10]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx -[31, 17]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx -[31, 23]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.open.tsx meta.brace.curly.tsx -[32, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.end.tsx -[33, 5]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx -[41, 17]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.begin.tsx -[41, 18]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx entity.name.tag.tsx -[41, 29]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx -[41, 39]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.end.tsx -[44, 18]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.begin.tsx -[44, 19]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx entity.name.tag.tsx -[44, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx -[44, 57]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.end.tsx -[48, 15]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx -[49, 26]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx -[50, 26]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx -[51, 40]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx -[51, 48]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.single.tsx -[52, 37]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx string.quoted.double.tsx \ No newline at end of file +>class MyComponent extends React.Component{ +> render() { +> return
+ ^ + [3, 16]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^ + [3, 17]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx entity.name.tag.tsx + ^^^^^^^ + [3, 21]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + ^^^^ + [3, 30]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.brace.curly.tsx constant.language.this.tsx +> This is a test: {this.state.count} + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [4, 13]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx +>
+> } +>} +> +>// JSX in Depth +>// http://facebook.github.io/react/docs/jsx-in-depth.html +>var App = +>
+ ^ + [12, 5]: source.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^ + [12, 6]: source.tsx tag.without-attributes.tsx entity.name.tag.tsx +> + ^ + [13, 9]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^ + [13, 10]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx +> + ^ + [14, 13]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^^^ + [14, 14]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + ^^^^ + [14, 24]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + ^ + [14, 30]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx +> + ^ + [15, 13]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^^^ + [15, 14]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + ^^^^ + [15, 24]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + ^ + [15, 30]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx +> + ^^ + [16, 9]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^ + [16, 11]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx +>
+ ^^ + [17, 5]: source.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^ + [17, 7]: source.tsx tag.without-attributes.tsx entity.name.tag.tsx +> +>var App2 = ( +>
+ ^ + [20, 5]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^ + [20, 6]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx +> + ^ + [21, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^ + [21, 10]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx +> + ^ + [22, 13]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^^^ + [22, 14]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + ^^^^ + [22, 24]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + ^ + [22, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx +> + ^ + [23, 13]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^^^ + [23, 14]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + ^^^^ + [23, 24]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + ^ + [23, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx +> + ^^ + [24, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^ + [24, 11]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx +>
+ ^^ + [25, 7]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^^^^ + [25, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx +>) +> +>var content = ( +> + ^^ + [33, 5]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx +>); +> +>// JSX Spread Attributes +>// http://facebook.github.io/react/docs/jsx-spread.html +>var props = {}; +>props.foo = x; +>props.bar = y; +>var component = ; + ^ + [41, 17]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^^^ + [41, 18]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx entity.name.tag.tsx + ^^^^^^^^ + [41, 29]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx + ^^ + [41, 39]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.end.tsx +> +>var props2 = { foo: 'default' } +>var component2 = + ^ + [44, 18]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^^^ + [44, 19]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx entity.name.tag.tsx + ^^^^^^^^ + [44, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx + ^^ + [44, 57]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.end.tsx +> +>// JSX Gotchas +>// http://facebook.github.io/react/docs/jsx-gotchas.html +>var a =
{'First \u00b7 Second'}
+ ^ + [48, 15]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx +>var b =
{'First ' + String.fromCharCode(183) + ' Second'}
+ ^^^^^^^^^^^^^^^^^^^^ + [49, 26]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx +>var c =
{['First ', ·, ' Second']}
+ ^ + [50, 26]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx +>var d =
+ ^^^^^^^ + [51, 40]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx + ^ + [51, 48]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.single.tsx +>var e =
+ ^^^ + [52, 37]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx string.quoted.double.tsx +> \ No newline at end of file diff --git a/tests/baselines/awaitColoring.txt b/tests/baselines/awaitColoring.txt index 782a902e..e319b471 100644 --- a/tests/baselines/awaitColoring.txt +++ b/tests/baselines/awaitColoring.txt @@ -4,5 +4,9 @@ original file ^^awaiting 1; ----------------------------------- -[1, 1]: source.ts storage.modifier.ts -[2, 1]: source.ts \ No newline at end of file +>await 1; + ^^^^^ + [1, 1]: source.ts storage.modifier.ts +>awaiting 1; + ^^^^^^^^^ + [2, 1]: source.ts \ No newline at end of file diff --git a/tests/baselines/javascript.txt b/tests/baselines/javascript.txt index d41b83fd..ce33f34c 100644 --- a/tests/baselines/javascript.txt +++ b/tests/baselines/javascript.txt @@ -10,10 +10,25 @@ original file x ^^instanceof y; ----------------------------------- -[1, 1]: source.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts -[2, 5]: source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts -[3, 5]: source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts -[5, 1]: source.ts keyword.others.ts -[6, 1]: source.ts storage.type.ts -[7, 1]: source.ts keyword.others.ts -[8, 3]: source.ts keyword.others.ts \ No newline at end of file +>switch (x) { + ^^^^^^ + [1, 1]: source.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts +> case 0: + ^^^^ + [2, 5]: source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts +> default: + ^^^^^^^ + [3, 5]: source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts +>} +>typeof x; + ^^^^^^ + [5, 1]: source.ts keyword.others.ts +>void x; + ^^^^ + [6, 1]: source.ts storage.type.ts +>delete x.y; + ^^^^^^ + [7, 1]: source.ts keyword.others.ts +>x instanceof y; + ^^^^^^^^^^ + [8, 3]: source.ts keyword.others.ts \ No newline at end of file diff --git a/tests/baselines/multipleVariableDeclaration.txt b/tests/baselines/multipleVariableDeclaration.txt index df174414..a73731b0 100644 --- a/tests/baselines/multipleVariableDeclaration.txt +++ b/tests/baselines/multipleVariableDeclaration.txt @@ -8,14 +8,31 @@ var ^^obj = { }, ^^other = 10; ----------------------------------- -[1, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[1, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[1, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[2, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[2, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[2, 46]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[3, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[3, 26]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[3, 76]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[4, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[6, 4]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts \ No newline at end of file +>var a, b, c + ^ + [1, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + [1, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^ + [1, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts +>var a1 = 1, b1 = function (x) { return 1; }, c1 = "string" + ^^ + [2, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + [2, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + [2, 46]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts +>var a2: string = "test", b2: () => void = () => { console.log("hello"); }, c2: string | number; + ^^ + [3, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + [3, 26]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + [3, 76]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts +>var obj = { + ^^^ + [4, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts +> foo: "10" +>}, other = 10; + ^^^^^ + [6, 4]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts \ No newline at end of file diff --git a/tests/baselines/namespaceAndModule.txt b/tests/baselines/namespaceAndModule.txt index c864bfd1..7f57055b 100644 --- a/tests/baselines/namespaceAndModule.txt +++ b/tests/baselines/namespaceAndModule.txt @@ -7,8 +7,18 @@ declare ^^module ts {} declare ^^module "x" {} ----------------------------------- -[1, 1]: source.ts storage.type.ts -[2, 1]: source.ts storage.type.ts -[3, 9]: source.ts storage.type.ts -[4, 9]: source.ts storage.type.ts -[5, 9]: source.ts storage.type.ts \ No newline at end of file +>namespace ts { } + ^^^^^^^^^ + [1, 1]: source.ts storage.type.ts +>module ts { } + ^^^^^^ + [2, 1]: source.ts storage.type.ts +>declare namespace ts {} + ^^^^^^^^^ + [3, 9]: source.ts storage.type.ts +>declare module ts {} + ^^^^^^ + [4, 9]: source.ts storage.type.ts +>declare module "x" {} + ^^^^^^ + [5, 9]: source.ts storage.type.ts \ No newline at end of file diff --git a/tests/baselines/pr48_noSemiColon.txt b/tests/baselines/pr48_noSemiColon.txt index b8a0051f..085c5d5c 100644 --- a/tests/baselines/pr48_noSemiColon.txt +++ b/tests/baselines/pr48_noSemiColon.txt @@ -23,25 +23,68 @@ class Test { ----------------------------------- -[2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts -[2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts -[3, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts -[3, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts -[4, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts -[4, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts -[7, 1]: source.ts storage.type.ts -[7, 8]: source.ts meta.type.declaration.ts keyword.other.ts -[7, 13]: source.ts meta.type.declaration.ts entity.name.class.ts -[8, 1]: source.ts storage.type.ts -[8, 8]: source.ts meta.var.expr.ts storage.type.ts -[8, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts -[13, 1]: source.ts meta.function.ts storage.type.ts -[13, 8]: source.ts meta.function.ts storage.type.function.ts -[13, 39]: source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts -[14, 2]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts -[18, 1]: source.ts storage.type.ts -[18, 8]: source.ts meta.var.expr.ts storage.type.ts -[18, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts -[19, 1]: source.ts storage.type.ts -[19, 8]: source.ts meta.var.expr.ts storage.type.ts -[19, 34]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts \ No newline at end of file +>class Test { +> private data: TemplateData[] = [] + ^^^^^^^ + [2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^^^^ + [2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts +> private options: TemplateOptions = {} + ^^^^^^^ + [3, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^^^^^^^ + [3, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts +> private state = {} + ^^^^^^^ + [4, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^^^^^ + [4, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts +>} +> +>export type Stats = fs.Stats + ^^^^^^ + [7, 1]: source.ts storage.type.ts + ^^^^ + [7, 8]: source.ts meta.type.declaration.ts keyword.other.ts + ^^^^^ + [7, 13]: source.ts meta.type.declaration.ts entity.name.class.ts +>export const touch = thenify(tch) + ^^^^^^ + [8, 1]: source.ts storage.type.ts + ^^^^^ + [8, 8]: source.ts meta.var.expr.ts storage.type.ts + ^^^^^ + [8, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts +> +>/** +> * Verify comments +> */ +>export function isFile(path: string): Promise { + ^^^^^^ + [13, 1]: source.ts meta.function.ts storage.type.ts + ^^^^^^^^ + [13, 8]: source.ts meta.function.ts storage.type.function.ts + ^^^^^^^ + [13, 39]: source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts +> return stat(path).then(stat => stat.isFile(), () => false) + ^^^^^^ + [14, 2]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts +>} +> +> +>export const readFile = thenify(fs.readFile) + ^^^^^^ + [18, 1]: source.ts storage.type.ts + ^^^^^ + [18, 8]: source.ts meta.var.expr.ts storage.type.ts + ^^^^^^ + [18, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts +>export const writeFile = thenify(fs.writeFile) + ^^^^^^ + [19, 1]: source.ts storage.type.ts + ^^^^^ + [19, 8]: source.ts meta.var.expr.ts storage.type.ts + ^^^^^^ + [19, 34]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts +> +> \ No newline at end of file diff --git a/tests/build.ts b/tests/build.ts index d36832c9..b3ac0a06 100644 --- a/tests/build.ts +++ b/tests/build.ts @@ -42,10 +42,11 @@ function getScopesAtMarkers(text: string, grammar: vt.IGrammar): string { let lineTokens = grammar.tokenizeLine(line, ruleStack); ruleStack = lineTokens.ruleStack; + outputLines.push(">" + line); for (let token of lineTokens.tokens) { for (let markerLocation of markerLocations) { if (token.startIndex <= markerLocation && markerLocation < token.endIndex) { - outputLines.push('[' + (parseInt(i) + 1) + ', ' + (markerLocation + 1) + ']: ' + token.scopes.join(' ') + ' '); + writeTokenLine(token, '[' + (parseInt(i) + 1) + ', ' + (markerLocation + 1) + ']: ', ' ', outputLines); } } } @@ -54,6 +55,20 @@ function getScopesAtMarkers(text: string, grammar: vt.IGrammar): string { return getInputFile(oriLines) + outputLines.join('\n'); } +function writeTokenLine(token: vt.IToken, preTextForToken: string, postTextForToken: string, outputLines: string[]) { + let startingSpaces = " "; + for (let j = 0; j < token.startIndex; j++) { + startingSpaces += " "; + } + + let locatingString = ""; + for (let j = token.startIndex; j < token.endIndex; j++) { + locatingString += "^"; + } + outputLines.push(startingSpaces + locatingString); + outputLines.push(startingSpaces + preTextForToken + token.scopes.join(' ') + postTextForToken); +} + function baselineWholeFile(text: string, grammar: vt.IGrammar): string { let oriLines = text.split('\n'); let ruleStack: vt.StackElement[] = undefined; @@ -67,17 +82,7 @@ function baselineWholeFile(text: string, grammar: vt.IGrammar): string { outputLines.push(">" + line); for (let token of lineTokens.tokens) { - let startingSpaces = " "; - for (let j = 0; j < token.startIndex; j++) { - startingSpaces += " "; - } - - let locatingString = ""; - for (let j = token.startIndex; j < token.endIndex; j++) { - locatingString += "^"; - } - outputLines.push(startingSpaces + locatingString); - outputLines.push(startingSpaces + token.scopes.join(' ')); + writeTokenLine(token, "", "", outputLines); } } From c0d907ed80e9e40283d863d5e9169e3bfd69a982 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 29 Jul 2016 13:57:32 -0700 Subject: [PATCH 04/77] Generate baselines and markers in same folder --- .gitignore | 3 +-- tests/build.ts | 5 +---- tests/test.ts | 9 --------- tests/tsconfig.json | 1 - 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 70c90d0a..4c566d18 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ tests/generated/* tests/node_modules tests/typings/ -tests/*.js -tests/generatedBaselines/* \ No newline at end of file +tests/*.js \ No newline at end of file diff --git a/tests/build.ts b/tests/build.ts index b3ac0a06..a284256b 100644 --- a/tests/build.ts +++ b/tests/build.ts @@ -96,12 +96,9 @@ for (var fileName of fs.readdirSync('cases')) { if (!fs.existsSync('./generated')){ fs.mkdirSync('generated'); } - if (!fs.existsSync('./generatedBaselines')) { - fs.mkdirSync('generatedBaselines'); - } let outputFileName = path.join('./generated', parsedFileName.name + '.txt'); fs.writeFile(outputFileName, getScopesAtMarkers(text, grammar), "utf8"); - let outputBaselineName = path.join('./generatedBaselines', parsedFileName.name + '.baseline.txt'); + let outputBaselineName = path.join('./generated', parsedFileName.name + '.baseline.txt'); fs.writeFile(outputBaselineName, baselineWholeFile(text, grammar), "utf8"); } diff --git a/tests/test.ts b/tests/test.ts index f59aa79d..3ccf0393 100644 --- a/tests/test.ts +++ b/tests/test.ts @@ -19,15 +19,6 @@ describe("Compare generated with baselines", () => { } }) -describe("Compare generatedBaselines with baselines", () => { - for (var file of fs.readdirSync('generatedBaselines')) { - var generatedText = fs.readFileSync('generatedBaselines/' + file, 'utf8'); - var baselinesText = fs.readFileSync('baselines/' + file, 'utf8'); - - addTestCase(file, generatedText, baselinesText); - } -}) - function addTestCase(file: string, generatedText: string, baselinesText: string) { describe('Comparing ' + file, () => { it('should be the same', () => { diff --git a/tests/tsconfig.json b/tests/tsconfig.json index 4ba0b872..d33f1d00 100644 --- a/tests/tsconfig.json +++ b/tests/tsconfig.json @@ -8,7 +8,6 @@ "cases", "baselines", "generated", - "generatedBaselines", "node_modules" ] } \ No newline at end of file From d9a7c97869fb5e9b136565b455ff5c8a70a86e3f Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 11 Aug 2016 10:48:00 -0700 Subject: [PATCH 05/77] Theme files for existing typescript and typescript react --- TypeScript.tmTheme | 130 ++++++++++++++++++++++++++ TypeScriptReact.tmTheme | 197 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 327 insertions(+) create mode 100644 TypeScript.tmTheme create mode 100644 TypeScriptReact.tmTheme diff --git a/TypeScript.tmTheme b/TypeScript.tmTheme new file mode 100644 index 00000000..b5bb203e --- /dev/null +++ b/TypeScript.tmTheme @@ -0,0 +1,130 @@ + + + + + name + TypeScript + settings + + + scope + storage.modifier.ts, storage.type.ts, storage.type.function.ts, storage.type.property.ts + settings + + vsclassificationtype + keyword + + + + scope + keyword, keyword.control.ts, keyword.others.ts, keyword.control.import.include.ts + settings + + vsclassificationtype + keyword + + + + scope + support.type.ts, constant.language.boolean.ts, constant.language.null.ts, constant.language.this.ts + settings + + vsclassificationtype + keyword + + + + + scope + string.double.ts, string.single.ts, string.template.ts, string.regex.ts, constant.character.escape, constant.character.class.ts + settings + + vsclassificationtype + string + + + + + scope + constant.numeric.ts + settings + + vsclassificationtype + number + + + + + scope + keyword.operator.ts, keyword.operator.arithmetic.ts, keyword.operator.assignment.ts, keyword.operator.comparison.ts + settings + + vsclassificationtype + operator + + + + + scope + meta.brace, meta.brace.square.ts, meta.brace.curly.ts, meta.brace.angle.ts, meta.brace.round.ts, meta.brace.square.ts, meta.brace.paren.ts + settings + + vsclassificationtype + punctuation + + + + + scope + comment, comment.block.ts, comment.block.documentation.ts, comment.line.ts + settings + + vsclassificationtype + comment + + + + + scope + entity.name.class.ts + settings + + vsclassificationtype + class name + + + + + scope + entity.name.type.ts + settings + + vsclassificationtype + type parameter name + + + + + scope + entity.name.function.ts, variable.parameter.ts, meta.object.name.ts, meta.type.name.ts + settings + + vsclassificationtype + identifier + + + + scope + constant.language.ts + settings + + vsclassificationtype + identifier + + + + + uuid + ef98eb90-bf9b-11e4-bb52-0800200c9a66 + + diff --git a/TypeScriptReact.tmTheme b/TypeScriptReact.tmTheme new file mode 100644 index 00000000..a6b74f16 --- /dev/null +++ b/TypeScriptReact.tmTheme @@ -0,0 +1,197 @@ + + + + + name + TypeScript + settings + + + scope + storage.modifier.tsx, storage.type.tsx, storage.type.function.tsx, storage.type.property.tsx + settings + + vsclassificationtype + keyword + + + + scope + keyword, keyword.control.tsx, keyword.others.tsx, keyword.control.import.include.tsx + settings + + vsclassificationtype + keyword + + + + scope + support.type.tsx, constant.language.boolean.tsx, constant.language.null.tsx, constant.language.this.tsx + settings + + vsclassificationtype + keyword + + + + + scope + string.double.tsx, string.single.tsx, string.template.tsx, string.regex.tsx, constant.character.escape, constant.character.class.tsx + settings + + vsclassificationtype + string + + + + + scope + constant.numeric.tsx + settings + + vsclassificationtype + number + + + + + scope + keyword.operator.tsx, keyword.operator.arithmetic.tsx, keyword.operator.assignment.tsx, keyword.operator.comparison.tsx + settings + + vsclassificationtype + operator + + + + + scope + meta.brace, meta.brace.square.tsx, meta.brace.curly.tsx, meta.brace.angle.tsx, meta.brace.round.tsx, meta.brace.square.tsx, meta.brace.paren.tsx + settings + + vsclassificationtype + punctuation + + + + scope + punctuation.definition.brace.curly.start.tsx, punctuation.definition.brace.curly.end.tsx + settings + + vsclassificationtype + punctuation + + + + scope + punctuation.definition.tag.begin.tsx, punctuation.definition.tag.end.tsx + settings + + vsclassificationtype + punctuation + + + + + scope + comment, comment.block.tsx, comment.block.documentation.tsx, comment.line.tsx + settings + + vsclassificationtype + comment + + + + + scope + entity.name.class.tsx + settings + + vsclassificationtype + class name + + + + + scope + entity.name.type.tsx + settings + + vsclassificationtype + type parameter name + + + + + scope + entity.name.tag.tsx + settings + + vsclassificationtype + xml literal - name + + + + + scope + entity.other.attribute-name.tsx, invalid.illegal.attribute.tsx + settings + + vsclassificationtype + xml literal - attribute name + + + + + scope + punctuation.definition.string.begin.tsx, punctuation.definition.string.end.tsx + settings + + vsclassificationtype + xml literal - attribute quotes + + + + scope + string.quoted.double.tsx, string.quoted.single.tsx + settings + + vsclassificationtype + xml literal - attribute value + + + + + scope + constant.character.entity.tsx, punctuation.definition.entity.tsx, invalid.illegal.bad-ampersand.tsx + settings + + vsclassificationtype + xml literal - text + + + + + scope + entity.name.function.tsx, variable.parameter.tsx, meta.object.name.tsx, meta.type.name.tsx + settings + + vsclassificationtype + identifier + + + + scope + constant.language.tsx + settings + + vsclassificationtype + identifier + + + + + uuid + ef98eb90-bf9b-11e4-bb52-0800200c9a66 + + From aea13ef0e70dc12111f9e2ca071c74dc1e41c3fe Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 11 Aug 2016 11:57:16 -0700 Subject: [PATCH 06/77] Update comment grammar --- TypeScript.YAML-tmLanguage | 51 ++- TypeScript.tmLanguage | 146 +++++--- TypeScript.tmTheme | 29 +- TypeScriptReact.YAML-tmLanguage | 49 ++- TypeScriptReact.tmLanguage | 138 ++++++-- TypeScriptReact.tmTheme | 29 +- ...owFunctionInsideTypeAssertion.baseline.txt | 6 +- tests/baselines/Comments.baseline.txt | 312 +++++++++--------- tests/baselines/Comments.txt | 154 ++++----- .../FunctionMethodOverloads.baseline.txt | 8 +- .../FunctionMethodParameters.baseline.txt | 8 +- .../FunctionMethodReturnTypes.baseline.txt | 8 +- tests/baselines/Issue110.baseline.txt | 4 +- tests/baselines/Issue124.baseline.txt | 8 +- tests/baselines/Issue28.baseline.txt | 4 +- tests/baselines/Issue288.baseline.txt | 12 +- tests/baselines/Issue32.baseline.txt | 8 +- tests/baselines/Issue37.baseline.txt | 14 +- tests/baselines/Issue44.baseline.txt | 4 +- tests/baselines/Issue82.baseline.txt | 12 +- tests/baselines/Issue82.txt | 8 +- tests/baselines/Issue89.baseline.txt | 28 +- tests/baselines/Issue89.txt | 2 +- ...SyntacticallyIncorrectStrings.baseline.txt | 6 +- tests/baselines/TsxSamples.baseline.txt | 40 ++- tests/baselines/docComments.baseline.txt | 104 ++++++ tests/baselines/docComments.txt | 20 ++ tests/baselines/pr48_noSemiColon.baseline.txt | 4 +- tests/cases/docComments.ts | 8 + 29 files changed, 805 insertions(+), 419 deletions(-) create mode 100644 tests/baselines/docComments.baseline.txt create mode 100644 tests/baselines/docComments.txt create mode 100644 tests/cases/docComments.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 5ea5d573..776bbcf8 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -635,25 +635,40 @@ repository: - include: '#expression' comment: - name: comment.ts patterns: - - include: '#comment-block-doc' - - include: '#comment-block' - - include: '#comment-line' - - comment-block-doc: - name: comment.block.documentation.ts - begin: /\*\*(?!/) - end: \*/ - - comment-block: - name: comment.block.ts - begin: /\* - end: \*/ - - comment-line: - name: comment.line.ts - match: (//).*$\n? + - name: comment.block.documentation.ts + begin: /\*\*(?!/) + end: \*/ + captures: + '0': {name: punctuation.definition.comment.ts} + patterns: + - include: '#docblock' + - name: comment.block.ts + begin: /\* + end: \*/ + captures: + '0': {name: punctuation.definition.comment.ts} + - begin: (^[ \t]+)?(?=//) + beginCaptures: + '1': {name: punctuation.whitespace.comment.leading.ts} + end: (?!\G) + patterns: + - name: comment.line.double-slash.ts + begin: // + beginCaptures: + '0': {name: punctuation.definition.comment.ts} + end: \n + + docblock: + patterns: + - name: storage.type.class.jsdoc + match: (? comment - name - comment.ts patterns - include - #comment-block-doc - - - include - #comment-block - - - include - #comment-line + begin + /\*\*(?!/) + captures + + 0 + + name + punctuation.definition.comment.ts + + + end + \*/ + name + comment.block.documentation.ts + patterns + + + include + #docblock + + + + + begin + /\* + captures + + 0 + + name + punctuation.definition.comment.ts + + + end + \*/ + name + comment.block.ts + + + begin + (^[ \t]+)?(?=//) + beginCaptures + + 1 + + name + punctuation.whitespace.comment.leading.ts + + + end + (?!\G) + patterns + + + begin + // + beginCaptures + + 0 + + name + punctuation.definition.comment.ts + + + end + \n + name + comment.line.double-slash.ts + + - comment-block - - begin - /\* - end - \*/ - name - comment.block.ts - - comment-block-doc - - begin - /\*\*(?!/) - end - \*/ - name - comment.block.documentation.ts - - comment-line - - match - (//).*$\n? - name - comment.line.ts - control-statement match @@ -284,6 +317,45 @@ + docblock + + patterns + + + match + (?<!\w)@(abstract|access|alias|arg|argument|async|attribute|augments|author|beta|borrows|bubbes|callback|chainable|class|classdesc|code|config|const|constant|constructor|constructs|copyright|default|defaultvalue|define|deprecated|desc|description|dict|emits|enum|event|example|exports?|extends|extension|extension_for|extensionfor|external|file|fileoverview|final|fires|for|function|global|host|ignore|implements|inherit[Dd]oc|inner|instance|interface|kind|lends|license|listens|main|member|memberof|method|mixex|mixins?|module|name|namespace|nocollapse|nosideeffects|override|overview|package|param|preserve|private|prop|property|protected|public|read[Oo]nly|record|require[ds]|returns?|see|since|static|struct|submodule|summary|template|this|throws|todo|tutorial|type|typedef|unrestricted|uses|var|variation|version|virtual|writeOnce)\b + name + storage.type.class.jsdoc + + + captures + + 0 + + name + other.meta.jsdoc + + 1 + + name + entity.name.type.instance.jsdoc + + 2 + + name + variable.other.jsdoc + + 3 + + name + other.description.jsdoc + + + match + ({\b(?:[a-zA-Z_$][a-zA-Z_$0-9]*)\b})\s\b([a-zA-Z_$][a-zA-Z_$0-9]*)\b\s*((?:(?!\*\/).)*) + + + enum-declaration captures diff --git a/TypeScript.tmTheme b/TypeScript.tmTheme index b5bb203e..94f97f50 100644 --- a/TypeScript.tmTheme +++ b/TypeScript.tmTheme @@ -76,13 +76,40 @@ scope - comment, comment.block.ts, comment.block.documentation.ts, comment.line.ts + comment, comment.block.ts, comment.line.double-slash.ts, punctuation.definition.comment.ts settings vsclassificationtype comment + + scope + comment.block.documentation.ts, other.meta.jsdoc, other.description.jsdoc + settings + + vsclassificationtype + comment + + + + scope + entity.name.type.instance.jsdoc, variable.other.jsdoc + settings + + vsclassificationtype + identifier + + + + scope + storage.type.class.jsdoc + settings + + vsclassificationtype + xml doc comment - name + + scope diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 8109cf3b..cda89efe 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -624,25 +624,40 @@ repository: - include: '#expression' comment: - name: comment.tsx patterns: - - include: '#comment-block-doc' - - include: '#comment-block' - - include: '#comment-line' - - comment-block-doc: - name: comment.block.documentation.tsx - begin: /\*\*(?!/) - end: \*/ - - comment-block: - name: comment.block.tsx - begin: /\* - end: \*/ + - name: comment.block.documentation.tsx + begin: /\*\*(?!/) + end: \*/ + captures: + '0': {name: punctuation.definition.comment.tsx} + patterns: + - include: '#docblock' + - name: comment.block.tsx + begin: /\* + end: \*/ + captures: + '0': {name: punctuation.definition.comment.tsx} + - begin: (^[ \t]+)?(?=//) + beginCaptures: + '1': {name: punctuation.whitespace.comment.leading.tsx} + end: (?!\G) + patterns: + - name: comment.line.double-slash.tsx + begin: // + beginCaptures: + '0': {name: punctuation.definition.comment.tsx} + end: \n - comment-line: - name: comment.line.tsx - match: (//).*$\n? + docblock: + patterns: + - name: storage.type.class.jsdoc + match: (? comment - name - comment.tsx patterns - include - #comment-block-doc + begin + /\*\*(?!/) + captures + + 0 + + name + punctuation.definition.comment.tsx + + + end + \*/ + name + comment.block.documentation.tsx + patterns + + + include + #docblock + + - include - #comment-block + begin + /\* + captures + + 0 + + name + punctuation.definition.comment.tsx + + + end + \*/ + name + comment.block.tsx - include - #comment-line + begin + (^[ \t]+)?(?=//) + beginCaptures + + 1 + + name + punctuation.whitespace.comment.leading.tsx + + + end + (?!\G) + patterns + + + begin + // + beginCaptures + + 0 + + name + punctuation.definition.comment.tsx + + + end + \n + name + comment.line.double-slash.tsx + + - comment-block - - begin - /\* - end - \*/ - name - comment.block.tsx - - comment-block-doc - - begin - /\*\*(?!/) - end - \*/ - name - comment.block.documentation.tsx - - comment-line - - match - (//).*$\n? - name - comment.line.tsx - control-statement match @@ -252,6 +285,45 @@ + docblock + + patterns + + + match + (?<!\w)@(abstract|access|alias|arg|argument|async|attribute|augments|author|beta|borrows|bubbes|callback|chainable|class|classdesc|code|config|const|constant|constructor|constructs|copyright|default|defaultvalue|define|deprecated|desc|description|dict|emits|enum|event|example|exports?|extends|extension|extension_for|extensionfor|external|file|fileoverview|final|fires|for|function|global|host|ignore|implements|inherit[Dd]oc|inner|instance|interface|kind|lends|license|listens|main|member|memberof|method|mixex|mixins?|module|name|namespace|nocollapse|nosideeffects|override|overview|package|param|preserve|private|prop|property|protected|public|read[Oo]nly|record|require[ds]|returns?|see|since|static|struct|submodule|summary|template|this|throws|todo|tutorial|type|typedef|unrestricted|uses|var|variation|version|virtual|writeOnce)\b + name + storage.type.class.jsdoc + + + captures + + 0 + + name + other.meta.jsdoc + + 1 + + name + entity.name.type.instance.jsdoc + + 2 + + name + variable.other.jsdoc + + 3 + + name + other.description.jsdoc + + + match + ({\b(?:[a-zA-Z_$][a-zA-Z_$0-9]*)\b})\s\b([a-zA-Z_$][a-zA-Z_$0-9]*)\b\s*((?:(?!\*\/).)*) + + + enum-declaration captures diff --git a/TypeScriptReact.tmTheme b/TypeScriptReact.tmTheme index a6b74f16..25fc7c16 100644 --- a/TypeScriptReact.tmTheme +++ b/TypeScriptReact.tmTheme @@ -94,13 +94,40 @@ scope - comment, comment.block.tsx, comment.block.documentation.tsx, comment.line.tsx + comment, comment.block.tsx, comment.line.double-slash.tsx, punctuation.definition.comment.tsx settings vsclassificationtype comment + + scope + comment.block.documentation.tsx, other.meta.jsdoc, other.description.jsdoc + settings + + vsclassificationtype + comment + + + + scope + entity.name.type.instance.jsdoc, variable.other.jsdoc + settings + + vsclassificationtype + identifier + + + + scope + storage.type.class.jsdoc + settings + + vsclassificationtype + xml doc comment - name + + scope diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index fb8ebd46..ca68a2af 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -25,8 +25,10 @@ function f(x: string | ((value: string) => number)) { ----------------------------------- >// Issue: https://github.com/Microsoft/TypeScript-Sublime-Plugin/issues/292 - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts comment.line.ts + ^^ + source.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.line.double-slash.ts > ^ source.ts diff --git a/tests/baselines/Comments.baseline.txt b/tests/baselines/Comments.baseline.txt index ee9cedef..d57b399e 100644 --- a/tests/baselines/Comments.baseline.txt +++ b/tests/baselines/Comments.baseline.txt @@ -74,7 +74,7 @@ var x = new ^^/* comments */ String(); >/* ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts >Tests for comments in general. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts comment.block.ts @@ -92,7 +92,7 @@ var x = new ^^/* comments */ String(); source.ts comment.block.ts >*/ ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > ^ source.ts @@ -102,11 +102,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^^ - source.ts meta.var.expr.ts comment.block.ts + source.ts meta.var.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^ source.ts meta.var.expr.ts comment.block.ts ^^ - source.ts meta.var.expr.ts comment.block.ts + source.ts meta.var.expr.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.var.expr.ts ^ @@ -141,11 +141,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -178,11 +178,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ @@ -217,11 +217,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -256,11 +256,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -299,11 +299,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts >var x: string = "yahoo"; /* comment */ @@ -334,11 +334,11 @@ var x = new ^^/* comments */ String(); ^^ source.ts ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^ source.ts comment.block.ts ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > ^ source.ts @@ -348,11 +348,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^^ - source.ts meta.var.expr.ts comment.block.ts + source.ts meta.var.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^ source.ts meta.var.expr.ts comment.block.ts ^^ - source.ts meta.var.expr.ts comment.block.ts + source.ts meta.var.expr.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.var.expr.ts ^ @@ -385,11 +385,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -420,11 +420,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ @@ -457,11 +457,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -494,11 +494,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -535,19 +535,19 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts > ^ source.ts >/**/ interface i extends i1, i2, i3 {} ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts ^^^^^^^^^ @@ -584,9 +584,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts ^ @@ -623,9 +623,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts ^^^^^^^ @@ -662,9 +662,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -701,9 +701,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -736,9 +736,9 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -775,9 +775,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -810,9 +810,9 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -849,9 +849,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ @@ -860,9 +860,9 @@ var x = new ^^/* comments */ String(); source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts >/**/ interface /**/ i /**/ extends /**/ i1, /**/ i2, /**/ i3 /**/ {} ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts ^^^^^^^^^ @@ -870,9 +870,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts ^ @@ -880,9 +880,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts ^^^^^^^ @@ -890,9 +890,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -900,9 +900,9 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -910,9 +910,9 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -920,9 +920,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ @@ -931,9 +931,9 @@ var x = new ^^/* comments */ String(); source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts >/**/ interface /**/ i /**/ extends /**/ i1 /**/ , /**/ i2 /**/ , /**/ i3 /**/ {} ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts ^^^^^^^^^ @@ -941,9 +941,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts ^ @@ -951,9 +951,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts ^^^^^^^ @@ -961,9 +961,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -971,15 +971,15 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -987,15 +987,15 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -1003,9 +1003,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ @@ -1017,9 +1017,9 @@ var x = new ^^/* comments */ String(); source.ts >/**/class i extends c1,c2,c3{} ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^^^^^ source.ts meta.declaration.object.ts storage.type.ts ^ @@ -1050,9 +1050,9 @@ var x = new ^^/* comments */ String(); ^^^^^ source.ts meta.declaration.object.ts storage.type.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^ @@ -1083,9 +1083,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts ^ @@ -1116,9 +1116,9 @@ var x = new ^^/* comments */ String(); ^^^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^ @@ -1149,9 +1149,9 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -1182,9 +1182,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^ @@ -1215,9 +1215,9 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -1248,9 +1248,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^ @@ -1281,115 +1281,115 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts >/**/class/**/i/**/extends/**/c1,/**/c2,/**/c3/**/{} ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^^^^^ source.ts meta.declaration.object.ts storage.type.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts >/**/class/**/i/**/extends/**/c1/**/,/**/c2/**/,/**/c3/**/{} ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^^^^^ source.ts meta.declaration.object.ts storage.type.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts ^ @@ -1405,9 +1405,9 @@ var x = new ^^/* comments */ String(); ^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts ^ @@ -1482,9 +1482,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts ^ @@ -1551,9 +1551,9 @@ var x = new ^^/* comments */ String(); ^^^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ @@ -1620,9 +1620,9 @@ var x = new ^^/* comments */ String(); ^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.brace.angle.ts ^ @@ -1701,9 +1701,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts ^^ @@ -1737,9 +1737,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts comment.block.ts + source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts ^^^^^^^^ @@ -1820,9 +1820,9 @@ var x = new ^^/* comments */ String(); ^^^^^^^^ source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts ^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^ source.ts meta.declaration.object.ts meta.type.parameters.ts keyword.other.ts ^ @@ -1897,9 +1897,9 @@ var x = new ^^/* comments */ String(); ^^^^^^^ source.ts meta.declaration.object.ts meta.type.parameters.ts keyword.other.ts ^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^ source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts ^ @@ -1961,11 +1961,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts ^^^ @@ -1990,11 +1990,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts ^ @@ -2021,11 +2021,11 @@ var x = new ^^/* comments */ String(); ^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts ^ @@ -2047,11 +2047,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -2082,11 +2082,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ @@ -2117,11 +2117,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^^^^ diff --git a/tests/baselines/Comments.txt b/tests/baselines/Comments.txt index f7779c10..39fb2837 100644 --- a/tests/baselines/Comments.txt +++ b/tests/baselines/Comments.txt @@ -82,217 +82,217 @@ var x = new ^^/* comments */ String(); > >var /* comment */ x: string = "yahoo"; ^^ - [9, 5]: source.ts meta.var.expr.ts comment.block.ts + [9, 5]: source.ts meta.var.expr.ts comment.block.ts punctuation.definition.comment.ts >var x /* comment */: string = "yahoo"; ^^ - [10, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + [10, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts >var x: /* comment */ string = "yahoo"; ^^ - [11, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + [11, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts punctuation.definition.comment.ts >var x: string /* comment */ = "yahoo"; ^^ - [12, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + [12, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts punctuation.definition.comment.ts >var x: string = /* comment */ "yahoo"; ^^ - [13, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + [13, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts >var x: string = "yahoo" /* comment */; ^^ - [14, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + [14, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts >var x: string = "yahoo"; /* comment */ ^^ - [15, 26]: source.ts comment.block.ts + [15, 26]: source.ts comment.block.ts punctuation.definition.comment.ts > >var /* comment */ x: string = "yahoo" ^^ - [17, 5]: source.ts meta.var.expr.ts comment.block.ts + [17, 5]: source.ts meta.var.expr.ts comment.block.ts punctuation.definition.comment.ts >var x /* comment */: string = "yahoo" ^^ - [18, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + [18, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts >var x: /* comment */ string = "yahoo" ^^ - [19, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + [19, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts punctuation.definition.comment.ts >var x: string /* comment */ = "yahoo" ^^ - [20, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts + [20, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts comment.block.ts punctuation.definition.comment.ts >var x: string = /* comment */ "yahoo" ^^ - [21, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + [21, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts >var x: string = "yahoo" /* comment */ ^^ - [22, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + [22, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts > >/**/ interface i extends i1, i2, i3 {} ^^ - [24, 1]: source.ts comment.block.ts + [24, 1]: source.ts comment.block.ts punctuation.definition.comment.ts >interface /**/ i extends i1, i2, i3 {} ^^ - [25, 11]: source.ts meta.declaration.object.ts comment.block.ts + [25, 11]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts >interface i /**/ extends i1, i2, i3 {} ^^ - [26, 13]: source.ts meta.declaration.object.ts comment.block.ts + [26, 13]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts >interface i extends /**/ i1, i2, i3 {} ^^ - [27, 21]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [27, 21]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >interface i extends i1 /**/, i2, i3 {} ^^ - [28, 24]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [28, 24]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >interface i extends i1, /**/ i2, i3 {} ^^ - [29, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [29, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >interface i extends i1, i2 /**/, i3 {} ^^ - [30, 28]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [30, 28]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >interface i extends i1, i2, /**/ i3 {} ^^ - [31, 29]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [31, 29]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >interface i extends i1, i2, i3 /**/ {} ^^ - [32, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [32, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >/**/ interface /**/ i /**/ extends /**/ i1, /**/ i2, /**/ i3 /**/ {} ^^ - [33, 1]: source.ts comment.block.ts + [33, 1]: source.ts comment.block.ts punctuation.definition.comment.ts ^^ - [33, 16]: source.ts meta.declaration.object.ts comment.block.ts + [33, 16]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - [33, 23]: source.ts meta.declaration.object.ts comment.block.ts + [33, 23]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - [33, 36]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [33, 36]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [33, 45]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [33, 45]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [33, 54]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [33, 54]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [33, 62]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [33, 62]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >/**/ interface /**/ i /**/ extends /**/ i1 /**/ , /**/ i2 /**/ , /**/ i3 /**/ {} ^^ - [34, 1]: source.ts comment.block.ts + [34, 1]: source.ts comment.block.ts punctuation.definition.comment.ts ^^ - [34, 16]: source.ts meta.declaration.object.ts comment.block.ts + [34, 16]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - [34, 23]: source.ts meta.declaration.object.ts comment.block.ts + [34, 23]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - [34, 36]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [34, 36]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [34, 44]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [34, 44]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [34, 51]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [34, 51]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [34, 59]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [34, 59]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [34, 66]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [34, 66]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [34, 74]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [34, 74]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts > >/**/class i extends c1,c2,c3{} ^^ - [36, 1]: source.ts comment.block.ts + [36, 1]: source.ts comment.block.ts punctuation.definition.comment.ts >class/**/i extends c1,c2,c3{} ^^ - [37, 6]: source.ts meta.declaration.object.ts comment.block.ts + [37, 6]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts >class i/**/extends c1,c2,c3{} ^^ - [38, 8]: source.ts meta.declaration.object.ts comment.block.ts + [38, 8]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts >class i extends/**/c1,c2,c3{} ^^ - [39, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [39, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >class i extends c1/**/,c2,c3{} ^^ - [40, 19]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [40, 19]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >class i extends c1,/**/c2,c3{} ^^ - [41, 20]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [41, 20]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >class i extends c1,c2/**/,c3{} ^^ - [42, 22]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [42, 22]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >class i extends c1,c2,/**/c3{} ^^ - [43, 23]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [43, 23]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >class i extends c1,c2,c3/**/{} ^^ - [44, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [44, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >/**/class/**/i/**/extends/**/c1,/**/c2,/**/c3/**/{} ^^ - [45, 1]: source.ts comment.block.ts + [45, 1]: source.ts comment.block.ts punctuation.definition.comment.ts ^^ - [45, 10]: source.ts meta.declaration.object.ts comment.block.ts + [45, 10]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - [45, 15]: source.ts meta.declaration.object.ts comment.block.ts + [45, 15]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - [45, 26]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [45, 26]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [45, 33]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [45, 33]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [45, 40]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [45, 40]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [45, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [45, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >/**/class/**/i/**/extends/**/c1/**/,/**/c2/**/,/**/c3/**/{} ^^ - [46, 1]: source.ts comment.block.ts + [46, 1]: source.ts comment.block.ts punctuation.definition.comment.ts ^^ - [46, 10]: source.ts meta.declaration.object.ts comment.block.ts + [46, 10]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - [46, 15]: source.ts meta.declaration.object.ts comment.block.ts + [46, 15]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ - [46, 26]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [46, 26]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [46, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [46, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [46, 37]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [46, 37]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [46, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [46, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [46, 48]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [46, 48]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - [46, 54]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [46, 54]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts > >interface KeyValuePair/**/ extends Array { 0: K; 1: V; } ^^ - [48, 23]: source.ts meta.declaration.object.ts comment.block.ts + [48, 23]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts >interface KeyValuePair/**/extends Array { 0: K; 1: V; } ^^ - [49, 29]: source.ts meta.declaration.object.ts comment.block.ts + [49, 29]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts >interface KeyValuePair extends/**/Array { 0: K; 1: V; } ^^ - [50, 37]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [50, 37]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >interface KeyValuePair extends Array/**/ { 0: K; 1: V; } ^^ - [51, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [51, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts >interface KeyValuePair extends Array/**/{ 0: K; 1: V; } ^^ - [52, 50]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + [52, 50]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts > >interface G/**/ { ^^ - [54, 12]: source.ts meta.declaration.object.ts comment.block.ts + [54, 12]: source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts > f(x: V): V; >} >interface G { ^^ - [57, 31]: source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts + [57, 31]: source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts punctuation.definition.comment.ts > f(x: V): V; >} >interface G { ^^ - [60, 39]: source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts + [60, 39]: source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts punctuation.definition.comment.ts > f(x: V): V; >} > >var x/*comments*/=new String(); ^^ - [64, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + [64, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts >var x=/*comments*/new String(); ^^ - [65, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + [65, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts >var x= new/*comments*/String(); ^^ - [66, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts + [66, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts punctuation.definition.comment.ts > >var x /* comments */ = new String(); ^^ - [68, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + [68, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts >var x = /* comments */ new String(); ^^ - [69, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts + [69, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts >var x = new /* comments */ String(); ^^ - [70, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts \ No newline at end of file + [70, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts punctuation.definition.comment.ts \ No newline at end of file diff --git a/tests/baselines/FunctionMethodOverloads.baseline.txt b/tests/baselines/FunctionMethodOverloads.baseline.txt index 8832f268..406b88e4 100644 --- a/tests/baselines/FunctionMethodOverloads.baseline.txt +++ b/tests/baselines/FunctionMethodOverloads.baseline.txt @@ -54,11 +54,11 @@ abstract class C { >/* Function overload tests */ ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts comment.block.ts ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts >export function testFunctionOverload(p: number): new() => any ^^^^^^ source.ts meta.function.ts storage.type.ts @@ -567,11 +567,11 @@ abstract class C { ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts punctuation.definition.comment.ts > public testMethodOverload(p: number): new() => any ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts diff --git a/tests/baselines/FunctionMethodParameters.baseline.txt b/tests/baselines/FunctionMethodParameters.baseline.txt index 05b13b46..5c9104de 100644 --- a/tests/baselines/FunctionMethodParameters.baseline.txt +++ b/tests/baselines/FunctionMethodParameters.baseline.txt @@ -35,11 +35,11 @@ class testClass { >/* Function parameter tests */ ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts comment.block.ts ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts >function testFunctionParamType( ^^^^^^^^ source.ts meta.function.ts storage.type.function.ts @@ -349,11 +349,11 @@ class testClass { ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts punctuation.definition.comment.ts > public testMethodParamType( ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt index d2f9a56a..526772d7 100644 --- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -35,11 +35,11 @@ class TestClass { >/* Function return type tests */ ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts comment.block.ts ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts >export function testFunctionReturnType1(): string [] { return [""] } ^^^^^^ source.ts meta.function.ts storage.type.ts @@ -861,11 +861,11 @@ class TestClass { ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.ts punctuation.definition.comment.ts > public testMethodReturnType1(): string [] { return [""] } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts diff --git a/tests/baselines/Issue110.baseline.txt b/tests/baselines/Issue110.baseline.txt index adc1b0f1..65913c67 100644 --- a/tests/baselines/Issue110.baseline.txt +++ b/tests/baselines/Issue110.baseline.txt @@ -250,7 +250,7 @@ let i = ^^1, j = ^^1e3 source.ts >/* ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > ^ source.ts comment.block.ts @@ -259,4 +259,4 @@ let i = ^^1, j = ^^1e3 source.ts comment.block.ts >*/ ^^ - source.ts comment.block.ts \ No newline at end of file + source.ts comment.block.ts punctuation.definition.comment.ts \ No newline at end of file diff --git a/tests/baselines/Issue124.baseline.txt b/tests/baselines/Issue124.baseline.txt index e5c916f2..7936e0b7 100644 --- a/tests/baselines/Issue124.baseline.txt +++ b/tests/baselines/Issue124.baseline.txt @@ -20,7 +20,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; >/* ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > Solving Issue #124, #80, #81 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts comment.block.ts @@ -29,7 +29,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; source.ts comment.block.ts >*/ ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > ^ source.ts @@ -255,10 +255,10 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; source.ts >/* ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > Comment ^^^^^^^^^ source.ts comment.block.ts >*/ ^^ - source.ts comment.block.ts \ No newline at end of file + source.ts comment.block.ts punctuation.definition.comment.ts \ No newline at end of file diff --git a/tests/baselines/Issue28.baseline.txt b/tests/baselines/Issue28.baseline.txt index 0cc0c156..32f7588c 100644 --- a/tests/baselines/Issue28.baseline.txt +++ b/tests/baselines/Issue28.baseline.txt @@ -17,11 +17,11 @@ var w = ^^0O767; source.ts >/* Testing octals */ ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^^^^^^^^^ source.ts comment.block.ts ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > ^ source.ts diff --git a/tests/baselines/Issue288.baseline.txt b/tests/baselines/Issue288.baseline.txt index 8bf35e59..7e05545a 100644 --- a/tests/baselines/Issue288.baseline.txt +++ b/tests/baselines/Issue288.baseline.txt @@ -27,11 +27,15 @@ return^^Name+=1; ----------------------------------- >// Issue 288: "function" in "functionName" gets highlighted. - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts comment.line.ts + ^^ + source.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.line.double-slash.ts >// Fixed in pull request #289. - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts comment.line.ts + ^^ + source.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.line.double-slash.ts > ^ source.ts diff --git a/tests/baselines/Issue32.baseline.txt b/tests/baselines/Issue32.baseline.txt index abb76bb2..80bfd046 100644 --- a/tests/baselines/Issue32.baseline.txt +++ b/tests/baselines/Issue32.baseline.txt @@ -25,13 +25,13 @@ original file >/* ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > Testing Isuue 32: Adding constructor as a support.type keword ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts comment.block.ts >*/ ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > ^ source.ts @@ -183,10 +183,10 @@ original file source.ts >/* ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > Testing comments ^^^^^^^^^^^^^^^^^^ source.ts comment.block.ts >*/ ^^ - source.ts comment.block.ts \ No newline at end of file + source.ts comment.block.ts punctuation.definition.comment.ts \ No newline at end of file diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index 4966a9ba..923df450 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -71,8 +71,10 @@ var j: I = {} ----------------------------------- >//Test For Scopes - ^^^^^^^^^^^^^^^^^^ - source.ts comment.line.ts + ^^ + source.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^^^^^^^^^^^ + source.ts comment.line.double-slash.ts > ^ source.ts @@ -354,7 +356,7 @@ var j: I = {} source.ts >/** ^^^ - source.ts comment.block.documentation.ts + source.ts comment.block.documentation.ts punctuation.definition.comment.ts > * Verify comments ^^^^^^^^^^^^^^^^^^^ source.ts comment.block.documentation.ts @@ -362,7 +364,7 @@ var j: I = {} ^ source.ts comment.block.documentation.ts ^^ - source.ts comment.block.documentation.ts + source.ts comment.block.documentation.ts punctuation.definition.comment.ts > ^ source.ts @@ -691,7 +693,7 @@ var j: I = {} source.ts >/* ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > ^ source.ts comment.block.ts @@ -703,4 +705,4 @@ var j: I = {} source.ts comment.block.ts >*/ ^^ - source.ts comment.block.ts \ No newline at end of file + source.ts comment.block.ts punctuation.definition.comment.ts \ No newline at end of file diff --git a/tests/baselines/Issue44.baseline.txt b/tests/baselines/Issue44.baseline.txt index e58adae7..a3ca0b25 100644 --- a/tests/baselines/Issue44.baseline.txt +++ b/tests/baselines/Issue44.baseline.txt @@ -62,13 +62,13 @@ original file source.ts >/* ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > Testing Comments ^^^^^^^^^^^^^^^^^^ source.ts comment.block.ts >*/ ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > ^ source.ts \ No newline at end of file diff --git a/tests/baselines/Issue82.baseline.txt b/tests/baselines/Issue82.baseline.txt index 64afbb03..d63a99e2 100644 --- a/tests/baselines/Issue82.baseline.txt +++ b/tests/baselines/Issue82.baseline.txt @@ -41,8 +41,10 @@ class Foo { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts - ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts > exitEditModeCallback: () => void // Used to re-enable View updates. ^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts @@ -64,8 +66,10 @@ class Foo { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts > ) { ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts diff --git a/tests/baselines/Issue82.txt b/tests/baselines/Issue82.txt index 06a2d519..d3e8a00f 100644 --- a/tests/baselines/Issue82.txt +++ b/tests/baselines/Issue82.txt @@ -17,15 +17,15 @@ class Foo { [3, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ [3, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts - ^^^^^^^^^^^^ - [3, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.ts + ^^^^^^^^^ + [3, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts > exitEditModeCallback: () => void // Used to re-enable View updates. ^^^^^^^^^^^^^^^^^^^^ [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^ [4, 31]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - [4, 44]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + [4, 44]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts > ) { > ^^^^^^^^^ diff --git a/tests/baselines/Issue89.baseline.txt b/tests/baselines/Issue89.baseline.txt index 63431b91..b6c22ad5 100644 --- a/tests/baselines/Issue89.baseline.txt +++ b/tests/baselines/Issue89.baseline.txt @@ -44,11 +44,11 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^ @@ -56,9 +56,9 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts ^ @@ -96,9 +96,9 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ @@ -110,9 +110,9 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^^ @@ -149,9 +149,9 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^^ @@ -159,9 +159,9 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts ^^^ @@ -226,13 +226,13 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ source.ts >/* ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > Checking comments ^^^^^^^^^^^^^^^^^^^^ source.ts comment.block.ts >*/ ^^ - source.ts comment.block.ts + source.ts comment.block.ts punctuation.definition.comment.ts > ^ source.ts \ No newline at end of file diff --git a/tests/baselines/Issue89.txt b/tests/baselines/Issue89.txt index 0013d5b1..9e7a9048 100644 --- a/tests/baselines/Issue89.txt +++ b/tests/baselines/Issue89.txt @@ -81,7 +81,7 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^^ [12, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - [12, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts + [12, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^^ [12, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts ^^^ diff --git a/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt b/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt index 380aded0..efb3f795 100644 --- a/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt +++ b/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt @@ -12,8 +12,10 @@ var y ^^"some string 2" ----------------------------------- >// Test for https://github.com/Microsoft/TypeScript-Sublime-Plugin/pull/307 - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts comment.line.ts + ^^ + source.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.line.double-slash.ts > ^ source.ts diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index 53f00ae6..f0194c55 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -158,11 +158,15 @@ var e =
^ source.tsx >// JSX in Depth - ^^^^^^^^^^^^^^^^ - source.tsx comment.line.tsx + ^^ + source.tsx comment.line.double-slash.tsx punctuation.definition.comment.tsx + ^^^^^^^^^^^^^ + source.tsx comment.line.double-slash.tsx >// http://facebook.github.io/react/docs/jsx-in-depth.html - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.tsx comment.line.tsx + ^^ + source.tsx comment.line.double-slash.tsx punctuation.definition.comment.tsx + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.tsx comment.line.double-slash.tsx >var App = ^^^ source.tsx meta.var.expr.tsx storage.type.tsx @@ -386,11 +390,11 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx comment.block.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx comment.block.tsx punctuation.definition.comment.tsx ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx comment.block.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx comment.block.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx comment.block.tsx punctuation.definition.comment.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx > ^ source.tsx >// JSX Spread Attributes - ^^^^^^^^^^^^^^^^^^^^^^^^^ - source.tsx comment.line.tsx + ^^ + source.tsx comment.line.double-slash.tsx punctuation.definition.comment.tsx + ^^^^^^^^^^^^^^^^^^^^^^ + source.tsx comment.line.double-slash.tsx >// http://facebook.github.io/react/docs/jsx-spread.html - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.tsx comment.line.tsx + ^^ + source.tsx comment.line.double-slash.tsx punctuation.definition.comment.tsx + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.tsx comment.line.double-slash.tsx >var props = {}; ^^^ source.tsx meta.var.expr.tsx storage.type.tsx @@ -583,11 +591,15 @@ var e =
^ source.tsx >// JSX Gotchas - ^^^^^^^^^^^^^^^ - source.tsx comment.line.tsx + ^^ + source.tsx comment.line.double-slash.tsx punctuation.definition.comment.tsx + ^^^^^^^^^^^^ + source.tsx comment.line.double-slash.tsx >// http://facebook.github.io/react/docs/jsx-gotchas.html - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.tsx comment.line.tsx + ^^ + source.tsx comment.line.double-slash.tsx punctuation.definition.comment.tsx + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.tsx comment.line.double-slash.tsx >var a =
{'First \u00b7 Second'}
^^^ source.tsx meta.var.expr.tsx storage.type.tsx diff --git a/tests/baselines/docComments.baseline.txt b/tests/baselines/docComments.baseline.txt new file mode 100644 index 00000000..4d60d13b --- /dev/null +++ b/tests/baselines/docComments.baseline.txt @@ -0,0 +1,104 @@ +original file +----------------------------------- +/** + * This function takes two parameters + * @param {string} param1 Some string param. + * @param {number} param2 Some number param. + * some other contents + */ +function foo(param1: string, param2: number) { +} +----------------------------------- + +>/** + ^^^ + source.ts comment.block.documentation.ts punctuation.definition.comment.ts + ^^ + source.ts comment.block.documentation.ts +> * This function takes two parameters + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.documentation.ts +> * @param {string} param1 Some string param. + ^^^ + source.ts comment.block.documentation.ts + ^^^^^^ + source.ts comment.block.documentation.ts storage.type.class.jsdoc + ^ + source.ts comment.block.documentation.ts + ^^^^^^^^ + source.ts comment.block.documentation.ts other.meta.jsdoc entity.name.type.instance.jsdoc + ^ + source.ts comment.block.documentation.ts other.meta.jsdoc + ^^^^^^ + source.ts comment.block.documentation.ts other.meta.jsdoc variable.other.jsdoc + ^ + source.ts comment.block.documentation.ts other.meta.jsdoc + ^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.documentation.ts other.meta.jsdoc other.description.jsdoc +> * @param {number} param2 Some number param. + ^^^ + source.ts comment.block.documentation.ts + ^^^^^^ + source.ts comment.block.documentation.ts storage.type.class.jsdoc + ^ + source.ts comment.block.documentation.ts + ^^^^^^^^ + source.ts comment.block.documentation.ts other.meta.jsdoc entity.name.type.instance.jsdoc + ^ + source.ts comment.block.documentation.ts other.meta.jsdoc + ^^^^^^ + source.ts comment.block.documentation.ts other.meta.jsdoc variable.other.jsdoc + ^^ + source.ts comment.block.documentation.ts other.meta.jsdoc + ^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.documentation.ts other.meta.jsdoc other.description.jsdoc +> * some other contents + ^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.documentation.ts +> */ + ^ + source.ts comment.block.documentation.ts + ^^ + source.ts comment.block.documentation.ts punctuation.definition.comment.ts + ^^ + source.ts +>function foo(param1: string, param2: number) { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts +>} + ^ + source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts \ No newline at end of file diff --git a/tests/baselines/docComments.txt b/tests/baselines/docComments.txt new file mode 100644 index 00000000..541de5d5 --- /dev/null +++ b/tests/baselines/docComments.txt @@ -0,0 +1,20 @@ +original file +----------------------------------- +/** + * This function takes two parameters + * @param {string} param1 Some string param. + * @param {number} param2 Some number param. + * some other contents + */ +function foo(param1: string, param2: number) { +} +----------------------------------- + +>/** +> * This function takes two parameters +> * @param {string} param1 Some string param. +> * @param {number} param2 Some number param. +> * some other contents +> */ +>function foo(param1: string, param2: number) { +>} \ No newline at end of file diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index 13703c76..96f97780 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -146,7 +146,7 @@ class Test { source.ts >/** ^^^ - source.ts comment.block.documentation.ts + source.ts comment.block.documentation.ts punctuation.definition.comment.ts > * Verify comments ^^^^^^^^^^^^^^^^^^^ source.ts comment.block.documentation.ts @@ -154,7 +154,7 @@ class Test { ^ source.ts comment.block.documentation.ts ^^ - source.ts comment.block.documentation.ts + source.ts comment.block.documentation.ts punctuation.definition.comment.ts >export function isFile(path: string): Promise { ^^^^^^ source.ts meta.function.ts storage.type.ts diff --git a/tests/cases/docComments.ts b/tests/cases/docComments.ts new file mode 100644 index 00000000..5ab9283d --- /dev/null +++ b/tests/cases/docComments.ts @@ -0,0 +1,8 @@ +/** + * This function takes two parameters + * @param {string} param1 Some string param. + * @param {number} param2 Some number param. + * some other contents + */ +function foo(param1: string, param2: number) { +} \ No newline at end of file From 89d8a7bf753e61b7f35474ba7e283fb365b3d88f Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 11 Aug 2016 15:38:31 -0700 Subject: [PATCH 07/77] Changes for numeric literals --- TypeScript.YAML-tmLanguage | 29 ++- TypeScript.tmLanguage | 77 ++++++- TypeScript.tmTheme | 2 +- TypeScriptReact.YAML-tmLanguage | 30 ++- TypeScriptReact.tmLanguage | 77 ++++++- TypeScriptReact.tmTheme | 2 +- tests/baselines/Abstracts.baseline.txt | 2 +- .../FunctionMethodReturnTypes.baseline.txt | 12 +- tests/baselines/Issue110.baseline.txt | 100 ++++++--- tests/baselines/Issue110.txt | 52 ++--- tests/baselines/Issue262.baseline.txt | 6 +- tests/baselines/Issue28.baseline.txt | 12 +- tests/baselines/Issue28.txt | 12 +- tests/baselines/Issue288.baseline.txt | 10 +- tests/baselines/Issue335.baseline.txt | 16 +- tests/baselines/Issue37.baseline.txt | 8 +- tests/baselines/Issue5.baseline.txt | 2 +- tests/baselines/Issue90.baseline.txt | 4 +- tests/baselines/Issue90.txt | 2 +- tests/baselines/Issue96.baseline.txt | 4 +- tests/baselines/TsxSamples.baseline.txt | 2 +- tests/baselines/awaitColoring.baseline.txt | 4 +- tests/baselines/javascript.baseline.txt | 2 +- .../multipleVariableDeclaration.baseline.txt | 6 +- tests/baselines/numeric.baseline.txt | 198 ++++++++++++++++++ tests/baselines/numeric.txt | 26 +++ tests/cases/numeric.ts | 11 + 27 files changed, 590 insertions(+), 118 deletions(-) create mode 100644 tests/baselines/numeric.baseline.txt create mode 100644 tests/baselines/numeric.txt create mode 100644 tests/cases/numeric.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 776bbcf8..a5130ef0 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -692,8 +692,33 @@ repository: - include: '#expression' numeric-literal: - name: constant.numeric.ts - match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|(0(o|O)[0-7]+)|(0(b|B)(0|1)+)|(([0-9]+(\.[0-9]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b + patterns: + - name: constant.numeric.hex.ts + match: \b(? numeric-literal - match - \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|(0(o|O)[0-7]+)|(0(b|B)(0|1)+)|(([0-9]+(\.[0-9]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b - name - constant.numeric.ts + patterns + + + match + \b(?<!\$)0(x|X)[0-9a-fA-F]+\b(?!\$) + name + constant.numeric.hex.ts + + + match + \b(?<!\$)0(b|B)[01]+\b(?!\$) + name + constant.numeric.binary.ts + + + match + \b(?<!\$)0(o|O)?[0-7]+\b(?!\$) + name + constant.numeric.octal.ts + + + captures + + 0 + + name + constant.numeric.decimal.ts + + 1 + + name + meta.delimiter.decimal.period.ts + + 2 + + name + meta.delimiter.decimal.period.ts + + 3 + + name + meta.delimiter.decimal.period.ts + + 4 + + name + meta.delimiter.decimal.period.ts + + 5 + + name + meta.delimiter.decimal.period.ts + + 6 + + name + meta.delimiter.decimal.period.ts + + + match + (?x) +(?<!\$)(?: + (?:\b[0-9]+(\.)[0-9]+[eE][+-]?[0-9]+\b)| # 1.1E+3 + (?:\b[0-9]+(\.)[eE][+-]?[0-9]+\b)| # 1.E+3 + (?:\B(\.)[0-9]+[eE][+-]?[0-9]+\b)| # .1E+3 + (?:\b[0-9]+[eE][+-]?[0-9]+\b)| # 1E+3 + (?:\b[0-9]+(\.)[0-9]+\b)| # 1.1 + (?:\b[0-9]+(\.)\B)| # 1. + (?:\B(\.)[0-9]+\b)| # .1 + (?:\b[0-9]+\b(?!\.)) # 1 +)(?!\$) + + object-body diff --git a/TypeScript.tmTheme b/TypeScript.tmTheme index 94f97f50..39db0f87 100644 --- a/TypeScript.tmTheme +++ b/TypeScript.tmTheme @@ -46,7 +46,7 @@ scope - constant.numeric.ts + constant.numeric.decimal.ts, meta.delimiter.decimal.period.ts, constant.numeric.hex.ts, constant.numeric.binary.ts, constant.numeric.octal.ts settings vsclassificationtype diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index cda89efe..c13a703e 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -1,3 +1,4 @@ +# [PackageDev] target_format: plist, ext: tmLanguage # Similar to TypeScript.YAML-tmLanguage except: # - Remove type assertion (cast.expr.tsx) # - Add JSX expression (HTML-like expression). @@ -681,8 +682,33 @@ repository: - include: '#expression' numeric-literal: - name: constant.numeric.tsx - match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|(0(o|O)[0-7]+)|(0(b|B)(0|1)+)|(([0-9]+(\.[0-9]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b + patterns: + - name: constant.numeric.hex.tsx + match: \b(? numeric-literal - match - \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|(0(o|O)[0-7]+)|(0(b|B)(0|1)+)|(([0-9]+(\.[0-9]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b - name - constant.numeric.tsx + patterns + + + match + \b(?<!\$)0(x|X)[0-9a-fA-F]+\b(?!\$) + name + constant.numeric.hex.tsx + + + match + \b(?<!\$)0(b|B)[01]+\b(?!\$) + name + constant.numeric.binary.tsx + + + match + \b(?<!\$)0(o|O)?[0-7]+\b(?!\$) + name + constant.numeric.octal.tsx + + + captures + + 0 + + name + constant.numeric.decimal.tsx + + 1 + + name + meta.delimiter.decimal.period.tsx + + 2 + + name + meta.delimiter.decimal.period.tsx + + 3 + + name + meta.delimiter.decimal.period.tsx + + 4 + + name + meta.delimiter.decimal.period.tsx + + 5 + + name + meta.delimiter.decimal.period.tsx + + 6 + + name + meta.delimiter.decimal.period.tsx + + + match + (?x) +(?<!\$)(?: + (?:\b[0-9]+(\.)[0-9]+[eE][+-]?[0-9]+\b)| # 1.1E+3 + (?:\b[0-9]+(\.)[eE][+-]?[0-9]+\b)| # 1.E+3 + (?:\B(\.)[0-9]+[eE][+-]?[0-9]+\b)| # .1E+3 + (?:\b[0-9]+[eE][+-]?[0-9]+\b)| # 1E+3 + (?:\b[0-9]+(\.)[0-9]+\b)| # 1.1 + (?:\b[0-9]+(\.)\B)| # 1. + (?:\B(\.)[0-9]+\b)| # .1 + (?:\b[0-9]+\b(?!\.)) # 1 +)(?!\$) + + object-body diff --git a/TypeScriptReact.tmTheme b/TypeScriptReact.tmTheme index 25fc7c16..dba13a74 100644 --- a/TypeScriptReact.tmTheme +++ b/TypeScriptReact.tmTheme @@ -46,7 +46,7 @@ scope - constant.numeric.tsx + constant.numeric.decimal.tsx, meta.delimiter.decimal.period.tsx, constant.numeric.hex.tsx, constant.numeric.binary.tsx, constant.numeric.octal.tsx settings vsclassificationtype diff --git a/tests/baselines/Abstracts.baseline.txt b/tests/baselines/Abstracts.baseline.txt index 4ba9b3d0..802d8227 100644 --- a/tests/baselines/Abstracts.baseline.txt +++ b/tests/baselines/Abstracts.baseline.txt @@ -72,7 +72,7 @@ cow.makeSound(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt index 526772d7..3161483e 100644 --- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -253,11 +253,11 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.decimal.ts ^^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.decimal.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ @@ -726,7 +726,7 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts constant.numeric.ts + source.ts meta.function.ts meta.decl.block.ts constant.numeric.decimal.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ @@ -1081,11 +1081,11 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.decimal.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.decimal.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ @@ -1550,7 +1550,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ diff --git a/tests/baselines/Issue110.baseline.txt b/tests/baselines/Issue110.baseline.txt index 65913c67..2ed65ad9 100644 --- a/tests/baselines/Issue110.baseline.txt +++ b/tests/baselines/Issue110.baseline.txt @@ -35,7 +35,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.hex.ts ^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts >let number2 = 14e15 @@ -50,7 +50,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number3 = 10.42e41.5 ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -62,8 +62,16 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts - ^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts >let number4 = 4 @@ -78,7 +86,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number5 = 51.4 ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -90,8 +98,12 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts - ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number6 = 12.4E10.2 ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -103,8 +115,16 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts - ^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number7 = 14.6e+10 ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -116,8 +136,12 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts - ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number8 = 12E4 ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -130,7 +154,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number9 = 10e10 ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -143,7 +167,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number10 = 14e14.5 ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -155,8 +179,12 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts - ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number11 = 12E-10 ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -169,7 +197,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number12 = 13.4e-14.2 ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -181,8 +209,16 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts - ^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number13 = 14.12 ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -194,8 +230,12 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts - ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number14 = 10.2E+4 ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -207,8 +247,12 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts - ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number6 = 5.00567789e+2 ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -220,8 +264,12 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts - ^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts + ^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let i = 1, j = 1e3 ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -234,7 +282,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ source.ts meta.var.expr.ts ^ @@ -244,7 +292,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts > ^ source.ts diff --git a/tests/baselines/Issue110.txt b/tests/baselines/Issue110.txt index e6708781..c5253754 100644 --- a/tests/baselines/Issue110.txt +++ b/tests/baselines/Issue110.txt @@ -25,54 +25,54 @@ let i = ^^1, j = ^^1e3 >let number1 = 0x100 ^^^^^ - [1, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [1, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.hex.ts >let number2 = 14e15 ^^^^^ - [2, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [2, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number3 = 10.42e41.5 - ^^^^^^^^^^ - [3, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + [3, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number4 = 4 ^ - [4, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [4, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number5 = 51.4 - ^^^^ - [5, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + [5, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number6 = 12.4E10.2 - ^^^^^^^^^ - [6, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + [6, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number7 = 14.6e+10 - ^^^^^^^^ - [7, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + [7, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number8 = 12E4 ^^^^ - [8, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [8, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number9 = 10e10 ^^^^^ - [9, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [9, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number10 = 14e14.5 - ^^^^^^^ - [10, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^^^^ + [10, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number11 = 12E-10 ^^^^^^ - [11, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [11, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number12 = 13.4e-14.2 - ^^^^^^^^^^ - [12, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + [12, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number13 = 14.12 - ^^^^^ - [13, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + [13, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number14 = 10.2E+4 - ^^^^^^^ - [14, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^^ + [14, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let number6 = 5.00567789e+2 - ^^^^^^^^^^^^^ - [15, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + ^ + [15, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >let i = 1, j = 1e3 ^ - [16, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [16, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^^ - [16, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [16, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts > >/* > diff --git a/tests/baselines/Issue262.baseline.txt b/tests/baselines/Issue262.baseline.txt index 40bf8164..4e0f61cd 100644 --- a/tests/baselines/Issue262.baseline.txt +++ b/tests/baselines/Issue262.baseline.txt @@ -23,7 +23,7 @@ for (^^let a = 1; a ^^< 10; a++) { ^ source.ts ^ - source.ts constant.numeric.ts + source.ts constant.numeric.decimal.ts ^^^^ source.ts ^ @@ -31,7 +31,7 @@ for (^^let a = 1; a ^^< 10; a++) { ^ source.ts ^^ - source.ts constant.numeric.ts + source.ts constant.numeric.decimal.ts ^^^ source.ts ^^ @@ -60,7 +60,7 @@ for (^^let a = 1; a ^^< 10; a++) { ^ source.ts meta.block.ts ^ - source.ts meta.block.ts constant.numeric.ts + source.ts meta.block.ts constant.numeric.decimal.ts ^^^^ source.ts meta.block.ts ^ diff --git a/tests/baselines/Issue28.baseline.txt b/tests/baselines/Issue28.baseline.txt index 32f7588c..8cdcd613 100644 --- a/tests/baselines/Issue28.baseline.txt +++ b/tests/baselines/Issue28.baseline.txt @@ -37,7 +37,7 @@ var w = ^^0O767; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ source.ts >var y = 0x123; @@ -52,7 +52,7 @@ var w = ^^0O767; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.hex.ts ^^ source.ts >var z = 0b10101; @@ -67,7 +67,7 @@ var w = ^^0O767; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.binary.ts ^^ source.ts >var z = 0B00000; @@ -82,7 +82,7 @@ var w = ^^0O767; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.binary.ts ^^ source.ts >var j = 0o474774; @@ -97,7 +97,7 @@ var w = ^^0O767; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.octal.ts ^^ source.ts >var w = 0O767; @@ -112,7 +112,7 @@ var w = ^^0O767; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.octal.ts ^^ source.ts > diff --git a/tests/baselines/Issue28.txt b/tests/baselines/Issue28.txt index f05e448f..50963cff 100644 --- a/tests/baselines/Issue28.txt +++ b/tests/baselines/Issue28.txt @@ -17,22 +17,22 @@ var w = ^^0O767; > >var x = 123; ^^^ - [4, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [4, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts >var y = 0x123; ^^^^^ - [5, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [5, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.hex.ts >var z = 0b10101; ^^^^^^^ - [6, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [6, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.binary.ts >var z = 0B00000; ^^^^^^^ - [7, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [7, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.binary.ts >var j = 0o474774; ^^^^^^^^ - [8, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [8, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.octal.ts >var w = 0O767; ^^^^^ - [9, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [9, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.octal.ts > ^ [10, 1]: source.ts \ No newline at end of file diff --git a/tests/baselines/Issue288.baseline.txt b/tests/baselines/Issue288.baseline.txt index 7e05545a..5673981b 100644 --- a/tests/baselines/Issue288.baseline.txt +++ b/tests/baselines/Issue288.baseline.txt @@ -139,7 +139,7 @@ return^^Name+=1; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ source.ts >functionName=1; @@ -148,7 +148,7 @@ return^^Name+=1; ^ source.ts keyword.operator.comparison.ts ^ - source.ts constant.numeric.ts + source.ts constant.numeric.decimal.ts ^^ source.ts > @@ -168,7 +168,7 @@ return^^Name+=1; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ source.ts > @@ -217,7 +217,7 @@ return^^Name+=1; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ source.ts >returnName+=1; @@ -228,7 +228,7 @@ return^^Name+=1; ^ source.ts keyword.operator.comparison.ts ^ - source.ts constant.numeric.ts + source.ts constant.numeric.decimal.ts ^^ source.ts > diff --git a/tests/baselines/Issue335.baseline.txt b/tests/baselines/Issue335.baseline.txt index c12cd896..3e07625d 100644 --- a/tests/baselines/Issue335.baseline.txt +++ b/tests/baselines/Issue335.baseline.txt @@ -96,7 +96,7 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > } @@ -182,7 +182,7 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts > } ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts @@ -264,7 +264,7 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts > switch (d.default) { ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts @@ -288,7 +288,7 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts > case 2: @@ -299,7 +299,7 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts > default: @@ -402,7 +402,7 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts > switch (d.default) { ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts @@ -426,7 +426,7 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts > case 2: @@ -437,7 +437,7 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts > default: diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index 923df450..8f301296 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -299,7 +299,7 @@ var j: I = {} ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ @@ -316,7 +316,7 @@ var j: I = {} ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ @@ -470,11 +470,11 @@ var j: I = {} ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts ^^ diff --git a/tests/baselines/Issue5.baseline.txt b/tests/baselines/Issue5.baseline.txt index 9c971e10..151a454b 100644 --- a/tests/baselines/Issue5.baseline.txt +++ b/tests/baselines/Issue5.baseline.txt @@ -265,7 +265,7 @@ let new_string = ^^"^^Changes End here^^" ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/Issue90.baseline.txt b/tests/baselines/Issue90.baseline.txt index 29ff1b42..9c3048c7 100644 --- a/tests/baselines/Issue90.baseline.txt +++ b/tests/baselines/Issue90.baseline.txt @@ -21,7 +21,7 @@ original file ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ source.ts > var b = 1; @@ -38,7 +38,7 @@ original file ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ source.ts > var c = a ^ b; diff --git a/tests/baselines/Issue90.txt b/tests/baselines/Issue90.txt index 91b98ff2..d50b3f7c 100644 --- a/tests/baselines/Issue90.txt +++ b/tests/baselines/Issue90.txt @@ -16,7 +16,7 @@ original file ^ [2, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts ^ - [2, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + [2, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts > var c = a ^ b; ^ [3, 1]: source.ts meta.var.expr.ts diff --git a/tests/baselines/Issue96.baseline.txt b/tests/baselines/Issue96.baseline.txt index dfb4675d..30b35978 100644 --- a/tests/baselines/Issue96.baseline.txt +++ b/tests/baselines/Issue96.baseline.txt @@ -56,7 +56,7 @@ const^^able^^ += " Royal, I say!"; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ source.ts >constenum += 10; @@ -69,7 +69,7 @@ const^^able^^ += " Royal, I say!"; ^ source.ts ^^ - source.ts constant.numeric.ts + source.ts constant.numeric.decimal.ts ^^ source.ts >const enum E { } diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index f0194c55..7fb2ccf8 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -671,7 +671,7 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.brace.paren.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx constant.numeric.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx constant.numeric.decimal.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.brace.paren.tsx ^ diff --git a/tests/baselines/awaitColoring.baseline.txt b/tests/baselines/awaitColoring.baseline.txt index 5dfb0e0c..699f0524 100644 --- a/tests/baselines/awaitColoring.baseline.txt +++ b/tests/baselines/awaitColoring.baseline.txt @@ -10,13 +10,13 @@ original file ^ source.ts ^ - source.ts constant.numeric.ts + source.ts constant.numeric.decimal.ts ^^^ source.ts >awaiting 1; ^^^^^^^^^ source.ts ^ - source.ts constant.numeric.ts + source.ts constant.numeric.decimal.ts ^^ source.ts \ No newline at end of file diff --git a/tests/baselines/javascript.baseline.txt b/tests/baselines/javascript.baseline.txt index ab782845..e0dcc7c1 100644 --- a/tests/baselines/javascript.baseline.txt +++ b/tests/baselines/javascript.baseline.txt @@ -33,7 +33,7 @@ x ^^instanceof y; ^ source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.ts + source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^^ diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index 9fca48e2..a989207c 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -35,7 +35,7 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts ^^ @@ -65,7 +65,7 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts constant.numeric.decimal.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts ^ @@ -219,6 +219,6 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ source.ts \ No newline at end of file diff --git a/tests/baselines/numeric.baseline.txt b/tests/baselines/numeric.baseline.txt new file mode 100644 index 00000000..f6700004 --- /dev/null +++ b/tests/baselines/numeric.baseline.txt @@ -0,0 +1,198 @@ +original file +----------------------------------- +var a = 0xA; +var b = 0b1; +var c = 0o7; +var d = 1.1E+3; +var e = 1.E+3; +var f = .1E+3; +var g = 1E+3; +var h = 1.1; +var i = 1.; +var j = .1; +var k = 1; +----------------------------------- + +>var a = 0xA; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.hex.ts + ^^^ + source.ts +>var b = 0b1; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.binary.ts + ^^^ + source.ts +>var c = 0o7; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.octal.ts + ^^^ + source.ts +>var d = 1.1E+3; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts +>var e = 1.E+3; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts +>var f = .1E+3; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts +>var g = 1E+3; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts +>var h = 1.1; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts +>var i = 1.; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts + ^^^ + source.ts +>var j = .1; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts +>var k = 1; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/numeric.txt b/tests/baselines/numeric.txt new file mode 100644 index 00000000..6942a3ad --- /dev/null +++ b/tests/baselines/numeric.txt @@ -0,0 +1,26 @@ +original file +----------------------------------- +var a = 0xA; +var b = 0b1; +var c = 0o7; +var d = 1.1E+3; +var e = 1.E+3; +var f = .1E+3; +var g = 1E+3; +var h = 1.1; +var i = 1.; +var j = .1; +var k = 1; +----------------------------------- + +>var a = 0xA; +>var b = 0b1; +>var c = 0o7; +>var d = 1.1E+3; +>var e = 1.E+3; +>var f = .1E+3; +>var g = 1E+3; +>var h = 1.1; +>var i = 1.; +>var j = .1; +>var k = 1; \ No newline at end of file diff --git a/tests/cases/numeric.ts b/tests/cases/numeric.ts new file mode 100644 index 00000000..38776e22 --- /dev/null +++ b/tests/cases/numeric.ts @@ -0,0 +1,11 @@ +var a = 0xA; +var b = 0b1; +var c = 0o7; +var d = 1.1E+3; +var e = 1.E+3; +var f = .1E+3; +var g = 1E+3; +var h = 1.1; +var i = 1.; +var j = .1; +var k = 1; \ No newline at end of file From b4a9b2dc75d241683732889fb7677f48711cbe78 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 11 Aug 2016 15:38:31 -0700 Subject: [PATCH 08/77] Generate the marker file only if there are any markers in the file --- tests/baselines/docComments.txt | 20 -------------------- tests/baselines/numeric.txt | 26 -------------------------- tests/build.ts | 9 +++++++-- 3 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 tests/baselines/docComments.txt delete mode 100644 tests/baselines/numeric.txt diff --git a/tests/baselines/docComments.txt b/tests/baselines/docComments.txt deleted file mode 100644 index 541de5d5..00000000 --- a/tests/baselines/docComments.txt +++ /dev/null @@ -1,20 +0,0 @@ -original file ------------------------------------ -/** - * This function takes two parameters - * @param {string} param1 Some string param. - * @param {number} param2 Some number param. - * some other contents - */ -function foo(param1: string, param2: number) { -} ------------------------------------ - ->/** -> * This function takes two parameters -> * @param {string} param1 Some string param. -> * @param {number} param2 Some number param. -> * some other contents -> */ ->function foo(param1: string, param2: number) { ->} \ No newline at end of file diff --git a/tests/baselines/numeric.txt b/tests/baselines/numeric.txt deleted file mode 100644 index 6942a3ad..00000000 --- a/tests/baselines/numeric.txt +++ /dev/null @@ -1,26 +0,0 @@ -original file ------------------------------------ -var a = 0xA; -var b = 0b1; -var c = 0o7; -var d = 1.1E+3; -var e = 1.E+3; -var f = .1E+3; -var g = 1E+3; -var h = 1.1; -var i = 1.; -var j = .1; -var k = 1; ------------------------------------ - ->var a = 0xA; ->var b = 0b1; ->var c = 0o7; ->var d = 1.1E+3; ->var e = 1.E+3; ->var f = .1E+3; ->var g = 1E+3; ->var h = 1.1; ->var i = 1.; ->var j = .1; ->var k = 1; \ No newline at end of file diff --git a/tests/build.ts b/tests/build.ts index a284256b..914f8ef2 100644 --- a/tests/build.ts +++ b/tests/build.ts @@ -35,9 +35,11 @@ function getScopesAtMarkers(text: string, grammar: vt.IGrammar): string { let oriLines = text.split('\n'); let ruleStack:vt.StackElement[] = undefined; let outputLines: string[] = []; + let markers = 0; for (let i in oriLines) { let oriLine = oriLines[i]; let markerLocations = getMarkerLocations(oriLine); + markers += markerLocations.length; let line = oriLine.split(marker).join(''); let lineTokens = grammar.tokenizeLine(line, ruleStack); ruleStack = lineTokens.ruleStack; @@ -52,7 +54,7 @@ function getScopesAtMarkers(text: string, grammar: vt.IGrammar): string { } } - return getInputFile(oriLines) + outputLines.join('\n'); + return markers ? (getInputFile(oriLines) + outputLines.join('\n')) : null; } function writeTokenLine(token: vt.IToken, preTextForToken: string, postTextForToken: string, outputLines: string[]) { @@ -97,7 +99,10 @@ for (var fileName of fs.readdirSync('cases')) { fs.mkdirSync('generated'); } let outputFileName = path.join('./generated', parsedFileName.name + '.txt'); - fs.writeFile(outputFileName, getScopesAtMarkers(text, grammar), "utf8"); + let scopesFileText = getScopesAtMarkers(text, grammar); + if (scopesFileText) { + fs.writeFile(outputFileName, getScopesAtMarkers(text, grammar), "utf8"); + } let outputBaselineName = path.join('./generated', parsedFileName.name + '.baseline.txt'); fs.writeFile(outputBaselineName, baselineWholeFile(text, grammar), "utf8"); From 9c71cac8453e6c50db61331efa23cd138e09eec2 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 11 Aug 2016 15:38:31 -0700 Subject: [PATCH 09/77] Constants - true, false, null, undefined, nan, infinity --- TypeScript.YAML-tmLanguage | 23 +++- TypeScript.tmLanguage | 49 +++++-- TypeScript.tmTheme | 6 +- TypeScriptReact.YAML-tmLanguage | 23 +++- TypeScriptReact.tmLanguage | 49 +++++-- TypeScriptReact.tmTheme | 6 +- tests/baselines/Issue124.baseline.txt | 14 +- tests/baselines/Issue124.txt | 14 +- tests/baselines/constants.baseline.txt | 120 ++++++++++++++++++ tests/baselines/pr48_noSemiColon.baseline.txt | 2 +- tests/cases/constants.ts | 7 + 11 files changed, 264 insertions(+), 49 deletions(-) create mode 100644 tests/baselines/constants.baseline.txt create mode 100644 tests/cases/constants.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index a5130ef0..6c8953a2 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -677,6 +677,7 @@ repository: - include: '#boolean-literal' - include: '#null-literal' - include: '#undefined-literal' + - include: '#numericConstant-literal' - include: '#array-literal' - include: '#this-literal' @@ -721,20 +722,30 @@ repository: '6': {name: meta.delimiter.decimal.period.ts} boolean-literal: - name: constant.language.boolean.ts - match: \b(false|true)\b + patterns: + - name: constant.language.boolean.true.ts + match: \btrue\b + - name: constant.language.boolean.false.ts + match: \bfalse\b null-literal: name: constant.language.null.ts - match: \b(null)\b + match: \bnull\b this-literal: name: constant.language.this.ts - match: \b(this)\b + match: \bthis\b undefined-literal: - name: constant.language.ts - match: \b(undefined)\b + name: constant.language.undefined.ts + match: \bundefined\b + + numericConstant-literal: + patterns: + - name: constant.language.nan.ts + match: \bNaN\b + - name: constant.language.infinity.ts + match: \bInfinity\b access-modifier: name: storage.modifier.ts diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index d98bdd7d..3e026e17 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -115,10 +115,21 @@ boolean-literal - match - \b(false|true)\b - name - constant.language.boolean.ts + patterns + + + match + \btrue\b + name + constant.language.boolean.true.ts + + + match + \bfalse\b + name + constant.language.boolean.false.ts + + case-clause @@ -861,6 +872,10 @@ include #undefined-literal + + include + #numericConstant-literal + include #array-literal @@ -1038,7 +1053,7 @@ null-literal match - \b(null)\b + \bnull\b name constant.language.null.ts @@ -1118,6 +1133,24 @@ + numericConstant-literal + + patterns + + + match + \bNaN\b + name + constant.language.nan.ts + + + match + \bInfinity\b + name + constant.language.infinity.ts + + + object-body begin @@ -1696,7 +1729,7 @@ this-literal match - \b(this)\b + \bthis\b name constant.language.this.ts @@ -2034,9 +2067,9 @@ undefined-literal match - \b(undefined)\b + \bundefined\b name - constant.language.ts + constant.language.undefined.ts var-expr diff --git a/TypeScript.tmTheme b/TypeScript.tmTheme index 39db0f87..adcf8f90 100644 --- a/TypeScript.tmTheme +++ b/TypeScript.tmTheme @@ -26,7 +26,7 @@ scope - support.type.ts, constant.language.boolean.ts, constant.language.null.ts, constant.language.this.ts + support.type.ts, constant.language.boolean.true.ts, constant.language.boolean.false.ts, constant.language.null.ts, constant.language.this.ts settings vsclassificationtype @@ -46,7 +46,7 @@ scope - constant.numeric.decimal.ts, meta.delimiter.decimal.period.ts, constant.numeric.hex.ts, constant.numeric.binary.ts, constant.numeric.octal.ts + constant.numeric.decimal.ts, meta.delimiter.decimal.period.ts, constant.numeric.hex.ts, constant.numeric.binary.ts, constant.numeric.octal.ts, constant.language.nan.ts, constant.language.infinity.ts settings vsclassificationtype @@ -142,7 +142,7 @@ scope - constant.language.ts + constant.language.undefined.ts settings vsclassificationtype diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index c13a703e..9726c85e 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -667,6 +667,7 @@ repository: - include: '#boolean-literal' - include: '#null-literal' - include: '#undefined-literal' + - include: '#numericConstant-literal' - include: '#array-literal' - include: '#this-literal' @@ -711,20 +712,30 @@ repository: '6': {name: meta.delimiter.decimal.period.tsx} boolean-literal: - name: constant.language.boolean.tsx - match: \b(false|true)\b + patterns: + - name: constant.language.boolean.true.tsx + match: \btrue\b + - name: constant.language.boolean.false.tsx + match: \bfalse\b null-literal: name: constant.language.null.tsx - match: \b(null)\b + match: \bnull\b this-literal: name: constant.language.this.tsx - match: \b(this)\b + match: \bthis\b undefined-literal: - name: constant.language.tsx - match: \b(undefined)\b + name: constant.language.undefined.tsx + match: \bundefined\b + + numericConstant-literal: + patterns: + - name: constant.language.nan.tsx + match: \bNaN\b + - name: constant.language.infinity.tsx + match: \bInfinity\b access-modifier: name: storage.modifier.tsx diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index ca76c8e4..d9aa6ad2 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -115,10 +115,21 @@ boolean-literal - match - \b(false|true)\b - name - constant.language.boolean.tsx + patterns + + + match + \btrue\b + name + constant.language.boolean.true.tsx + + + match + \bfalse\b + name + constant.language.boolean.false.tsx + + case-clause @@ -1227,6 +1238,10 @@ include #undefined-literal + + include + #numericConstant-literal + include #array-literal @@ -1404,7 +1419,7 @@ null-literal match - \b(null)\b + \bnull\b name constant.language.null.tsx @@ -1484,6 +1499,24 @@ + numericConstant-literal + + patterns + + + match + \bNaN\b + name + constant.language.nan.tsx + + + match + \bInfinity\b + name + constant.language.infinity.tsx + + + object-body begin @@ -2062,7 +2095,7 @@ this-literal match - \b(this)\b + \bthis\b name constant.language.this.tsx @@ -2400,9 +2433,9 @@ undefined-literal match - \b(undefined)\b + \bundefined\b name - constant.language.tsx + constant.language.undefined.tsx var-expr diff --git a/TypeScriptReact.tmTheme b/TypeScriptReact.tmTheme index dba13a74..a24755c3 100644 --- a/TypeScriptReact.tmTheme +++ b/TypeScriptReact.tmTheme @@ -26,7 +26,7 @@ scope - support.type.tsx, constant.language.boolean.tsx, constant.language.null.tsx, constant.language.this.tsx + support.type.tsx, constant.language.boolean.true.tsx, constant.language.boolean.false.tsx, constant.language.null.tsx, constant.language.this.tsx settings vsclassificationtype @@ -46,7 +46,7 @@ scope - constant.numeric.decimal.tsx, meta.delimiter.decimal.period.tsx, constant.numeric.hex.tsx, constant.numeric.binary.tsx, constant.numeric.octal.tsx + constant.numeric.decimal.tsx, meta.delimiter.decimal.period.tsx, constant.numeric.hex.tsx, constant.numeric.binary.tsx, constant.numeric.octal.tsx, constant.language.nan.tsx, constant.language.infinity.tsx settings vsclassificationtype @@ -209,7 +209,7 @@ scope - constant.language.tsx + constant.language.undefined.tsx settings vsclassificationtype diff --git a/tests/baselines/Issue124.baseline.txt b/tests/baselines/Issue124.baseline.txt index 7936e0b7..2ada42d9 100644 --- a/tests/baselines/Issue124.baseline.txt +++ b/tests/baselines/Issue124.baseline.txt @@ -45,7 +45,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -53,7 +53,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -61,7 +61,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts ^^^^ source.ts >let b = true ? true : `this is ${} highlighted` @@ -76,7 +76,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -84,7 +84,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -115,7 +115,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -197,7 +197,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts ^^ source.ts > diff --git a/tests/baselines/Issue124.txt b/tests/baselines/Issue124.txt index a84781de..2bba6581 100644 --- a/tests/baselines/Issue124.txt +++ b/tests/baselines/Issue124.txt @@ -25,16 +25,16 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; > >let a = true ? true : true; ^^^^ - [6, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + [6, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts ^^^^ - [6, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + [6, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts ^^^^ - [6, 23]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + [6, 23]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts >let b = true ? true : `this is ${} highlighted` ^^^^ - [7, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + [7, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts ^^^^ - [7, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + [7, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts ^ [7, 23]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts ^^^^^^^^ @@ -43,7 +43,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; [7, 32]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts >let c = true ? `hello` : `this ${DEPENDENCY_SEPARATOR}${moduleName} is highlighted`; ^^^^ - [8, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + [8, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts ^ [8, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts ^^^^^ @@ -63,7 +63,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ [10, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts ^^^^ - [10, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.ts + [10, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts > >var debArch = arch === 'x64' ? 'amd64' : 'i386'; ^^^^^^^ diff --git a/tests/baselines/constants.baseline.txt b/tests/baselines/constants.baseline.txt new file mode 100644 index 00000000..0b1276d0 --- /dev/null +++ b/tests/baselines/constants.baseline.txt @@ -0,0 +1,120 @@ +original file +----------------------------------- +var x = true; +var y = false; +var a = undefined; +var b = NaN; +var c = +Infinity; +var d = -Infinity; +var e = Infinity; +----------------------------------- + +>var x = true; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts + ^^^ + source.ts +>var y = false; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.false.ts + ^^^ + source.ts +>var a = undefined; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.undefined.ts + ^^^ + source.ts +>var b = NaN; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.nan.ts + ^^^ + source.ts +>var c = +Infinity; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.infinity.ts + ^^^ + source.ts +>var d = -Infinity; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.infinity.ts + ^^^ + source.ts +>var e = Infinity; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.infinity.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index 96f97780..8a77e467 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -234,7 +234,7 @@ class Test { ^ source.ts meta.function.ts meta.decl.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts constant.language.boolean.ts + source.ts meta.function.ts meta.decl.block.ts constant.language.boolean.false.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts >} diff --git a/tests/cases/constants.ts b/tests/cases/constants.ts new file mode 100644 index 00000000..11983a96 --- /dev/null +++ b/tests/cases/constants.ts @@ -0,0 +1,7 @@ +var x = true; +var y = false; +var a = undefined; +var b = NaN; +var c = +Infinity; +var d = -Infinity; +var e = Infinity; \ No newline at end of file From 1de155d405edfd485264721dd2b482a20be3929b Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 11 Aug 2016 15:38:31 -0700 Subject: [PATCH 10/77] Strings --- TypeScript.YAML-tmLanguage | 46 ++--- TypeScript.tmLanguage | 91 ++++++---- TypeScript.tmTheme | 4 +- TypeScriptReact.YAML-tmLanguage | 46 ++--- TypeScriptReact.tmLanguage | 91 ++++++---- TypeScriptReact.tmTheme | 4 +- tests/baselines/Abstracts.baseline.txt | 12 +- ...owFunctionInsideTypeAssertion.baseline.txt | 12 +- tests/baselines/Comments.baseline.txt | 78 ++++---- .../FunctionMethodOverloads.baseline.txt | 16 +- .../FunctionMethodReturnTypes.baseline.txt | 88 ++++----- tests/baselines/Issue124.baseline.txt | 62 +++---- tests/baselines/Issue124.txt | 20 +-- tests/baselines/Issue149.baseline.txt | 8 +- tests/baselines/Issue191.baseline.txt | 24 +-- tests/baselines/Issue191.txt | 8 +- tests/baselines/Issue200.baseline.txt | 6 +- tests/baselines/Issue200.txt | 2 +- tests/baselines/Issue208.baseline.txt | 36 ++-- tests/baselines/Issue208.txt | 4 +- tests/baselines/Issue288.baseline.txt | 12 +- tests/baselines/Issue37.baseline.txt | 18 +- tests/baselines/Issue37.txt | 2 +- tests/baselines/Issue5.baseline.txt | 170 +++++++++--------- tests/baselines/Issue5.txt | 78 ++++---- tests/baselines/Issue96.baseline.txt | 12 +- ...SyntacticallyIncorrectStrings.baseline.txt | 12 +- .../SyntacticallyIncorrectStrings.txt | 4 +- tests/baselines/TsxSamples.baseline.txt | 56 +++--- tests/baselines/TsxSamples.txt | 4 +- .../multipleVariableDeclaration.baseline.txt | 24 +-- .../baselines/namespaceAndModule.baseline.txt | 6 +- 32 files changed, 563 insertions(+), 493 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 6c8953a2..7d53cf63 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -571,16 +571,26 @@ repository: - include: '#expression' qstring-double: - name: string.double.ts + name: string.quoted.double.ts begin: '"' - end: '"|(?:[^\\\n]$)' + beginCaptures: + '0': { name: punctuation.definition.string.begin.ts } + end: '(")|((?:[^\\\n])$)' + endCaptures: + '1': { name: punctuation.definition.string.end.ts } + '2': { name: invalid.illegal.newline.ts } patterns: - include: '#string-character-escape' qstring-single: - name: string.single.ts + name: string.quoted.single.ts begin: "'" - end: \'|(?:[^\\\n]$) + beginCaptures: + '0': { name: punctuation.definition.string.begin.ts } + end: (\')|((?:[^\\\n])$) + endCaptures: + '1': { name: punctuation.definition.string.end.ts } + '2': { name: invalid.illegal.newline.ts } patterns: - include: '#string-character-escape' @@ -601,36 +611,30 @@ repository: - include: '#qstring-double' template: - name: meta.template.ts - begin: '`' + name: string.template.ts + begin: '(?:\b([a-zA-Z_$][a-zA-Z_$0-9]*)\b)?(`)' beginCaptures: - '0': { name: string.template.ts} + '1': { name: entity.name.function.tagged-template.ts } + '2': { name: punctuation.definition.string.template.begin.ts } end: '`' endCaptures: - '0': { name: string.template.ts} + '0': { name: punctuation.definition.string.template.end.ts} patterns: - include: '#template-substitution-element' - - include: '#template-string-contents' - - template-string-contents: - name: string.template.ts - begin: '.*?' - end: (?=(\$\{|`)) - patterns: - - include: '#string-character-escape' + - include: '#string-character-escape' string-character-escape: - name: constant.character.escape - match: \\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$) + name: constant.character.escape.ts + match: \\(x\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$) template-substitution-element: - name: template.element.ts + name: meta.template.expression.ts begin: \$\{ beginCaptures: - '0': {name: keyword.others.ts} + '0': { name: punctuation.definition.template-expression.begin.ts } end: \} endCaptures: - '0': {name: keyword.others.ts} + '0': { name: punctuation.definition.template-expression.end.ts } patterns: - include: '#expression' diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 3e026e17..3308567f 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -1438,10 +1438,31 @@ begin " + beginCaptures + + 0 + + name + punctuation.definition.string.begin.ts + + end - "|(?:[^\\\n]$) + (")|((?:[^\\\n])$) + endCaptures + + 1 + + name + punctuation.definition.string.end.ts + + 2 + + name + invalid.illegal.newline.ts + + name - string.double.ts + string.quoted.double.ts patterns @@ -1454,10 +1475,31 @@ begin ' + beginCaptures + + 0 + + name + punctuation.definition.string.begin.ts + + end - \'|(?:[^\\\n]$) + (\')|((?:[^\\\n])$) + endCaptures + + 1 + + name + punctuation.definition.string.end.ts + + 2 + + name + invalid.illegal.newline.ts + + name - string.single.ts + string.quoted.single.ts patterns @@ -1546,9 +1588,9 @@ string-character-escape match - \\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$) + \\(x\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$) name - constant.character.escape + constant.character.escape.ts switch-block @@ -1613,13 +1655,18 @@ template begin - ` + (?:\b([a-zA-Z_$][a-zA-Z_$0-9]*)\b)?(`) beginCaptures - 0 + 1 name - string.template.ts + entity.name.function.tagged-template.ts + + 2 + + name + punctuation.definition.string.template.begin.ts end @@ -1629,33 +1676,17 @@ 0 name - string.template.ts + punctuation.definition.string.template.end.ts name - meta.template.ts + string.template.ts patterns include #template-substitution-element - - include - #template-string-contents - - - - template-string-contents - - begin - .*? - end - (?=(\$\{|`)) - name - string.template.ts - patterns - include #string-character-escape @@ -1671,7 +1702,7 @@ 0 name - keyword.others.ts + punctuation.definition.template-expression.begin.ts end @@ -1681,11 +1712,11 @@ 0 name - keyword.others.ts + punctuation.definition.template-expression.end.ts name - template.element.ts + meta.template.expression.ts patterns diff --git a/TypeScript.tmTheme b/TypeScript.tmTheme index adcf8f90..e933a8f3 100644 --- a/TypeScript.tmTheme +++ b/TypeScript.tmTheme @@ -36,7 +36,7 @@ scope - string.double.ts, string.single.ts, string.template.ts, string.regex.ts, constant.character.escape, constant.character.class.ts + string.quoted.double.ts, string.quoted.single.ts, punctuation.definition.string.begin.ts, punctuation.definition.string.end.ts, string.template.ts, punctuation.definition.template-expression.begin.ts, punctuation.definition.template-expression.end.ts, string.regex.ts, constant.character.escape.ts, constant.character.class.ts settings vsclassificationtype @@ -133,7 +133,7 @@ scope - entity.name.function.ts, variable.parameter.ts, meta.object.name.ts, meta.type.name.ts + entity.name.function.ts, entity.name.function.tagged-template.ts, meta.template.expression.ts, variable.parameter.ts, meta.object.name.ts, meta.type.name.ts settings vsclassificationtype diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 9726c85e..bd60d09a 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -561,16 +561,26 @@ repository: - include: '#expression' qstring-double: - name: string.double.tsx + name: string.quoted.double.tsx begin: '"' - end: '"|(?:[^\\\n]$)' + beginCaptures: + '0': { name: punctuation.definition.string.begin.tsx } + end: '(")|((?:[^\\\n])$)' + endCaptures: + '1': { name: punctuation.definition.string.end.tsx } + '2': { name: invalid.illegal.newline.tsx } patterns: - include: '#string-character-escape' qstring-single: - name: string.single.tsx + name: string.quoted.single.tsx begin: "'" - end: \'|(?:[^\\\n]$) + beginCaptures: + '0': { name: punctuation.definition.string.begin.tsx } + end: (\')|((?:[^\\\n])$) + endCaptures: + '1': { name: punctuation.definition.string.end.tsx } + '2': { name: invalid.illegal.newline.tsx } patterns: - include: '#string-character-escape' @@ -591,36 +601,30 @@ repository: - include: '#qstring-double' template: - name: meta.template.tsx - begin: '`' + name: string.template.tsx + begin: '(?:\b([a-zA-Z_$][a-zA-Z_$0-9]*)\b)?(`)' beginCaptures: - '0': { name: string.template.tsx} + '1': { name: entity.name.function.tagged-template.tsx } + '2': { name: punctuation.definition.string.template.begin.tsx } end: '`' endCaptures: - '0': { name: string.template.tsx} + '0': { name: punctuation.definition.string.template.end.tsx} patterns: - include: '#template-substitution-element' - - include: '#template-string-contents' - - template-string-contents: - name: string.template.tsx - begin: '.*?' - end: (?=(\$\{|`)) - patterns: - - include: '#string-character-escape' + - include: '#string-character-escape' string-character-escape: - name: constant.character.escape - match: \\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$) + name: constant.character.escape.tsx + match: \\(x\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$) template-substitution-element: - name: template.element.tsx + name: meta.template.expression.tsx begin: \$\{ beginCaptures: - '0': {name: keyword.others.tsx} + '0': { name: punctuation.definition.template-expression.begin.tsx } end: \} endCaptures: - '0': {name: keyword.others.tsx} + '0': { name: punctuation.definition.template-expression.end.tsx } patterns: - include: '#expression' diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index d9aa6ad2..16721bb4 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -1804,10 +1804,31 @@ begin " + beginCaptures + + 0 + + name + punctuation.definition.string.begin.tsx + + end - "|(?:[^\\\n]$) + (")|((?:[^\\\n])$) + endCaptures + + 1 + + name + punctuation.definition.string.end.tsx + + 2 + + name + invalid.illegal.newline.tsx + + name - string.double.tsx + string.quoted.double.tsx patterns @@ -1820,10 +1841,31 @@ begin ' + beginCaptures + + 0 + + name + punctuation.definition.string.begin.tsx + + end - \'|(?:[^\\\n]$) + (\')|((?:[^\\\n])$) + endCaptures + + 1 + + name + punctuation.definition.string.end.tsx + + 2 + + name + invalid.illegal.newline.tsx + + name - string.single.tsx + string.quoted.single.tsx patterns @@ -1912,9 +1954,9 @@ string-character-escape match - \\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$) + \\(x\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$) name - constant.character.escape + constant.character.escape.tsx switch-block @@ -1979,13 +2021,18 @@ template begin - ` + (?:\b([a-zA-Z_$][a-zA-Z_$0-9]*)\b)?(`) beginCaptures - 0 + 1 + + name + entity.name.function.tagged-template.tsx + + 2 name - string.template.tsx + punctuation.definition.string.template.begin.tsx end @@ -1995,33 +2042,17 @@ 0 name - string.template.tsx + punctuation.definition.string.template.end.tsx name - meta.template.tsx + string.template.tsx patterns include #template-substitution-element - - include - #template-string-contents - - - - template-string-contents - - begin - .*? - end - (?=(\$\{|`)) - name - string.template.tsx - patterns - include #string-character-escape @@ -2037,7 +2068,7 @@ 0 name - keyword.others.tsx + punctuation.definition.template-expression.begin.tsx end @@ -2047,11 +2078,11 @@ 0 name - keyword.others.tsx + punctuation.definition.template-expression.end.tsx name - template.element.tsx + meta.template.expression.tsx patterns diff --git a/TypeScriptReact.tmTheme b/TypeScriptReact.tmTheme index a24755c3..db483451 100644 --- a/TypeScriptReact.tmTheme +++ b/TypeScriptReact.tmTheme @@ -36,7 +36,7 @@ scope - string.double.tsx, string.single.tsx, string.template.tsx, string.regex.tsx, constant.character.escape, constant.character.class.tsx + string.quoted.double.tsx, string.quoted.single.tsx, punctuation.definition.string.begin.tsx, punctuation.definition.string.end.tsx, string.template.tsx, punctuation.definition.template-expression.begin.tsx, punctuation.definition.template-expression.end.tsx, string.regex.tsx, constant.character.escape.tsx, constant.character.class.tsx settings vsclassificationtype @@ -200,7 +200,7 @@ scope - entity.name.function.tsx, variable.parameter.tsx, meta.object.name.tsx, meta.type.name.tsx + entity.name.function.tsx, entity.name.function.tagged-template.tsx, meta.template.expression.tsx, variable.parameter.tsx, meta.object.name.tsx, meta.type.name.tsx settings vsclassificationtype diff --git a/tests/baselines/Abstracts.baseline.txt b/tests/baselines/Abstracts.baseline.txt index 802d8227..e3bf4185 100644 --- a/tests/baselines/Abstracts.baseline.txt +++ b/tests/baselines/Abstracts.baseline.txt @@ -151,11 +151,11 @@ cow.makeSound(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -205,11 +205,11 @@ cow.makeSound(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index ca68a2af..cd4d71ea 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -220,11 +220,11 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts ^ @@ -303,11 +303,11 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts string.quoted.double.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts > } diff --git a/tests/baselines/Comments.baseline.txt b/tests/baselines/Comments.baseline.txt index d57b399e..d2f2d098 100644 --- a/tests/baselines/Comments.baseline.txt +++ b/tests/baselines/Comments.baseline.txt @@ -124,11 +124,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts >var x /* comment */: string = "yahoo"; @@ -159,11 +159,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts >var x: /* comment */ string = "yahoo"; @@ -194,11 +194,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts >var x: string /* comment */ = "yahoo"; @@ -229,11 +229,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts >var x: string = /* comment */ "yahoo"; @@ -264,11 +264,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts >var x: string = "yahoo" /* comment */; @@ -291,11 +291,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -326,11 +326,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts ^^ @@ -370,11 +370,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts >var x /* comment */: string = "yahoo" ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -403,11 +403,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts >var x: /* comment */ string = "yahoo" ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -436,11 +436,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts >var x: string /* comment */ = "yahoo" ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -469,11 +469,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts >var x: string = /* comment */ "yahoo" ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -502,11 +502,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts >var x: string = "yahoo" /* comment */ ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -527,11 +527,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ diff --git a/tests/baselines/FunctionMethodOverloads.baseline.txt b/tests/baselines/FunctionMethodOverloads.baseline.txt index 406b88e4..c64550b9 100644 --- a/tests/baselines/FunctionMethodOverloads.baseline.txt +++ b/tests/baselines/FunctionMethodOverloads.baseline.txt @@ -289,9 +289,9 @@ abstract class C { ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts >} @@ -538,9 +538,9 @@ abstract class C { ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts >} @@ -790,9 +790,9 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts > } @@ -1029,9 +1029,9 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts > } diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt index 3161483e..f3572330 100644 --- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -80,9 +80,9 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ @@ -178,9 +178,9 @@ class TestClass { ^ source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -198,9 +198,9 @@ class TestClass { ^ source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -312,9 +312,9 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ @@ -377,9 +377,9 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts ^^ @@ -438,9 +438,9 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts ^^ @@ -505,9 +505,9 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts ^^ @@ -586,9 +586,9 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts ^^ @@ -651,9 +651,9 @@ class TestClass { ^ source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -671,9 +671,9 @@ class TestClass { ^ source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -834,9 +834,9 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ @@ -904,9 +904,9 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ @@ -1008,9 +1008,9 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -1028,9 +1028,9 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -1138,9 +1138,9 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ @@ -1201,9 +1201,9 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts ^^ @@ -1260,9 +1260,9 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts ^^ @@ -1325,9 +1325,9 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts ^^ @@ -1404,9 +1404,9 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts ^^ @@ -1477,9 +1477,9 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -1497,9 +1497,9 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -1654,9 +1654,9 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ diff --git a/tests/baselines/Issue124.baseline.txt b/tests/baselines/Issue124.baseline.txt index 2ada42d9..203ebdb2 100644 --- a/tests/baselines/Issue124.baseline.txt +++ b/tests/baselines/Issue124.baseline.txt @@ -92,17 +92,17 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts ^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts punctuation.definition.string.template.end.ts >let c = true ? `hello` : `this ${DEPENDENCY_SEPARATOR}${moduleName} is highlighted`; ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -123,11 +123,11 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts punctuation.definition.string.template.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -135,25 +135,25 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts ^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts ^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.end.ts ^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts punctuation.definition.string.template.end.ts ^^ source.ts > @@ -183,11 +183,11 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts punctuation.definition.string.template.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts ^ @@ -219,11 +219,11 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -231,11 +231,11 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -243,11 +243,11 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts ^^ source.ts > diff --git a/tests/baselines/Issue124.txt b/tests/baselines/Issue124.txt index 2bba6581..3b4d36a7 100644 --- a/tests/baselines/Issue124.txt +++ b/tests/baselines/Issue124.txt @@ -36,22 +36,22 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^^^^ [7, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts ^ - [7, 23]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + [7, 23]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^^^^ - [7, 24]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + [7, 24]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts ^^ - [7, 32]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts template.element.ts keyword.others.ts + [7, 32]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts meta.template.expression.ts punctuation.definition.template-expression.begin.ts >let c = true ? `hello` : `this ${DEPENDENCY_SEPARATOR}${moduleName} is highlighted`; ^^^^ [8, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts ^ - [8, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + [8, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^ - [8, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + [8, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts ^ - [8, 26]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + [8, 26]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^ - [8, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.template.ts string.template.ts + [8, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts > >var newVar = a ? (b == `hello`) : true; ^^^^^^ @@ -73,15 +73,15 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^^^ [12, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts ^ - [12, 24]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [12, 24]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^ [12, 30]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - [12, 32]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [12, 32]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^ [12, 40]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - [12, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [12, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts > >/* > Comment diff --git a/tests/baselines/Issue149.baseline.txt b/tests/baselines/Issue149.baseline.txt index 1e57bc82..50fbaa7b 100644 --- a/tests/baselines/Issue149.baseline.txt +++ b/tests/baselines/Issue149.baseline.txt @@ -137,9 +137,9 @@ original file ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts meta.function.ts meta.decl.block.ts >} @@ -276,9 +276,9 @@ original file ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.double.ts + source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts meta.function.ts meta.decl.block.ts >} diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index 0d4b3665..11b4728f 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -120,11 +120,11 @@ class Thing<^^T, ^^U> { ^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts ^^ @@ -149,11 +149,11 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts ^^ @@ -286,11 +286,11 @@ class Thing<^^T, ^^U> { ^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts ^^ @@ -315,11 +315,11 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts ^^ diff --git a/tests/baselines/Issue191.txt b/tests/baselines/Issue191.txt index 0a8598cd..d2591000 100644 --- a/tests/baselines/Issue191.txt +++ b/tests/baselines/Issue191.txt @@ -48,14 +48,14 @@ class Thing<^^T, ^^U> { ^^^^^^^^^^^^ [5, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^^^^ - [5, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + [5, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts ^ [5, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [6, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - [6, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + [6, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts ^ [6, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts > }) @@ -92,14 +92,14 @@ class Thing<^^T, ^^U> { ^^^^^^^^^^^^ [15, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^^^^ - [15, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.double.ts + [15, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts ^ [15, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [16, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - [16, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.template.ts string.template.ts + [16, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts ^ [16, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts > }) diff --git a/tests/baselines/Issue200.baseline.txt b/tests/baselines/Issue200.baseline.txt index 673f62c6..8760d47f 100644 --- a/tests/baselines/Issue200.baseline.txt +++ b/tests/baselines/Issue200.baseline.txt @@ -24,11 +24,11 @@ original file ^ source.ts ^ - source.ts string.single.ts + source.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts string.single.ts + source.ts string.quoted.single.ts ^ - source.ts string.single.ts + source.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ source.ts ^ diff --git a/tests/baselines/Issue200.txt b/tests/baselines/Issue200.txt index 2ae3ef19..ad0e384c 100644 --- a/tests/baselines/Issue200.txt +++ b/tests/baselines/Issue200.txt @@ -18,7 +18,7 @@ original file ^^^^^^ [3, 9]: source.ts storage.type.ts ^ - [3, 16]: source.ts string.single.ts + [3, 16]: source.ts string.quoted.single.ts punctuation.definition.string.begin.ts > import alias = lool.clutz.goog.i18n.NumberFormatSymbols_en_TT; ^^^^^^ [4, 3]: source.ts meta.block.ts keyword.control.import.include.ts diff --git a/tests/baselines/Issue208.baseline.txt b/tests/baselines/Issue208.baseline.txt index a57ab972..e18f2b9d 100644 --- a/tests/baselines/Issue208.baseline.txt +++ b/tests/baselines/Issue208.baseline.txt @@ -42,11 +42,11 @@ class MyClass { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts ^^ @@ -77,11 +77,11 @@ class MyClass { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts ^^ @@ -134,11 +134,11 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts ^^ @@ -173,11 +173,11 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts ^^ @@ -215,11 +215,11 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts ^^ @@ -250,11 +250,11 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts ^^ diff --git a/tests/baselines/Issue208.txt b/tests/baselines/Issue208.txt index 159ebe57..c2b6fbce 100644 --- a/tests/baselines/Issue208.txt +++ b/tests/baselines/Issue208.txt @@ -22,7 +22,7 @@ class MyClass { ^^^^^^ [1, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts ^^^^ - [1, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [1, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ [1, 47]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts >var someVar = makeThing('data'); @@ -33,7 +33,7 @@ class MyClass { ^^^^^^ [2, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts ^^^^ - [2, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [2, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ [2, 47]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts > diff --git a/tests/baselines/Issue288.baseline.txt b/tests/baselines/Issue288.baseline.txt index 5673981b..2f24dc8c 100644 --- a/tests/baselines/Issue288.baseline.txt +++ b/tests/baselines/Issue288.baseline.txt @@ -184,11 +184,11 @@ return^^Name+=1; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts >exportName2="hello"; @@ -197,11 +197,11 @@ return^^Name+=1; ^ source.ts keyword.operator.comparison.ts ^ - source.ts string.double.ts + source.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts string.double.ts + source.ts string.quoted.double.ts ^ - source.ts string.double.ts + source.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts > diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index 8f301296..58e0b216 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -96,11 +96,11 @@ var j: I = {} ^ source.ts ^ - source.ts string.double.ts + source.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^ - source.ts string.double.ts + source.ts string.quoted.double.ts ^ - source.ts string.double.ts + source.ts string.quoted.double.ts punctuation.definition.string.end.ts >import { Scale } from "./scale"; ^^^^^^ source.ts keyword.control.import.include.ts @@ -119,11 +119,11 @@ var j: I = {} ^ source.ts ^ - source.ts string.double.ts + source.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^ - source.ts string.double.ts + source.ts string.quoted.double.ts ^ - source.ts string.double.ts + source.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts > @@ -646,11 +646,11 @@ var j: I = {} ^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.single.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.single.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.single.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^ diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt index 13d77ab7..f33652e1 100644 --- a/tests/baselines/Issue37.txt +++ b/tests/baselines/Issue37.txt @@ -214,7 +214,7 @@ var j: I = {} ^^^ [57, 31]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts ^ - [57, 35]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.single.ts + [57, 35]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^^^ [57, 47]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^^^^^ diff --git a/tests/baselines/Issue5.baseline.txt b/tests/baselines/Issue5.baseline.txt index 151a454b..db8da4a1 100644 --- a/tests/baselines/Issue5.baseline.txt +++ b/tests/baselines/Issue5.baseline.txt @@ -49,11 +49,11 @@ let new_string = ^^"^^Changes End here^^" ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts > ^ source.ts @@ -72,26 +72,26 @@ let new_string = ^^"^^Changes End here^^" ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts >this link to github is https://github.com/\ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts >hello\ ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts >World" ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts > ^ source.ts @@ -107,30 +107,30 @@ let new_string = ^^"^^Changes End here^^" ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts >hello world \\\\\ ^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts >let this be ^\ ^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts >a good test ^' ^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts > ^ source.ts @@ -146,61 +146,61 @@ let new_string = ^^"^^Changes End here^^" ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts > name: string.double.ts\ ^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts > begin: \'\"\'\ ^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts > end: \'\"|(?:[^\r\n\\]$)'\ ^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts > patterns:\ ^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts > - include: '#string-character-escape'\ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts > " ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts > ^ source.ts @@ -216,83 +216,83 @@ let new_string = ^^"^^Changes End here^^" ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > name: string.single.ts\ ^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > begin: \"\'\"\ ^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > end: \'|(?:[^\r\n\\]$)\ ^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > endCaptures:\ ^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > '0': {name: string-character-escape }\ ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > patterns:\ ^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > - include: \'#string-character-escape\'\ ^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > ' ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts > ^ source.ts @@ -308,11 +308,11 @@ let new_string = ^^"^^Changes End here^^" ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts > ^ source.ts diff --git a/tests/baselines/Issue5.txt b/tests/baselines/Issue5.txt index ded11646..b0ec61e1 100644 --- a/tests/baselines/Issue5.txt +++ b/tests/baselines/Issue5.txt @@ -39,9 +39,9 @@ let new_string = ^^"^^Changes End here^^" >let new_string = "New Changes" ^ - [1, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [1, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^ - [1, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [1, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts > ^ [2, 1]: source.ts @@ -49,110 +49,110 @@ let new_string = ^^"^^Changes End here^^" >let plain_double_text = "Hello\ >this link to github is https://github.com/\ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - [5, 23]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [5, 23]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts >hello\ ^ - [6, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + [6, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts >World" > >let plain_single_text= 'Try with single bracket\ ^ - [9, 24]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [9, 24]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts >hello world \\\\\ ^^ - [10, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + [10, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts >let this be ^\ >a good test ^' > >let double_quote_issue = " qstring-double:\ ^^^^^^^^^^^^^^^^^ - [14, 28]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [14, 28]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts > name: string.double.ts\ ^^^^^^^^^^^^^^^^^^^^^^^^^^ - [15, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [15, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^ - [15, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [15, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - [15, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + [15, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts > begin: \'\"\'\ ^^^^^^^^^^^ - [16, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [16, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^^ - [16, 12]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + [16, 12]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts > end: \'\"|(?:[^\r\n\\]$)'\ ^^^^^^^^^ - [17, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [17, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^^ - [17, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + [17, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts > patterns:\ ^^^^^^^^^^^^^ - [18, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [18, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - [18, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + [18, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts > - include: '#string-character-escape'\ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - [19, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [19, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - [19, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [19, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - [19, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts constant.character.escape + [19, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts constant.character.escape.ts > " ^ - [20, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [20, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts > ^ [21, 1]: source.ts >let single_quote_issue = 'qstring-single:\ ^^^^^^^^^^^^^^^ - [22, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [22, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - [22, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + [22, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > name: string.single.ts\ ^^^^^^^^^^^^^^^^^^^^^^^^^^ - [23, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [23, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - [23, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + [23, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > begin: \"\'\"\ ^^^^^^^^^^^ - [24, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [24, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts > end: \'|(?:[^\r\n\\]$)\ ^^^^^^^^^ - [25, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [25, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - [25, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + [25, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > endCaptures:\ ^^^^^^^^^^^^^^^^ - [26, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [26, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - [26, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + [26, 17]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > '0': {name: string-character-escape }\ ^^^^^^ - [27, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [27, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - [27, 44]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + [27, 44]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > patterns:\ ^^^^^^^^^^^^^ - [28, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [28, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - [28, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + [28, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > - include: \'#string-character-escape\'\ ^^^^^^^^^^^^^^^ - [29, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [29, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - [29, 44]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts constant.character.escape + [29, 44]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts constant.character.escape.ts > ' ^ - [30, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.single.ts + [30, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts > ^ [31, 1]: source.ts >let new_string = "Changes End here" ^ - [32, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [32, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^^ - [32, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [32, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - [32, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [32, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts > ^ [33, 1]: source.ts diff --git a/tests/baselines/Issue96.baseline.txt b/tests/baselines/Issue96.baseline.txt index 30b35978..8e45639f 100644 --- a/tests/baselines/Issue96.baseline.txt +++ b/tests/baselines/Issue96.baseline.txt @@ -106,11 +106,11 @@ const^^able^^ += " Royal, I say!"; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts >constable += " Royal, I say!"; @@ -123,10 +123,10 @@ const^^able^^ += " Royal, I say!"; ^ source.ts ^ - source.ts string.double.ts + source.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^ - source.ts string.double.ts + source.ts string.quoted.double.ts ^ - source.ts string.double.ts + source.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts \ No newline at end of file diff --git a/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt b/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt index efb3f795..aa946ed7 100644 --- a/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt +++ b/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt @@ -34,11 +34,11 @@ var y ^^"some string 2" ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts string.quoted.double.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts string.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts string.quoted.double.ts punctuation.definition.string.end.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts @@ -55,11 +55,11 @@ var y ^^"some string 2" ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts > ^ source.ts diff --git a/tests/baselines/SyntacticallyIncorrectStrings.txt b/tests/baselines/SyntacticallyIncorrectStrings.txt index 90c41d1e..6e10a264 100644 --- a/tests/baselines/SyntacticallyIncorrectStrings.txt +++ b/tests/baselines/SyntacticallyIncorrectStrings.txt @@ -16,11 +16,11 @@ var y ^^"some string 2" >class SomeClass { > "some string" ^ - [4, 5]: source.ts meta.declaration.object.ts meta.object.body.ts string.double.ts + [4, 5]: source.ts meta.declaration.object.ts meta.object.body.ts string.quoted.double.ts punctuation.definition.string.begin.ts >} > >var y "some string 2" ^ - [7, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + [7, 7]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts > > \ No newline at end of file diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index 7fb2ccf8..f7eca169 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -415,9 +415,9 @@ var e =
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.open.tsx meta.brace.curly.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.open.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.open.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.open.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.open.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx > /> @@ -535,11 +535,11 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx ^ @@ -576,11 +576,11 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx ^ @@ -620,15 +620,15 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx constant.character.escape + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx constant.character.escape.tsx ^^^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx ^^ @@ -657,11 +657,11 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx ^ @@ -681,11 +681,11 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx ^^ @@ -716,11 +716,11 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.brace.square.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx ^ @@ -744,11 +744,11 @@ var e =
^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.brace.square.tsx ^ @@ -789,11 +789,11 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^^^^^^^^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.brace.curly.tsx ^ diff --git a/tests/baselines/TsxSamples.txt b/tests/baselines/TsxSamples.txt index df2475d0..e00110c1 100644 --- a/tests/baselines/TsxSamples.txt +++ b/tests/baselines/TsxSamples.txt @@ -210,7 +210,7 @@ var e =
>// http://facebook.github.io/react/docs/jsx-gotchas.html >var a =
{'First \u00b7 Second'}
^ - [48, 15]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.single.tsx + [48, 15]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx >var b =
{'First ' + String.fromCharCode(183) + ' Second'}
^^^^^^^^^^^^^^^^^^^^ [49, 26]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx @@ -221,7 +221,7 @@ var e =
^^^^^^^ [51, 40]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx ^ - [51, 48]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.single.tsx + [51, 48]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx >var e =
^^^ [52, 37]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx string.quoted.double.tsx diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index a989207c..74dcda2c 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -79,11 +79,11 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts >var a2: string = "test", b2: () => void = () => { console.log("hello"); }, c2: string | number; ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -104,11 +104,11 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts meta.var.expr.ts ^^ @@ -150,11 +150,11 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.paren.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.paren.ts ^^ @@ -202,11 +202,11 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts string.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts >}, other = 10; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts diff --git a/tests/baselines/namespaceAndModule.baseline.txt b/tests/baselines/namespaceAndModule.baseline.txt index eae3650d..30a9e117 100644 --- a/tests/baselines/namespaceAndModule.baseline.txt +++ b/tests/baselines/namespaceAndModule.baseline.txt @@ -73,11 +73,11 @@ declare ^^module "x" {} ^ source.ts ^ - source.ts string.double.ts + source.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts string.double.ts + source.ts string.quoted.double.ts ^ - source.ts string.double.ts + source.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts ^ From 91a4709249124101c3c5ea56a7d2131a36d5740a Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 11 Aug 2016 15:38:31 -0700 Subject: [PATCH 11/77] Regular expressions --- TypeScript.YAML-tmLanguage | 79 ++++++++- TypeScript.tmLanguage | 244 +++++++++++++++++++++++++++- TypeScript.tmTheme | 11 +- TypeScriptReact.YAML-tmLanguage | 79 ++++++++- TypeScriptReact.tmLanguage | 244 +++++++++++++++++++++++++++- TypeScriptReact.tmTheme | 13 +- tests/baselines/regexp.baseline.txt | 96 +++++++++++ tests/cases/regexp.ts | 2 + 8 files changed, 743 insertions(+), 25 deletions(-) create mode 100644 tests/baselines/regexp.baseline.txt create mode 100644 tests/cases/regexp.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 7d53cf63..eee5e3e7 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -596,13 +596,80 @@ repository: regex: name: string.regex.ts - begin: (?<=[=(:,\[]|^|return|&&|\|\||!)\s*(/)(?![/*+{}?]) - end: $|(/)[igm]* - patterns: - - name: constant.character.escape.ts + begin: (?<=[=(:,\[?+!]|^|return|=>|&&|\|\|)\s*(/)(?![/*+{}?])(?=.*/) + beginCaptures: + '1': {name: punctuation.definition.string.begin.ts} + end: (/)([gimuy]*) + endCaptures: + '1': {name: punctuation.definition.string.end.ts} + '2': {name: keyword.other.ts} + patterns: + - include: '#regexp' + + # regexp syntax is taken from https://github.com/atom/language-javascript/ + regexp: + patterns: + - name: keyword.control.anchor.regexp + match: \\[bB]|\^|\$ + - name: keyword.other.back-reference.regexp + match: \\[1-9]\d* + - name: keyword.operator.quantifier.regexp + match: '[?+*]|\{(\d+,\d+|\d+,|,\d+|\d+)\}\??' + - name: keyword.operator.or.regexp + match: \| + - name: meta.group.assertion.regexp + begin: (\()((\?=)|(\?!)) + beginCaptures: + '1': {name: punctuation.definition.group.regexp} + '2': {name: punctuation.definition.group.assertion.regexp} + '3': {name: meta.assertion.look-ahead.regexp} + '4': {name: meta.assertion.negative-look-ahead.regexp} + end: (\)) + endCaptures: + '1': {name: punctuation.definition.group.regexp} + patterns: + - include: '#regexp' + - name: meta.group.regexp + begin: \((\?:)? + beginCaptures: + '0': {name: punctuation.definition.group.regexp} + '1': {name: punctuation.definition.group.capture.regexp} + end: \) + endCaptures: + '0': {name: punctuation.definition.group.regexp} + patterns: + - include: '#regexp' + - name: constant.other.character-class.set.regexp + begin: (\[)(\^)? + beginCaptures: + '1': {name: punctuation.definition.character-class.regexp} + '2': {name: keyword.operator.negation.regexp} + end: (\]) + endCaptures: + '1': {name: punctuation.definition.character-class.regexp} + patterns: + - name: constant.other.character-class.range.regexp + match: (?:.|(\\(?:[0-7]{3}|x\h\h|u\h\h\h\h))|(\\c[A-Z])|(\\.))\-(?:[^\]\\]|(\\(?:[0-7]{3}|x\h\h|u\h\h\h\h))|(\\c[A-Z])|(\\.)) + captures: + '1': {name: constant.character.numeric.regexp} + '2': {name: constant.character.control.regexp} + '3': {name: constant.character.escape.backslash.regexp} + '4': {name: constant.character.numeric.regexp} + '5': {name: constant.character.control.regexp} + '6': {name: constant.character.escape.backslash.regexp} + - include: '#regex-character-class' + - include: '#regex-character-class' + + regex-character-class: + patterns: + - name: constant.other.character-class.regexp + match: \\[wWsSdD]|\. + - name: constant.character.numeric.regexp + match: \\([0-7]{3}|x\h\h|u\h\h\h\h) + - name: constant.character.control.regexp + match: \\c[A-Z] + - name: constant.character.escape.backslash.regexp match: \\. - - name: constant.character.class.ts - match: \[(\\\]|[^\]])*\] string: name: string.ts diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 3308567f..8e21e6fb 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -1511,24 +1511,258 @@ regex begin - (?<=[=(:,\[]|^|return|&&|\|\||!)\s*(/)(?![/*+{}?]) + (?<=[=(:,\[?+!]|^|return|=>|&&|\|\|)\s*(/)(?![/*+{}?])(?=.*/) + beginCaptures + + 1 + + name + punctuation.definition.string.begin.ts + + end - $|(/)[igm]* + (/)([gimuy]*) + endCaptures + + 1 + + name + punctuation.definition.string.end.ts + + 2 + + name + keyword.other.ts + + name string.regex.ts patterns + + include + #regexp + + + + regex-character-class + + patterns + + + match + \\[wWsSdD]|\. + name + constant.other.character-class.regexp + + + match + \\([0-7]{3}|x\h\h|u\h\h\h\h) + name + constant.character.numeric.regexp + + + match + \\c[A-Z] + name + constant.character.control.regexp + match \\. name - constant.character.escape.ts + constant.character.escape.backslash.regexp + + + + regexp + + patterns + + + match + \\[bB]|\^|\$ + name + keyword.control.anchor.regexp + + + match + \\[1-9]\d* + name + keyword.other.back-reference.regexp + + + match + [?+*]|\{(\d+,\d+|\d+,|,\d+|\d+)\}\?? + name + keyword.operator.quantifier.regexp match - \[(\\\]|[^\]])*\] + \| + name + keyword.operator.or.regexp + + + begin + (\()((\?=)|(\?!)) + beginCaptures + + 1 + + name + punctuation.definition.group.regexp + + 2 + + name + punctuation.definition.group.assertion.regexp + + 3 + + name + meta.assertion.look-ahead.regexp + + 4 + + name + meta.assertion.negative-look-ahead.regexp + + + end + (\)) + endCaptures + + 1 + + name + punctuation.definition.group.regexp + + name - constant.character.class.ts + meta.group.assertion.regexp + patterns + + + include + #regexp + + + + + begin + \((\?:)? + beginCaptures + + 0 + + name + punctuation.definition.group.regexp + + 1 + + name + punctuation.definition.group.capture.regexp + + + end + \) + endCaptures + + 0 + + name + punctuation.definition.group.regexp + + + name + meta.group.regexp + patterns + + + include + #regexp + + + + + begin + (\[)(\^)? + beginCaptures + + 1 + + name + punctuation.definition.character-class.regexp + + 2 + + name + keyword.operator.negation.regexp + + + end + (\]) + endCaptures + + 1 + + name + punctuation.definition.character-class.regexp + + + name + constant.other.character-class.set.regexp + patterns + + + captures + + 1 + + name + constant.character.numeric.regexp + + 2 + + name + constant.character.control.regexp + + 3 + + name + constant.character.escape.backslash.regexp + + 4 + + name + constant.character.numeric.regexp + + 5 + + name + constant.character.control.regexp + + 6 + + name + constant.character.escape.backslash.regexp + + + match + (?:.|(\\(?:[0-7]{3}|x\h\h|u\h\h\h\h))|(\\c[A-Z])|(\\.))\-(?:[^\]\\]|(\\(?:[0-7]{3}|x\h\h|u\h\h\h\h))|(\\c[A-Z])|(\\.)) + name + constant.other.character-class.range.regexp + + + include + #regex-character-class + + + + + include + #regex-character-class diff --git a/TypeScript.tmTheme b/TypeScript.tmTheme index e933a8f3..5a4fa680 100644 --- a/TypeScript.tmTheme +++ b/TypeScript.tmTheme @@ -36,13 +36,22 @@ scope - string.quoted.double.ts, string.quoted.single.ts, punctuation.definition.string.begin.ts, punctuation.definition.string.end.ts, string.template.ts, punctuation.definition.template-expression.begin.ts, punctuation.definition.template-expression.end.ts, string.regex.ts, constant.character.escape.ts, constant.character.class.ts + string.quoted.double.ts, string.quoted.single.ts, punctuation.definition.string.begin.ts, punctuation.definition.string.end.ts, string.template.ts, punctuation.definition.template-expression.begin.ts, punctuation.definition.template-expression.end.ts, constant.character.escape.ts settings vsclassificationtype string + + scope + string.regex.ts, keyword.control.anchor.regexp, keyword.other.back-reference.regexp, keyword.operator.quantifier.regexp, keyword.operator.or.regexp, keyword.operator.negation.regexp + settings + + vsclassificationtype + string + + scope diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index bd60d09a..a9ef1e9e 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -586,13 +586,80 @@ repository: regex: name: string.regex.tsx - begin: (?<=[=(:,\[]|^|return|&&|\|\||!)\s*(/)(?![/*+{}?]) - end: $|(/)[igm]* - patterns: - - name: constant.character.escape.tsx + begin: (?<=[=(:,\[?+!]|^|return|=>|&&|\|\|)\s*(/)(?![/*+{}?])(?=.*/) + beginCaptures: + '1': {name: punctuation.definition.string.begin.tsx} + end: (/)([gimuy]*) + endCaptures: + '1': {name: punctuation.definition.string.end.tsx} + '2': {name: keyword.other.tsx} + patterns: + - include: '#regexp' + + # regexp syntax is taken from https://github.com/atom/language-javascript/ + regexp: + patterns: + - name: keyword.control.anchor.regexp + match: \\[bB]|\^|\$ + - name: keyword.other.back-reference.regexp + match: \\[1-9]\d* + - name: keyword.operator.quantifier.regexp + match: '[?+*]|\{(\d+,\d+|\d+,|,\d+|\d+)\}\??' + - name: keyword.operator.or.regexp + match: \| + - name: meta.group.assertion.regexp + begin: (\()((\?=)|(\?!)) + beginCaptures: + '1': {name: punctuation.definition.group.regexp} + '2': {name: punctuation.definition.group.assertion.regexp} + '3': {name: meta.assertion.look-ahead.regexp} + '4': {name: meta.assertion.negative-look-ahead.regexp} + end: (\)) + endCaptures: + '1': {name: punctuation.definition.group.regexp} + patterns: + - include: '#regexp' + - name: meta.group.regexp + begin: \((\?:)? + beginCaptures: + '0': {name: punctuation.definition.group.regexp} + '1': {name: punctuation.definition.group.capture.regexp} + end: \) + endCaptures: + '0': {name: punctuation.definition.group.regexp} + patterns: + - include: '#regexp' + - name: constant.other.character-class.set.regexp + begin: (\[)(\^)? + beginCaptures: + '1': {name: punctuation.definition.character-class.regexp} + '2': {name: keyword.operator.negation.regexp} + end: (\]) + endCaptures: + '1': {name: punctuation.definition.character-class.regexp} + patterns: + - name: constant.other.character-class.range.regexp + match: (?:.|(\\(?:[0-7]{3}|x\h\h|u\h\h\h\h))|(\\c[A-Z])|(\\.))\-(?:[^\]\\]|(\\(?:[0-7]{3}|x\h\h|u\h\h\h\h))|(\\c[A-Z])|(\\.)) + captures: + '1': {name: constant.character.numeric.regexp} + '2': {name: constant.character.control.regexp} + '3': {name: constant.character.escape.backslash.regexp} + '4': {name: constant.character.numeric.regexp} + '5': {name: constant.character.control.regexp} + '6': {name: constant.character.escape.backslash.regexp} + - include: '#regex-character-class' + - include: '#regex-character-class' + + regex-character-class: + patterns: + - name: constant.other.character-class.regexp + match: \\[wWsSdD]|\. + - name: constant.character.numeric.regexp + match: \\([0-7]{3}|x\h\h|u\h\h\h\h) + - name: constant.character.control.regexp + match: \\c[A-Z] + - name: constant.character.escape.backslash.regexp match: \\. - - name: constant.character.class.tsx - match: \[(\\\]|[^\]])*\] string: name: string.tsx diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 16721bb4..4d97efe7 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -1877,24 +1877,258 @@ regex begin - (?<=[=(:,\[]|^|return|&&|\|\||!)\s*(/)(?![/*+{}?]) + (?<=[=(:,\[?+!]|^|return|=>|&&|\|\|)\s*(/)(?![/*+{}?])(?=.*/) + beginCaptures + + 1 + + name + punctuation.definition.string.begin.tsx + + end - $|(/)[igm]* + (/)([gimuy]*) + endCaptures + + 1 + + name + punctuation.definition.string.end.tsx + + 2 + + name + keyword.other.tsx + + name string.regex.tsx patterns + + include + #regexp + + + + regex-character-class + + patterns + + + match + \\[wWsSdD]|\. + name + constant.other.character-class.regexp + + + match + \\([0-7]{3}|x\h\h|u\h\h\h\h) + name + constant.character.numeric.regexp + + + match + \\c[A-Z] + name + constant.character.control.regexp + match \\. name - constant.character.escape.tsx + constant.character.escape.backslash.regexp + + + + regexp + + patterns + + + match + \\[bB]|\^|\$ + name + keyword.control.anchor.regexp + + + match + \\[1-9]\d* + name + keyword.other.back-reference.regexp + + + match + [?+*]|\{(\d+,\d+|\d+,|,\d+|\d+)\}\?? + name + keyword.operator.quantifier.regexp match - \[(\\\]|[^\]])*\] + \| + name + keyword.operator.or.regexp + + + begin + (\()((\?=)|(\?!)) + beginCaptures + + 1 + + name + punctuation.definition.group.regexp + + 2 + + name + punctuation.definition.group.assertion.regexp + + 3 + + name + meta.assertion.look-ahead.regexp + + 4 + + name + meta.assertion.negative-look-ahead.regexp + + + end + (\)) + endCaptures + + 1 + + name + punctuation.definition.group.regexp + + name - constant.character.class.tsx + meta.group.assertion.regexp + patterns + + + include + #regexp + + + + + begin + \((\?:)? + beginCaptures + + 0 + + name + punctuation.definition.group.regexp + + 1 + + name + punctuation.definition.group.capture.regexp + + + end + \) + endCaptures + + 0 + + name + punctuation.definition.group.regexp + + + name + meta.group.regexp + patterns + + + include + #regexp + + + + + begin + (\[)(\^)? + beginCaptures + + 1 + + name + punctuation.definition.character-class.regexp + + 2 + + name + keyword.operator.negation.regexp + + + end + (\]) + endCaptures + + 1 + + name + punctuation.definition.character-class.regexp + + + name + constant.other.character-class.set.regexp + patterns + + + captures + + 1 + + name + constant.character.numeric.regexp + + 2 + + name + constant.character.control.regexp + + 3 + + name + constant.character.escape.backslash.regexp + + 4 + + name + constant.character.numeric.regexp + + 5 + + name + constant.character.control.regexp + + 6 + + name + constant.character.escape.backslash.regexp + + + match + (?:.|(\\(?:[0-7]{3}|x\h\h|u\h\h\h\h))|(\\c[A-Z])|(\\.))\-(?:[^\]\\]|(\\(?:[0-7]{3}|x\h\h|u\h\h\h\h))|(\\c[A-Z])|(\\.)) + name + constant.other.character-class.range.regexp + + + include + #regex-character-class + + + + + include + #regex-character-class diff --git a/TypeScriptReact.tmTheme b/TypeScriptReact.tmTheme index db483451..2f16d18e 100644 --- a/TypeScriptReact.tmTheme +++ b/TypeScriptReact.tmTheme @@ -36,14 +36,23 @@ scope - string.quoted.double.tsx, string.quoted.single.tsx, punctuation.definition.string.begin.tsx, punctuation.definition.string.end.tsx, string.template.tsx, punctuation.definition.template-expression.begin.tsx, punctuation.definition.template-expression.end.tsx, string.regex.tsx, constant.character.escape.tsx, constant.character.class.tsx + string.quoted.double.tsx, string.quoted.single.tsx, punctuation.definition.string.begin.tsx, punctuation.definition.string.end.tsx, string.template.tsx, punctuation.definition.template-expression.begin.tsx, punctuation.definition.template-expression.end.tsx, constant.character.escape.tsx settings vsclassificationtype string - + + scope + string.regex.tsx, keyword.control.anchor.regexp, keyword.other.back-reference.regexp, keyword.operator.quantifier.regexp, keyword.operator.or.regexp, keyword.operator.negation.regexp + settings + + vsclassificationtype + string + + + scope constant.numeric.decimal.tsx, meta.delimiter.decimal.period.tsx, constant.numeric.hex.tsx, constant.numeric.binary.tsx, constant.numeric.octal.tsx, constant.language.nan.tsx, constant.language.infinity.tsx diff --git a/tests/baselines/regexp.baseline.txt b/tests/baselines/regexp.baseline.txt new file mode 100644 index 00000000..4a5f3d29 --- /dev/null +++ b/tests/baselines/regexp.baseline.txt @@ -0,0 +1,96 @@ +original file +----------------------------------- +var a = /(?:([a-zA-Z_$][\w$])*)/i; +var x = /\s*\b(async\s+)?function\b/g; +----------------------------------- + +>var a = /(?:([a-zA-Z_$][\w$])*)/i; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts punctuation.definition.string.begin.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp punctuation.definition.group.regexp + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp punctuation.definition.group.regexp punctuation.definition.group.capture.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp meta.group.regexp punctuation.definition.group.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp meta.group.regexp constant.other.character-class.set.regexp punctuation.definition.character-class.regexp + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp meta.group.regexp constant.other.character-class.set.regexp constant.other.character-class.range.regexp + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp meta.group.regexp constant.other.character-class.set.regexp constant.other.character-class.range.regexp + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp meta.group.regexp constant.other.character-class.set.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp meta.group.regexp constant.other.character-class.set.regexp punctuation.definition.character-class.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp meta.group.regexp constant.other.character-class.set.regexp punctuation.definition.character-class.regexp + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp meta.group.regexp constant.other.character-class.set.regexp constant.other.character-class.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp meta.group.regexp constant.other.character-class.set.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp meta.group.regexp constant.other.character-class.set.regexp punctuation.definition.character-class.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp meta.group.regexp punctuation.definition.group.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp keyword.operator.quantifier.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp punctuation.definition.group.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts punctuation.definition.string.end.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts keyword.other.ts + ^^^ + source.ts +>var x = /\s*\b(async\s+)?function\b/g; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts punctuation.definition.string.begin.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts constant.other.character-class.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts keyword.operator.quantifier.regexp + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts keyword.control.anchor.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp punctuation.definition.group.regexp + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp constant.other.character-class.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp keyword.operator.quantifier.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts meta.group.regexp punctuation.definition.group.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts keyword.operator.quantifier.regexp + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts keyword.control.anchor.regexp + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts punctuation.definition.string.end.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts keyword.other.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/cases/regexp.ts b/tests/cases/regexp.ts new file mode 100644 index 00000000..abbccf97 --- /dev/null +++ b/tests/cases/regexp.ts @@ -0,0 +1,2 @@ +var a = /(?:([a-zA-Z_$][\w$])*)/i; +var x = /\s*\b(async\s+)?function\b/g; \ No newline at end of file From 8c4e4279181bd88c45488e7d28a7b63506cd5402 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 16 Aug 2016 13:07:17 -0700 Subject: [PATCH 12/77] Renaming of scope names to match other grammars Note jsx attribute value is colored as string with this and its a TODO --- TypeScript.YAML-tmLanguage | 223 ++++--- TypeScript.tmLanguage | 424 ++++++++---- TypeScript.tmTheme | 41 +- TypeScriptReact.YAML-tmLanguage | 230 ++++--- TypeScriptReact.tmLanguage | 430 ++++++++---- TypeScriptReact.tmTheme | 82 +-- tests/baselines/Abstracts.baseline.txt | 80 +-- ...owFunctionInsideTypeAssertion.baseline.txt | 104 +-- .../ArrowFunctionInsideTypeAssertion.txt | 16 +- tests/baselines/Comments.baseline.txt | 554 ++++++++-------- .../FunctionMethodOverloads.baseline.txt | 382 +++++------ tests/baselines/FunctionMethodOverloads.txt | 32 +- .../FunctionMethodParameters.baseline.txt | 194 +++--- tests/baselines/FunctionMethodParameters.txt | 4 +- .../FunctionMethodReturnTypes.baseline.txt | 616 +++++++++--------- tests/baselines/FunctionMethodReturnTypes.txt | 78 +-- tests/baselines/Issue110.baseline.txt | 34 +- tests/baselines/Issue124.baseline.txt | 14 +- tests/baselines/Issue124.txt | 6 +- tests/baselines/Issue149.baseline.txt | 94 +-- tests/baselines/Issue149.txt | 26 +- tests/baselines/Issue156.baseline.txt | 22 +- tests/baselines/Issue156.txt | 6 +- tests/baselines/Issue191.baseline.txt | 122 ++-- tests/baselines/Issue191.txt | 28 +- tests/baselines/Issue200.baseline.txt | 12 +- tests/baselines/Issue200.txt | 8 +- tests/baselines/Issue208.baseline.txt | 96 +-- tests/baselines/Issue208.txt | 34 +- tests/baselines/Issue262.baseline.txt | 32 +- tests/baselines/Issue262.txt | 4 +- tests/baselines/Issue28.baseline.txt | 12 +- tests/baselines/Issue288.baseline.txt | 56 +- tests/baselines/Issue288.txt | 12 +- tests/baselines/Issue32.baseline.txt | 48 +- tests/baselines/Issue32.txt | 14 +- tests/baselines/Issue335.baseline.txt | 140 ++-- tests/baselines/Issue335.txt | 20 +- tests/baselines/Issue37.baseline.txt | 194 +++--- tests/baselines/Issue37.txt | 50 +- tests/baselines/Issue44.baseline.txt | 16 +- tests/baselines/Issue44.txt | 10 +- tests/baselines/Issue5.baseline.txt | 12 +- tests/baselines/Issue63.baseline.txt | 96 +-- tests/baselines/Issue63.txt | 48 +- tests/baselines/Issue82.baseline.txt | 26 +- tests/baselines/Issue82.txt | 6 +- tests/baselines/Issue89.baseline.txt | 66 +- tests/baselines/Issue89.txt | 36 +- tests/baselines/Issue90.baseline.txt | 8 +- tests/baselines/Issue90.txt | 6 +- tests/baselines/Issue96.baseline.txt | 28 +- tests/baselines/Issue96.txt | 4 +- .../ParameterProperties.baseline.txt | 36 +- ...SyntacticallyIncorrectStrings.baseline.txt | 8 +- tests/baselines/TsxSamples.baseline.txt | 520 +++++++-------- tests/baselines/TsxSamples.txt | 116 ++-- tests/baselines/awaitColoring.baseline.txt | 2 +- tests/baselines/awaitColoring.txt | 2 +- tests/baselines/constants.baseline.txt | 14 +- tests/baselines/docComments.baseline.txt | 12 +- tests/baselines/javascript.baseline.txt | 18 +- tests/baselines/javascript.txt | 14 +- .../multipleVariableDeclaration.baseline.txt | 70 +- .../baselines/multipleVariableDeclaration.txt | 22 +- .../baselines/namespaceAndModule.baseline.txt | 26 +- tests/baselines/numeric.baseline.txt | 22 +- tests/baselines/pr48_noSemiColon.baseline.txt | 104 +-- tests/baselines/pr48_noSemiColon.txt | 20 +- tests/baselines/regexp.baseline.txt | 4 +- 70 files changed, 3198 insertions(+), 2748 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index eee5e3e7..9aae2db8 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -23,7 +23,7 @@ repository: name: meta.var-single-variable.expr.ts begin: \b([a-zA-Z_$][\w$]*)\s*(=?) beginCaptures: - '1': { name: variable.ts } + '1': { name: variable.other.readwrite.ts } end: (?=$|[;,]) patterns: - include: '#ternary-expression' @@ -58,16 +58,28 @@ repository: - include: '#import-operator' - include: '#expression-operator' - include: '#imply-operator' - - include: '#relational-operator' - - include: '#arithmetic-operator' - - include: '#logic-operator' - - include: '#assignment-operator' + - include: '#operators' - include: '#type-primitive' - include: '#function-call' control-statement: - name: keyword.control.ts - match: (?]|var|type|function|class|interface) patterns: - include: '#type-parameters' - include: '#type' - - name: keyword.operator.comparison.ts + - name: keyword.operator.assignment.ts match: '=\s*' enum-declaration: @@ -95,19 +107,20 @@ repository: match: (?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) captures: '1': { name: storage.modifier.ts} - '2': { name: storage.type.ts } - '3': { name: entity.name.class.ts } + '2': { name: storage.type.enum.ts } + '3': { name: entity.name.type.enum.ts } object-declaration: name: meta.declaration.object.ts - begin: '\b(?:(export)\s+)?\b(?:(abstract)\s+)?\b(? void) type-paren-or-function-type-parameters: name: meta.type.paren.cover.ts - begin: '(?:\b(new)\b)?\s*\(' + begin: '(?:\b(new)\b)?\s*(\()' beginCaptures: - '1': { name: keyword.control.ts } + '1': { name: keyword.control.new.ts } + '2': { name: meta.brace.round.ts } end: '\)' + endCaptures: + '0': { name: meta.brace.round.ts } patterns: - include: '#comment' - include: '#type' - include: '#function-type-parameters' await-modifier: - name: storage.modifier.ts + name: storage.modifier.await.ts match: '\bawait\b' type-operator: @@ -373,7 +389,7 @@ repository: name: meta.type.function.return.ts begin: '=>' beginCaptures: - '0': { name: keyword.operator.ts } + '0': { name: storage.type.function.arrow.ts } end: (?=\s*[,\)\{=;>]|//|$) patterns: - include: '#type' @@ -401,12 +417,12 @@ repository: begin: '([a-zA-Z_$][\w$]*)?(<)' beginCaptures: '1': { name: entity.name.type.ts } - '2': { name: meta.brace.angle.ts } + '2': { name: punctuation.definition.typeparameters.begin.ts } end: '(?=$)|(>)' endCaptures: - '2': { name: meta.brace.angle.ts } + '2': { name: punctuation.definition.typeparameters.end.ts } patterns: - - name: keyword.other.ts + - name: storage.modifier.ts match: '\b(extends)\b' - include: '#comment' - include: '#type' @@ -414,7 +430,7 @@ repository: variable-initializer: begin: (=) beginCaptures: - '1': { name: keyword.operator.comparison.ts } + '1': { name: keyword.operator.assignment.ts } end: (?=$|[,);=]) patterns: - include: '#expression' @@ -438,10 +454,7 @@ repository: - include: '#import-operator' - include: '#expression-operator' - include: '#imply-operator' - - include: '#relational-operator' - - include: '#arithmetic-operator' - - include: '#logic-operator' - - include: '#assignment-operator' + - include: '#operators' - include: '#storage-keyword' - include: '#type-primitive' - include: '#function-call' @@ -452,7 +465,7 @@ repository: name: switch-expression.expr.ts begin: \b(switch)\b\s*\( beginCaptures: - '1': { name: keyword.control.ts } + '1': { name: keyword.control.switch.ts } end: \) patterns: - include: '#expression' @@ -460,6 +473,8 @@ repository: switch-block: name: switch-block.expr.ts begin: '{' + beginCaptures: + '0': { name: punctuation.definition.block.ts } end: (?=\}) patterns: - include: '#expression' @@ -468,7 +483,7 @@ repository: name: case-clause.expr.ts begin: '(? import-operator: - name: keyword.control.import.include.ts - match: \b(import|from)\b - - arithmetic-operator: - name: keyword.operator.arithmetic.ts - match: \*|/|\-\-|\-|\+\+|\+|% - - relational-operator: - name: keyword.operator.comparison.ts - match: ===|!==|==|!=|<=|>=|<>|=|<|> - - assignment-operator: - name: keyword.operator.assignment.ts - match: <<=|>>>=|>>=|\*=|(?>=|>>>=|\|= + - name: keyword.operator.comparison.ts + match: ===|!==|==|!= + - name: keyword.operator.relational.ts + match: <=|>=|<>|=|<|> + - name: keyword.operator.logical.ts + match: \!|&&|\|\| + - name: keyword.operator.bitwise.ts + match: \&|~|\^|\| + - name: keyword.operator.assignment.ts + match: \= + - name: keyword.operator.decrement.ts + match: -- + - name: keyword.operator.increment.ts + match: \+\+ + - name: keyword.operator.arithmetic.ts + match: '%|\*|/|-|\+' storage-keyword: name: storage.type.ts @@ -563,10 +609,10 @@ repository: paren-expression: begin: \( beginCaptures: - '0': {name: meta.brace.paren.ts } + '0': {name: meta.brace.round.ts } end: \) endCaptures: - '0': {name: meta.brace.paren.ts } + '0': {name: meta.brace.round.ts } patterns: - include: '#expression' @@ -751,6 +797,7 @@ repository: - include: '#numericConstant-literal' - include: '#array-literal' - include: '#this-literal' + - include: '#super-literal' array-literal: name: meta.array.literal.ts @@ -804,9 +851,13 @@ repository: match: \bnull\b this-literal: - name: constant.language.this.ts + name: variable.language.this.ts match: \bthis\b + super-literal: + name: variable.language.super.ts + match: \bsuper\b + undefined-literal: name: constant.language.undefined.ts match: \bundefined\b @@ -823,7 +874,7 @@ repository: match: \b(public|protected|private)\b static-modifier: - name: keyword.other.ts + name: storage.modifier.ts match: \b(static)\b property-accessor: diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 8e21e6fb..f810655f 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -24,13 +24,6 @@ name storage.modifier.ts - arithmetic-operator - - match - \*|/|\-\-|\-|\+\+|\+|% - name - keyword.operator.arithmetic.ts - array-literal begin @@ -63,19 +56,12 @@ - assignment-operator - - match - <<=|>>>=|>>=|\*=|(?<!\()/=|%=|\+=|\-=|&=|\^= - name - keyword.operator.assignment.ts - await-modifier match \bawait\b name - storage.modifier.ts + storage.modifier.await.ts block @@ -86,7 +72,7 @@ 0 name - meta.brace.curly.ts + punctuation.definition.block.ts end @@ -96,7 +82,7 @@ 0 name - meta.brace.curly.ts + punctuation.definition.block.ts name @@ -140,7 +126,7 @@ 1 name - keyword.control.ts + keyword.control.switch.ts end @@ -267,10 +253,57 @@ control-statement - match - (?<!\.)\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|case|default|yield)\b - name - keyword.control.ts + patterns + + + match + (?<!\.)\b(catch|finally|throw|try)\b + name + keyword.control.trycatch.ts + + + match + (?<!\.)\b(break|continue|do|for|goto|while)\b + name + keyword.control.loop.ts + + + match + (?<!\.)\b(await|return|yield)\b + name + keyword.control.flow.ts + + + match + (?<!\.)\b(case|default|switch)\b + name + keyword.control.switch.ts + + + match + (?<!\.)\b(else|if)\b + name + keyword.control.conditional.ts + + + match + (?<!\.)\b(with)\b + name + keyword.control.with.ts + + + match + (?<!\.)\b(debugger)\b + name + keyword.other.ts + + + match + (?<!\.)\b(declare)\b + name + storage.modifier.ts + + decl-block @@ -281,7 +314,7 @@ 0 name - meta.brace.curly.ts + punctuation.definition.block.ts end @@ -291,7 +324,7 @@ 0 name - meta.brace.curly.ts + punctuation.definition.block.ts name @@ -379,12 +412,12 @@ 2 name - storage.type.ts + storage.type.enum.ts 3 name - entity.name.class.ts + entity.name.type.enum.ts match @@ -464,19 +497,7 @@ include - #relational-operator - - - include - #arithmetic-operator - - - include - #logic-operator - - - include - #assignment-operator + #operators include @@ -502,10 +523,63 @@ expression-operator - match - \b(delete|in|instanceof|new|typeof|as|is|of)\b - name - keyword.others.ts + patterns + + + match + \bdelete\b + name + keyword.operator.delete.ts + + + match + \bin\b + name + keyword.operator.in.ts + + + match + \bof\b + name + keyword.operator.of.ts + + + match + \binstanceof\b + name + keyword.operator.instanceof.ts + + + match + \bnew\b + name + keyword.operator.new.ts + + + match + \btypeof\b + name + keyword.operator.typeof.ts + + + match + \bvoid\b + name + keyword.operator.void.ts + + + match + \bas\b + name + keyword.control.as.ts + + + match + \bis\b + name + keyword.operator.is.ts + + expression-type @@ -555,19 +629,7 @@ include - #relational-operator - - - include - #arithmetic-operator - - - include - #logic-operator - - - include - #assignment-operator + #operators include @@ -588,12 +650,12 @@ 1 name - variable.ts + variable.object.property.ts 2 name - keyword.others.ts + keyword.operator.optional.ts end @@ -617,14 +679,24 @@ name storage.type.ts + 2 + + name + variable.other.readwrite.ts + 3 name - keyword.others.ts + keyword.operator.in.ts + + 4 + + name + keyword.operator.of.ts match - (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(in|of)\b + (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(?:(in)|(of))\b name forin.expr.ts @@ -657,12 +729,12 @@ 1 name - storage.type.ts + keyword.control.export.ts 2 name - storage.modifier.ts + storage.modifier.async.ts 3 @@ -714,7 +786,7 @@ 1 name - storage.type.ts + keyword.control.export.ts 2 @@ -741,7 +813,7 @@ 0 name - meta.brace.round.ts + punctuation.definition.parameters.begin.ts end @@ -751,7 +823,7 @@ 0 name - meta.brace.round.ts + punctuation.definition.parameters.end.ts name @@ -781,14 +853,25 @@ match => name - keyword.operator.ts + storage.type.function.arrow.ts import-operator - match - \b(import|from)\b - name - keyword.control.import.include.ts + patterns + + + match + \bimport\b + name + keyword.control.import.ts + + + match + \bfrom\b + name + keyword.control.from.ts + + indexer-declaration @@ -814,7 +897,7 @@ 2 name - keyword.others.ts + keyword.operator.optional.ts name @@ -884,15 +967,12 @@ include #this-literal + + include + #super-literal + - logic-operator - - match - \!|&&|&|~|\^|\|\||\| - name - keyword.operator.arithmetic.ts - method-declaration begin @@ -912,7 +992,7 @@ 3 name - storage.modifier.ts + storage.modifier.async.ts 4 @@ -922,7 +1002,7 @@ 5 name - keyword.operator.ts + keyword.operator.new.ts 6 @@ -937,7 +1017,7 @@ 8 name - keyword.operator.ts + keyword.operator.optional.ts end @@ -1004,7 +1084,7 @@ 6 name - storage.type.ts + entity.name.function.constructor.ts 7 @@ -1014,7 +1094,7 @@ 8 name - keyword.operator.ts + keyword.operator.optional.ts match @@ -1031,7 +1111,7 @@ 1 name - keyword.others.ts + keyword.operator.new.ts end @@ -1160,7 +1240,7 @@ 0 name - meta.brace.curly.ts + punctuation.definition.block.ts end @@ -1170,7 +1250,7 @@ 0 name - meta.brace.curly.ts + punctuation.definition.block.ts name @@ -1222,13 +1302,13 @@ object-declaration begin - \b(?:(export)\s+)?\b(?:(abstract)\s+)?\b(?<!\.)(class|interface)\b + \b(?:(export)\s+)?\b(?:(abstract)\s+)?\b(?<!\.)(?:(class)|(interface))\b beginCaptures 1 name - storage.type.ts + keyword.control.export.ts 2 @@ -1238,7 +1318,12 @@ 3 name - storage.type.ts + storage.type.class.ts + + 4 + + name + storage.type.interface.ts end @@ -1248,7 +1333,7 @@ 1 name - brace.curly.ts + punctuation.definition.block.ts name @@ -1286,7 +1371,7 @@ 1 name - keyword.other.ts + storage.modifier.ts end @@ -1296,7 +1381,7 @@ 1 name - brace.curly.ts + punctuation.definition.block.ts name @@ -1328,7 +1413,7 @@ 1 name - support.type.ts + entity.other.inherited-class.ts match @@ -1367,6 +1452,72 @@ name meta.object.name.ts + operators + + patterns + + + match + \*=|(?<!\()/=|%=|\+=|\-= + name + keyword.operator.assignment.compound.ts + + + match + \&=|\^=|<<=|>>=|>>>=|\|= + name + keyword.operator.assignment.compound.bitwise.ts + + + match + ===|!==|==|!= + name + keyword.operator.comparison.ts + + + match + <=|>=|<>|=|<|> + name + keyword.operator.relational.ts + + + match + \!|&&|\|\| + name + keyword.operator.logical.ts + + + match + \&|~|\^|\| + name + keyword.operator.bitwise.ts + + + match + \= + name + keyword.operator.assignment.ts + + + match + -- + name + keyword.operator.decrement.ts + + + match + \+\+ + name + keyword.operator.increment.ts + + + match + %|\*|/|-|\+ + name + keyword.operator.arithmetic.ts + + + parameter-name captures @@ -1379,7 +1530,7 @@ 2 name - keyword.others.ts + keyword.operator.spread.ts 3 @@ -1389,7 +1540,7 @@ 4 name - keyword.others.ts + keyword.operator.optional.ts match @@ -1406,7 +1557,7 @@ 0 name - meta.brace.paren.ts + meta.brace.round.ts end @@ -1416,7 +1567,7 @@ 0 name - meta.brace.paren.ts + meta.brace.round.ts patterns @@ -1766,13 +1917,6 @@ - relational-operator - - match - ===|!==|==|!=|<=|>=|<>|=|<|> - name - keyword.operator.comparison.ts - return-type begin @@ -1794,7 +1938,7 @@ match \b(static)\b name - keyword.other.ts + storage.modifier.ts storage-keyword @@ -1826,10 +1970,25 @@ name constant.character.escape.ts + super-literal + + match + \bsuper\b + name + variable.language.super.ts + switch-block begin { + beginCaptures + + 0 + + name + punctuation.definition.block.ts + + end (?=\}) name @@ -1851,7 +2010,7 @@ 1 name - keyword.control.ts + keyword.control.switch.ts end @@ -1872,6 +2031,14 @@ (?=\bswitch\b\s*\() end } + endCaptures + + 0 + + name + punctuation.definition.block.ts + + name switch-statement.expr.ts patterns @@ -1996,7 +2163,7 @@ match \bthis\b name - constant.language.this.ts + variable.language.this.ts type @@ -2075,12 +2242,12 @@ 1 name - keyword.other.ts + storage.type.type.ts 2 name - entity.name.class.ts + entity.name.type.ts end @@ -2101,7 +2268,7 @@ match =\s* name - keyword.operator.comparison.ts + keyword.operator.assignment.ts @@ -2114,7 +2281,7 @@ 0 name - keyword.operator.ts + storage.type.function.arrow.ts end @@ -2153,7 +2320,7 @@ 0 name - meta.brace.curly.ts + punctuation.definition.block.ts end @@ -2163,7 +2330,7 @@ 0 name - meta.brace.curly.ts + punctuation.definition.block.ts name @@ -2213,7 +2380,7 @@ 2 name - meta.brace.angle.ts + punctuation.definition.typeparameters.begin.ts end @@ -2223,7 +2390,7 @@ 2 name - meta.brace.angle.ts + punctuation.definition.typeparameters.end.ts name @@ -2234,7 +2401,7 @@ match \b(extends)\b name - keyword.other.ts + storage.modifier.ts include @@ -2249,17 +2416,30 @@ type-paren-or-function-type-parameters begin - (?:\b(new)\b)?\s*\( + (?:\b(new)\b)?\s*(\() beginCaptures 1 name - keyword.control.ts + keyword.control.new.ts + + 2 + + name + meta.brace.round.ts end \) + endCaptures + + 0 + + name + meta.brace.round.ts + + name meta.type.paren.cover.ts patterns @@ -2285,11 +2465,11 @@ 1 name - support.type.ts + support.type.primitive.ts match - \b(string|number|boolean|symbol|any|void)\b + \b(string|number|boolean|symbol|any|void|never)\b name meta.type.primitive.ts @@ -2373,7 +2553,7 @@ 1 name - variable.ts + variable.other.readwrite.ts end @@ -2413,7 +2593,7 @@ 1 name - keyword.operator.comparison.ts + keyword.operator.assignment.ts end diff --git a/TypeScript.tmTheme b/TypeScript.tmTheme index 5a4fa680..84bfabaa 100644 --- a/TypeScript.tmTheme +++ b/TypeScript.tmTheme @@ -8,7 +8,7 @@ scope - storage.modifier.ts, storage.type.ts, storage.type.function.ts, storage.type.property.ts + storage.modifier, storage.type, keyword.control, keyword.others.ts, keyword.operator.new.ts, settings vsclassificationtype @@ -17,16 +17,7 @@ scope - keyword, keyword.control.ts, keyword.others.ts, keyword.control.import.include.ts - settings - - vsclassificationtype - keyword - - - - scope - support.type.ts, constant.language.boolean.true.ts, constant.language.boolean.false.ts, constant.language.null.ts, constant.language.this.ts + support.type, constant.language, variable.language settings vsclassificationtype @@ -36,7 +27,7 @@ scope - string.quoted.double.ts, string.quoted.single.ts, punctuation.definition.string.begin.ts, punctuation.definition.string.end.ts, string.template.ts, punctuation.definition.template-expression.begin.ts, punctuation.definition.template-expression.end.ts, constant.character.escape.ts + string, punctuation.definition.string, punctuation.definition.template-expression, constant.character.escape.ts settings vsclassificationtype @@ -45,7 +36,7 @@ scope - string.regex.ts, keyword.control.anchor.regexp, keyword.other.back-reference.regexp, keyword.operator.quantifier.regexp, keyword.operator.or.regexp, keyword.operator.negation.regexp + keyword.control.anchor.regexp, keyword.other.back-reference.regexp, keyword.operator.quantifier.regexp, keyword.operator.or.regexp, keyword.operator.negation.regexp settings vsclassificationtype @@ -55,34 +46,34 @@ scope - constant.numeric.decimal.ts, meta.delimiter.decimal.period.ts, constant.numeric.hex.ts, constant.numeric.binary.ts, constant.numeric.octal.ts, constant.language.nan.ts, constant.language.infinity.ts + constant.numeric, meta.delimiter.decimal.period.ts, constant.language.nan.ts, constant.language.infinity.ts settings vsclassificationtype number - + scope - keyword.operator.ts, keyword.operator.arithmetic.ts, keyword.operator.assignment.ts, keyword.operator.comparison.ts + keyword.operator, storage.type.function.arrow.ts settings vsclassificationtype operator - + scope - meta.brace, meta.brace.square.ts, meta.brace.curly.ts, meta.brace.angle.ts, meta.brace.round.ts, meta.brace.square.ts, meta.brace.paren.ts + meta.brace.angle.ts, meta.brace.round.ts, meta.brace.square.ts, punctuation.definition settings vsclassificationtype punctuation - + scope comment, comment.block.ts, comment.line.double-slash.ts, punctuation.definition.comment.ts @@ -129,20 +120,10 @@ class name - - - scope - entity.name.type.ts - settings - - vsclassificationtype - type parameter name - - scope - entity.name.function.ts, entity.name.function.tagged-template.ts, meta.template.expression.ts, variable.parameter.ts, meta.object.name.ts, meta.type.name.ts + entity.name.function, entity.name.type, meta.template.expression.ts, variable, entity.other.inherited-class.ts settings vsclassificationtype diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index a9ef1e9e..3cfd1d95 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -26,7 +26,7 @@ repository: name: meta.var-single-variable.expr.tsx begin: \b([a-zA-Z_$][\w$]*)\s*(=?) beginCaptures: - '1': { name: variable.tsx } + '1': { name: variable.other.readwrite.tsx } end: (?=$|[;,]) patterns: - include: '#ternary-expression' @@ -61,16 +61,28 @@ repository: - include: '#import-operator' - include: '#expression-operator' - include: '#imply-operator' - - include: '#relational-operator' - - include: '#arithmetic-operator' - - include: '#logic-operator' - - include: '#assignment-operator' + - include: '#operators' - include: '#type-primitive' - include: '#function-call' control-statement: - name: keyword.control.tsx - match: (?]|var|type|function|class|interface) patterns: - include: '#type-parameters' - include: '#type' - - name: keyword.operator.comparison.tsx + - name: keyword.operator.assignment.tsx match: '=\s*' enum-declaration: @@ -98,19 +110,20 @@ repository: match: (?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) captures: '1': { name: storage.modifier.tsx} - '2': { name: storage.type.tsx } - '3': { name: entity.name.class.tsx } + '2': { name: storage.type.enum.tsx } + '3': { name: entity.name.type.class.tsx } object-declaration: name: meta.declaration.object.tsx - begin: '\b(?:(export)\s+)?\b(?:(abstract)\s+)?\b(? void) type-paren-or-function-type-parameters: name: meta.type.paren.cover.tsx - begin: '(?:\b(new)\b)?\s*\(' + begin: '(?:\b(new)\b)?\s*(\()' beginCaptures: - '1': { name: keyword.control.tsx } + '1': { name: keyword.control.new.tsx } + '2': { name: meta.brace.round.tsx } end: '\)' + endCaptures: + '0': { name: meta.brace.round.tsx } patterns: - include: '#comment' - include: '#type' - include: '#function-type-parameters' await-modifier: - name: storage.modifier.tsx + name: storage.modifier.await.tsx match: '\bawait\b' type-operator: @@ -376,7 +392,7 @@ repository: name: meta.type.function.return.tsx begin: '=>' beginCaptures: - '0': { name: keyword.operator.tsx } + '0': { name: storage.type.function.arrow.tsx } end: (?=\s*[,\)\{=;>]|//|$) patterns: - include: '#type' @@ -404,12 +420,12 @@ repository: begin: '([a-zA-Z_$][\w$]*)?(<)' beginCaptures: '1': { name: entity.name.type.tsx } - '2': { name: meta.brace.angle.tsx } + '2': { name: punctuation.definition.typeparameters.begin.tsx } end: '(?=$)|(>)' endCaptures: - '2': { name: meta.brace.angle.tsx } + '2': { name: punctuation.definition.typeparameters.end.tsx } patterns: - - name: keyword.other.tsx + - name: storage.modifier.tsx match: '\b(extends)\b' - include: '#comment' - include: '#type' @@ -417,7 +433,7 @@ repository: variable-initializer: begin: (=) beginCaptures: - '1': { name: keyword.operator.comparison.tsx } + '1': { name: keyword.operator.assignment.tsx } end: (?=$|[,);=]) patterns: - include: '#expression' @@ -441,10 +457,7 @@ repository: - include: '#import-operator' - include: '#expression-operator' - include: '#imply-operator' - - include: '#relational-operator' - - include: '#arithmetic-operator' - - include: '#logic-operator' - - include: '#assignment-operator' + - include: '#operators' - include: '#storage-keyword' - include: '#type-primitive' - include: '#function-call' @@ -455,7 +468,7 @@ repository: name: switch-expression.expr.tsx begin: \b(switch)\b\s*\( beginCaptures: - '1': { name: keyword.control.tsx } + '1': { name: keyword.control.switch.tsx } end: \) patterns: - include: '#expression' @@ -463,6 +476,8 @@ repository: switch-block: name: switch-block.expr.tsx begin: '{' + beginCaptures: + '0': { name: punctuation.definition.block.tsx } end: (?=\}) patterns: - include: '#expression' @@ -471,7 +486,7 @@ repository: name: case-clause.expr.tsx begin: '(? import-operator: - name: keyword.control.import.include.tsx - match: \b(import|from)\b - - arithmetic-operator: - name: keyword.operator.arithmetic.tsx - match: \*|/|\-\-|\-|\+\+|\+|% - - relational-operator: - - name: keyword.operator.comparison.tsx - match: ===|!==|==|!=|<=|>=|<>|=|<|> - - assignment-operator: - name: keyword.operator.assignment.tsx - match: <<=|>>>=|>>=|\*=|(?>=|>>>=|\|= + - name: keyword.operator.comparison.tsx + match: ===|!==|==|!= + - name: keyword.operator.relational.tsx + match: <=|>=|<>|=|<|> + - name: keyword.operator.logical.tsx + match: \!|&&|\|\| + - name: keyword.operator.bitwise.tsx + match: \&|~|\^|\| + - name: keyword.operator.assignment.tsx + match: \= + - name: keyword.operator.decrement.tsx + match: -- + - name: keyword.operator.increment.tsx + match: \+\+ + - name: keyword.operator.arithmetic.tsx + match: '%|\*|/|-|\+' storage-keyword: name: storage.type.tsx @@ -553,10 +598,10 @@ repository: paren-expression: begin: \( beginCaptures: - '0': {name: meta.brace.paren.tsx } + '0': {name: meta.brace.round.tsx } end: \) endCaptures: - '0': {name: meta.brace.paren.tsx } + '0': {name: meta.brace.round.tsx } patterns: - include: '#expression' @@ -741,6 +786,7 @@ repository: - include: '#numericConstant-literal' - include: '#array-literal' - include: '#this-literal' + - include: '#super-literal' array-literal: name: meta.array.literal.tsx @@ -794,9 +840,13 @@ repository: match: \bnull\b this-literal: - name: constant.language.this.tsx + name: variable.language.this.tsx match: \bthis\b + super-literal: + name: variable.language.super.tsx + match: \bsuper\b + undefined-literal: name: constant.language.undefined.tsx match: \bundefined\b @@ -813,7 +863,7 @@ repository: match: \b(public|protected|private)\b static-modifier: - name: keyword.other.tsx + name: storage.modifier.tsx match: \b(static)\b property-accessor: @@ -891,7 +941,7 @@ repository: match: \S+ jsx-tag-without-attributes: - name: tag.without-attributes.tsx + name: meta.tag.without-attributes.tsx begin: (<)([_$a-zA-Z][-$\w.]*(?) end: () beginCaptures: @@ -906,7 +956,7 @@ repository: - include: '#jsx-children' jsx-tag-open: - name: tag.open.tsx + name: meta.tag.open.tsx begin: >- (?x) (<) @@ -924,7 +974,7 @@ repository: - include: '#jsx-tag-attributes-illegal' jsx-tag-close: - name: tag.close.tsx + name: meta.tag.close.tsx begin: () beginCaptures: diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 4d97efe7..5850a4fd 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -24,13 +24,6 @@ name storage.modifier.tsx - arithmetic-operator - - match - \*|/|\-\-|\-|\+\+|\+|% - name - keyword.operator.arithmetic.tsx - array-literal begin @@ -63,19 +56,12 @@ - assignment-operator - - match - <<=|>>>=|>>=|\*=|(?<!\()/=|%=|\+=|\-=|&=|\^= - name - keyword.operator.assignment.tsx - await-modifier match \bawait\b name - storage.modifier.tsx + storage.modifier.await.tsx block @@ -86,7 +72,7 @@ 0 name - meta.brace.curly.tsx + punctuation.definition.block.tsx end @@ -96,7 +82,7 @@ 0 name - meta.brace.curly.tsx + punctuation.definition.block.tsx name @@ -140,7 +126,7 @@ 1 name - keyword.control.tsx + keyword.control.switch.tsx end @@ -235,10 +221,57 @@ control-statement - match - (?<!\.)\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|case|default|yield)\b - name - keyword.control.tsx + patterns + + + match + (?<!\.)\b(catch|finally|throw|try)\b + name + keyword.control.trycatch.tsx + + + match + (?<!\.)\b(break|continue|do|for|goto|while)\b + name + keyword.control.loop.tsx + + + match + (?<!\.)\b(await|return|yield)\b + name + keyword.control.flow.tsx + + + match + (?<!\.)\b(case|default|switch)\b + name + keyword.control.switch.tsx + + + match + (?<!\.)\b(else|if)\b + name + keyword.control.conditional.tsx + + + match + (?<!\.)\b(with)\b + name + keyword.control.with.tsx + + + match + (?<!\.)\b(debugger)\b + name + keyword.other.tsx + + + match + (?<!\.)\b(declare)\b + name + storage.modifier.tsx + + decl-block @@ -249,7 +282,7 @@ 0 name - meta.brace.curly.tsx + punctuation.definition.block.tsx end @@ -259,7 +292,7 @@ 0 name - meta.brace.curly.tsx + punctuation.definition.block.tsx name @@ -347,12 +380,12 @@ 2 name - storage.type.tsx + storage.type.enum.tsx 3 name - entity.name.class.tsx + entity.name.type.class.tsx match @@ -432,19 +465,7 @@ include - #relational-operator - - - include - #arithmetic-operator - - - include - #logic-operator - - - include - #assignment-operator + #operators include @@ -470,10 +491,63 @@ expression-operator - match - \b(delete|in|instanceof|new|typeof|as|is|of)\b - name - keyword.others.tsx + patterns + + + match + \bdelete\b + name + keyword.operator.delete.tsx + + + match + \bin\b + name + keyword.operator.in.tsx + + + match + \bof\b + name + keyword.operator.of.tsx + + + match + \binstanceof\b + name + keyword.operator.instanceof.tsx + + + match + \bnew\b + name + keyword.operator.new.tsx + + + match + \btypeof\b + name + keyword.operator.typeof.tsx + + + match + \bvoid\b + name + keyword.operator.void.tsx + + + match + \bas\b + name + keyword.control.as.tsx + + + match + \bis\b + name + keyword.operator.is.tsx + + expression-type @@ -523,19 +597,7 @@ include - #relational-operator - - - include - #arithmetic-operator - - - include - #logic-operator - - - include - #assignment-operator + #operators include @@ -556,12 +618,12 @@ 1 name - variable.tsx + variable.object.property.tsx 2 name - keyword.others.tsx + keyword.operator.optional.tsx end @@ -585,14 +647,24 @@ name storage.type.tsx + 2 + + name + variable.other.readwrite.tsx + 3 name - keyword.others.tsx + keyword.operator.in.tsx + + 4 + + name + keyword.operator.of.tsx match - (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(in|of)\b + (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(?:(in)|(of))\b name forin.expr.tsx @@ -625,12 +697,12 @@ 1 name - storage.type.tsx + keyword.control.export.tsx 2 name - storage.modifier.tsx + storage.modifier.async.tsx 3 @@ -682,7 +754,7 @@ 1 name - storage.type.tsx + keyword.control.export.tsx 2 @@ -709,7 +781,7 @@ 0 name - meta.brace.round.tsx + punctuation.definition.parameters.begin.tsx end @@ -719,7 +791,7 @@ 0 name - meta.brace.round.tsx + punctuation.definition.parameters.end.tsx name @@ -749,14 +821,25 @@ match => name - keyword.operator.tsx + storage.type.function.arrow.tsx import-operator - match - \b(import|from)\b - name - keyword.control.import.include.tsx + patterns + + + match + \bimport\b + name + keyword.control.import.tsx + + + match + \bfrom\b + name + keyword.control.from.tsx + + indexer-declaration @@ -782,7 +865,7 @@ 2 name - keyword.others.tsx + keyword.operator.optional.tsx name @@ -1100,7 +1183,7 @@ name - tag.close.tsx + meta.tag.close.tsx patterns @@ -1147,7 +1230,7 @@ name - tag.open.tsx + meta.tag.open.tsx patterns @@ -1207,7 +1290,7 @@ name - tag.without-attributes.tsx + meta.tag.without-attributes.tsx patterns @@ -1250,15 +1333,12 @@ include #this-literal + + include + #super-literal + - logic-operator - - match - \!|&&|&|~|\^|\|\||\| - name - keyword.operator.arithmetic.tsx - method-declaration begin @@ -1278,7 +1358,7 @@ 3 name - storage.modifier.tsx + storage.modifier.async.tsx 4 @@ -1288,7 +1368,7 @@ 5 name - keyword.operator.tsx + keyword.operator.new.tsx 6 @@ -1303,7 +1383,7 @@ 8 name - keyword.operator.tsx + keyword.operator.optional.tsx end @@ -1370,7 +1450,7 @@ 6 name - storage.type.tsx + entity.name.function.constructor.tsx 7 @@ -1380,7 +1460,7 @@ 8 name - keyword.operator.tsx + keyword.operator.optional.tsx match @@ -1397,7 +1477,7 @@ 1 name - keyword.others.tsx + keyword.operator.new.tsx end @@ -1526,7 +1606,7 @@ 0 name - meta.brace.curly.tsx + punctuation.definition.block.tsx end @@ -1536,7 +1616,7 @@ 0 name - meta.brace.curly.tsx + punctuation.definition.block.tsx name @@ -1588,13 +1668,13 @@ object-declaration begin - \b(?:(export)\s+)?\b(?:(abstract)\s+)?\b(?<!\.)(class|interface)\b + \b(?:(export)\s+)?\b(?:(abstract)\s+)?\b(?<!\.)(?:(class)|(interface))\b beginCaptures 1 name - storage.type.tsx + keyword.control.export.tsx 2 @@ -1604,7 +1684,12 @@ 3 name - storage.type.tsx + storage.type.class.tsx + + 4 + + name + storage.type.interface.tsx end @@ -1614,7 +1699,7 @@ 1 name - brace.curly.tsx + punctuation.definition.block.tsx name @@ -1652,7 +1737,7 @@ 1 name - keyword.other.tsx + storage.modifier.tsx end @@ -1662,7 +1747,7 @@ 1 name - brace.curly.tsx + punctuation.definition.block.tsx name @@ -1694,7 +1779,7 @@ 1 name - support.type.tsx + entity.other.inherited-class.tsx match @@ -1733,6 +1818,72 @@ name meta.object.name.tsx + operators + + patterns + + + match + \*=|(?<!\()/=|%=|\+=|\-= + name + keyword.operator.assignment.compound.tsx + + + match + \&=|\^=|<<=|>>=|>>>=|\|= + name + keyword.operator.assignment.compound.bitwise.tsx + + + match + ===|!==|==|!= + name + keyword.operator.comparison.tsx + + + match + <=|>=|<>|=|<|> + name + keyword.operator.relational.tsx + + + match + \!|&&|\|\| + name + keyword.operator.logical.tsx + + + match + \&|~|\^|\| + name + keyword.operator.bitwise.tsx + + + match + \= + name + keyword.operator.assignment.tsx + + + match + -- + name + keyword.operator.decrement.tsx + + + match + \+\+ + name + keyword.operator.increment.tsx + + + match + %|\*|/|-|\+ + name + keyword.operator.arithmetic.tsx + + + parameter-name captures @@ -1745,7 +1896,7 @@ 2 name - keyword.others.tsx + keyword.operator.spread.tsx 3 @@ -1755,7 +1906,7 @@ 4 name - keyword.others.tsx + keyword.operator.optional.tsx match @@ -1772,7 +1923,7 @@ 0 name - meta.brace.paren.tsx + meta.brace.round.tsx end @@ -1782,7 +1933,7 @@ 0 name - meta.brace.paren.tsx + meta.brace.round.tsx patterns @@ -2132,13 +2283,6 @@ - relational-operator - - match - ===|!==|==|!=|<=|>=|<>|=|<|> - name - keyword.operator.comparison.tsx - return-type begin @@ -2160,7 +2304,7 @@ match \b(static)\b name - keyword.other.tsx + storage.modifier.tsx storage-keyword @@ -2192,10 +2336,25 @@ name constant.character.escape.tsx + super-literal + + match + \bsuper\b + name + variable.language.super.tsx + switch-block begin { + beginCaptures + + 0 + + name + punctuation.definition.block.tsx + + end (?=\}) name @@ -2217,7 +2376,7 @@ 1 name - keyword.control.tsx + keyword.control.switch.tsx end @@ -2238,6 +2397,14 @@ (?=\bswitch\b\s*\() end } + endCaptures + + 0 + + name + punctuation.definition.block.tsx + + name switch-statement.expr.tsx patterns @@ -2362,7 +2529,7 @@ match \bthis\b name - constant.language.this.tsx + variable.language.this.tsx type @@ -2441,12 +2608,12 @@ 1 name - keyword.other.tsx + storage.type.type.tsx 2 name - entity.name.class.tsx + entity.name.type.tsx end @@ -2467,7 +2634,7 @@ match =\s* name - keyword.operator.comparison.tsx + keyword.operator.assignment.tsx @@ -2480,7 +2647,7 @@ 0 name - keyword.operator.tsx + storage.type.function.arrow.tsx end @@ -2519,7 +2686,7 @@ 0 name - meta.brace.curly.tsx + punctuation.definition.block.tsx end @@ -2529,7 +2696,7 @@ 0 name - meta.brace.curly.tsx + punctuation.definition.block.tsx name @@ -2579,7 +2746,7 @@ 2 name - meta.brace.angle.tsx + punctuation.definition.typeparameters.begin.tsx end @@ -2589,7 +2756,7 @@ 2 name - meta.brace.angle.tsx + punctuation.definition.typeparameters.end.tsx name @@ -2600,7 +2767,7 @@ match \b(extends)\b name - keyword.other.tsx + storage.modifier.tsx include @@ -2615,17 +2782,30 @@ type-paren-or-function-type-parameters begin - (?:\b(new)\b)?\s*\( + (?:\b(new)\b)?\s*(\() beginCaptures 1 name - keyword.control.tsx + keyword.control.new.tsx + + 2 + + name + meta.brace.round.tsx end \) + endCaptures + + 0 + + name + meta.brace.round.tsx + + name meta.type.paren.cover.tsx patterns @@ -2651,11 +2831,11 @@ 1 name - support.type.tsx + support.type.primitive.tsx match - \b(string|number|boolean|symbol|any|void)\b + \b(string|number|boolean|symbol|any|void|never)\b name meta.type.primitive.tsx @@ -2739,7 +2919,7 @@ 1 name - variable.tsx + variable.other.readwrite.tsx end @@ -2779,7 +2959,7 @@ 1 name - keyword.operator.comparison.tsx + keyword.operator.assignment.tsx end diff --git a/TypeScriptReact.tmTheme b/TypeScriptReact.tmTheme index 2f16d18e..78b59912 100644 --- a/TypeScriptReact.tmTheme +++ b/TypeScriptReact.tmTheme @@ -8,7 +8,7 @@ scope - storage.modifier.tsx, storage.type.tsx, storage.type.function.tsx, storage.type.property.tsx + storage.modifier, storage.type, keyword.control, keyword.others.tsx, keyword.operator.new.tsx, settings vsclassificationtype @@ -17,16 +17,7 @@ scope - keyword, keyword.control.tsx, keyword.others.tsx, keyword.control.import.include.tsx - settings - - vsclassificationtype - keyword - - - - scope - support.type.tsx, constant.language.boolean.true.tsx, constant.language.boolean.false.tsx, constant.language.null.tsx, constant.language.this.tsx + support.type, constant.language, variable.language settings vsclassificationtype @@ -36,26 +27,26 @@ scope - string.quoted.double.tsx, string.quoted.single.tsx, punctuation.definition.string.begin.tsx, punctuation.definition.string.end.tsx, string.template.tsx, punctuation.definition.template-expression.begin.tsx, punctuation.definition.template-expression.end.tsx, constant.character.escape.tsx + string, punctuation.definition.string, punctuation.definition.template-expression, constant.character.escape.tsx settings vsclassificationtype string - + scope - string.regex.tsx, keyword.control.anchor.regexp, keyword.other.back-reference.regexp, keyword.operator.quantifier.regexp, keyword.operator.or.regexp, keyword.operator.negation.regexp + keyword.control.anchor.regexp, keyword.other.back-reference.regexp, keyword.operator.quantifier.regexp, keyword.operator.or.regexp, keyword.operator.negation.regexp settings vsclassificationtype string - + scope - constant.numeric.decimal.tsx, meta.delimiter.decimal.period.tsx, constant.numeric.hex.tsx, constant.numeric.binary.tsx, constant.numeric.octal.tsx, constant.language.nan.tsx, constant.language.infinity.tsx + constant.numeric, meta.delimiter.decimal.period.tsx, constant.language.nan.tsx, constant.language.infinity.tsx settings vsclassificationtype @@ -65,7 +56,7 @@ scope - keyword.operator.tsx, keyword.operator.arithmetic.tsx, keyword.operator.assignment.tsx, keyword.operator.comparison.tsx + keyword.operator, storage.type.function.arrow.tsx settings vsclassificationtype @@ -75,32 +66,14 @@ scope - meta.brace, meta.brace.square.tsx, meta.brace.curly.tsx, meta.brace.angle.tsx, meta.brace.round.tsx, meta.brace.square.tsx, meta.brace.paren.tsx - settings - - vsclassificationtype - punctuation - - - - scope - punctuation.definition.brace.curly.start.tsx, punctuation.definition.brace.curly.end.tsx - settings - - vsclassificationtype - punctuation - - - - scope - punctuation.definition.tag.begin.tsx, punctuation.definition.tag.end.tsx + meta.brace.angle.tsx, meta.brace.round.tsx, meta.brace.square.tsx, punctuation.definition settings vsclassificationtype punctuation - + scope comment, comment.block.tsx, comment.line.double-slash.tsx, punctuation.definition.comment.tsx @@ -148,16 +121,6 @@ - - scope - entity.name.type.tsx - settings - - vsclassificationtype - type parameter name - - - scope entity.name.tag.tsx @@ -170,7 +133,7 @@ scope - entity.other.attribute-name.tsx, invalid.illegal.attribute.tsx + entity.other.attribute-name.tsx settings vsclassificationtype @@ -178,38 +141,39 @@ - + + scope - string.quoted.double.tsx, string.quoted.single.tsx + meta.jsx.children.tsx, constant.character.entity.tsx, punctuation.definition.entity.tsx, invalid.illegal.bad-ampersand.tsx settings vsclassificationtype - xml literal - attribute value + xml literal - text - + scope - constant.character.entity.tsx, punctuation.definition.entity.tsx, invalid.illegal.bad-ampersand.tsx + invalid.illegal.attribute.tsx, meta.brace.curly.tsx settings vsclassificationtype - xml literal - text + identifier - + scope - entity.name.function.tsx, entity.name.function.tagged-template.tsx, meta.template.expression.tsx, variable.parameter.tsx, meta.object.name.tsx, meta.type.name.tsx + entity.name.function, entity.name.type, meta.template.expression.tsx, variable, entity.other.inherited-class.tsx settings vsclassificationtype diff --git a/tests/baselines/Abstracts.baseline.txt b/tests/baselines/Abstracts.baseline.txt index e3bf4185..ba5dbc4b 100644 --- a/tests/baselines/Abstracts.baseline.txt +++ b/tests/baselines/Abstracts.baseline.txt @@ -24,7 +24,7 @@ cow.makeSound(); ^ source.ts meta.declaration.object.ts ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^^^^ @@ -32,7 +32,7 @@ cow.makeSound(); ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > public age: number; ^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -41,11 +41,11 @@ cow.makeSound(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > public yearsLeft() { return 20 - this.age; } @@ -58,17 +58,17 @@ cow.makeSound(); ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^ @@ -80,11 +80,11 @@ cow.makeSound(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > abstract makeSound(): string; ^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -95,26 +95,26 @@ cow.makeSound(); ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts >class Cow extends Animal { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^ @@ -122,32 +122,32 @@ cow.makeSound(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > makeSound() { return "Moo"; } ^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -159,16 +159,16 @@ cow.makeSound(); ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts >class Cat extends Animal { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^ @@ -176,32 +176,32 @@ cow.makeSound(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > makeSound() { return "Meow"; } ^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -213,10 +213,10 @@ cow.makeSound(); ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts @@ -226,29 +226,29 @@ cow.makeSound(); ^ source.ts meta.var.expr.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ source.ts >cow.makeSound(); ^^^^^^^^^^^^^ source.ts ^ - source.ts meta.brace.paren.ts + source.ts meta.brace.round.ts ^ - source.ts meta.brace.paren.ts + source.ts meta.brace.round.ts ^^ source.ts \ No newline at end of file diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index cd4d71ea..af7e71e9 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -38,13 +38,13 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.var.expr.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts > setTransform: <(domNode: HTMLElement, desiredValue: string) => void>null, ^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts @@ -55,7 +55,7 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts ^^ @@ -69,17 +69,17 @@ function f(x: string | ((value: string) => number)) { ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts ^^^^ @@ -94,30 +94,30 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.brace.round.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.brace.round.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts keyword.operator.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts storage.type.function.arrow.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts > if (domNode.style.display !== desiredValue) { ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts keyword.control.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts keyword.control.conditional.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.round.ts ^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts ^^^ @@ -125,31 +125,31 @@ function f(x: string | ((value: string) => number)) { ^^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.round.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts punctuation.definition.block.ts > domNode.style.display = desiredValue; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts keyword.operator.relational.ts ^^^^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts > } ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts punctuation.definition.block.ts > } ^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts @@ -161,7 +161,7 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -169,50 +169,52 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts - ^^ + ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.name.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > if (typeof x === "string") { ^^^^ source.ts meta.function.ts meta.decl.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.conditional.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.others.ts + source.ts meta.function.ts meta.decl.block.ts keyword.operator.typeof.ts ^^^ source.ts meta.function.ts meta.decl.block.ts ^^^ @@ -226,16 +228,16 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts > return +x ^^^^^^^^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts ^ @@ -246,16 +248,16 @@ function f(x: string | ((value: string) => number)) { ^^^^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts > else { ^^^^ source.ts meta.function.ts meta.decl.block.ts ^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.conditional.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts > let f = <(v: string) => number> x ^^^^^^^^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts @@ -264,7 +266,7 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -272,23 +274,23 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts ^^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.decl.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 ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts ^^ @@ -297,11 +299,11 @@ function f(x: string | ((value: string) => number)) { ^^^^^^^^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts ^^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^ @@ -309,15 +311,15 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts > } ^^^^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt index 8d24d9e7..d41fb7b3 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt @@ -31,7 +31,7 @@ function f(x: string | ((value: string) => number)) { ^ [4, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts ^ - [4, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts + [4, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^^^ [4, 21]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts ^^^^^^^^^^^ @@ -39,11 +39,11 @@ function f(x: string | ((value: string) => number)) { ^^^^^^^^^^^^ [4, 43]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts ^^^^^^ - [4, 57]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + [4, 57]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts ^^ - [4, 65]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts keyword.operator.ts + [4, 65]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts storage.type.function.arrow.ts ^^^^ - [4, 68]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + [4, 68]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^^^^ [4, 73]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts constant.language.null.ts > setDisplay: (domNode: HTMLElement, desiredValue: string) => { @@ -62,15 +62,15 @@ function f(x: string | ((value: string) => number)) { ^ [17, 17]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts ^ - [17, 18]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts + [17, 18]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^ [17, 19]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts ^^^^^^ - [17, 22]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + [17, 22]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts ^^ - [17, 30]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts keyword.operator.ts + [17, 30]: source.ts meta.function.ts meta.decl.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 ^^^^^^ - [17, 33]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + [17, 33]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ [17, 39]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts ^^ diff --git a/tests/baselines/Comments.baseline.txt b/tests/baselines/Comments.baseline.txt index d2f2d098..bd4eb519 100644 --- a/tests/baselines/Comments.baseline.txt +++ b/tests/baselines/Comments.baseline.txt @@ -110,17 +110,17 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -137,7 +137,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -151,11 +151,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -172,7 +172,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -186,11 +186,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -207,13 +207,13 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^ @@ -225,7 +225,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -242,17 +242,17 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -277,17 +277,17 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -312,17 +312,17 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -356,17 +356,17 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -381,7 +381,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -395,11 +395,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -414,7 +414,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -428,11 +428,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -447,13 +447,13 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^ @@ -465,7 +465,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -480,17 +480,17 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -513,17 +513,17 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -551,7 +551,7 @@ var x = new ^^/* comments */ String(); ^ source.ts ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^ @@ -559,28 +559,28 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >interface /**/ i extends i1, i2, i3 {} ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^^ @@ -594,28 +594,28 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >interface i /**/ extends i1, i2, i3 {} ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^ @@ -629,28 +629,28 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >interface i extends /**/ i1, i2, i3 {} ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^ @@ -658,7 +658,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -668,24 +668,24 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >interface i extends i1 /**/, i2, i3 {} ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^ @@ -693,11 +693,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -707,20 +707,20 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >interface i extends i1, /**/ i2, i3 {} ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^ @@ -728,11 +728,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -742,20 +742,20 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >interface i extends i1, i2 /**/, i3 {} ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^ @@ -763,15 +763,15 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -781,16 +781,16 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >interface i extends i1, i2, /**/ i3 {} ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^ @@ -798,15 +798,15 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -816,16 +816,16 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >interface i extends i1, i2, i3 /**/ {} ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^ @@ -833,19 +833,19 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -855,9 +855,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >/**/ interface /**/ i /**/ extends /**/ i1, /**/ i2, /**/ i3 /**/ {} ^^ source.ts comment.block.ts punctuation.definition.comment.ts @@ -866,7 +866,7 @@ var x = new ^^/* comments */ String(); ^ source.ts ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^^ @@ -886,7 +886,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -896,7 +896,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -906,7 +906,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -916,7 +916,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -926,9 +926,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >/**/ interface /**/ i /**/ extends /**/ i1 /**/ , /**/ i2 /**/ , /**/ i3 /**/ {} ^^ source.ts comment.block.ts punctuation.definition.comment.ts @@ -937,7 +937,7 @@ var x = new ^^/* comments */ String(); ^ source.ts ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^^ @@ -957,7 +957,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -967,7 +967,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -983,7 +983,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -999,7 +999,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -1009,9 +1009,9 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts @@ -1021,7 +1021,7 @@ var x = new ^^/* comments */ String(); ^^ source.ts comment.block.ts punctuation.definition.comment.ts ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^ @@ -1029,26 +1029,26 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >class/**/i extends c1,c2,c3{} ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^^ source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -1058,26 +1058,26 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >class i/**/extends c1,c2,c3{} ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^ @@ -1087,26 +1087,26 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >class i extends/**/c1,c2,c3{} ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^ @@ -1114,28 +1114,28 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >class i extends c1/**/,c2,c3{} ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^ @@ -1143,11 +1143,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -1155,18 +1155,18 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >class i extends c1,/**/c2,c3{} ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^ @@ -1174,11 +1174,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -1186,18 +1186,18 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >class i extends c1,c2/**/,c3{} ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^ @@ -1205,15 +1205,15 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -1221,14 +1221,14 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >class i extends c1,c2,/**/c3{} ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^ @@ -1236,15 +1236,15 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -1252,14 +1252,14 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >class i extends c1,c2,c3/**/{} ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^ @@ -1267,34 +1267,34 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >/**/class/**/i/**/extends/**/c1,/**/c2,/**/c3/**/{} ^^ source.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts comment.block.ts punctuation.definition.comment.ts ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^^ source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -1306,13 +1306,13 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -1320,7 +1320,7 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -1328,22 +1328,22 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >/**/class/**/i/**/extends/**/c1/**/,/**/c2/**/,/**/c3/**/{} ^^ source.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts comment.block.ts punctuation.definition.comment.ts ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^^ source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -1355,13 +1355,13 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -1373,7 +1373,7 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -1385,21 +1385,21 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts >interface KeyValuePair/**/ extends Array { 0: K; 1: V; } ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^^^^^^^^^^^^ @@ -1409,7 +1409,7 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts ^^ @@ -1421,13 +1421,13 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts ^ @@ -1443,7 +1443,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1463,16 +1463,16 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >interface KeyValuePair/**/extends Array { 0: K; 1: V; } ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts ^^ @@ -1486,13 +1486,13 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts ^ @@ -1508,7 +1508,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1528,16 +1528,16 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >interface KeyValuePair extends/**/Array { 0: K; 1: V; } ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts ^^ @@ -1549,7 +1549,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -1557,7 +1557,7 @@ var x = new ^^/* comments */ String(); ^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts ^ @@ -1573,7 +1573,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1593,16 +1593,16 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >interface KeyValuePair extends Array/**/ { 0: K; 1: V; } ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts ^^ @@ -1614,17 +1614,17 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts ^ @@ -1640,7 +1640,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1660,16 +1660,16 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >interface KeyValuePair extends Array/**/{ 0: K; 1: V; } ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts ^^ @@ -1681,13 +1681,13 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^^^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts ^ @@ -1705,7 +1705,7 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1725,13 +1725,13 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts >interface G/**/ { ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^ @@ -1741,7 +1741,7 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^^ source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts ^^ @@ -1751,7 +1751,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^^^^^^^^ @@ -1761,20 +1761,20 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > f(x: V): V; ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ @@ -1782,7 +1782,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -1792,7 +1792,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1803,16 +1803,16 @@ var x = new ^^/* comments */ String(); source.ts meta.declaration.object.ts meta.object.body.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >interface G { ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^ source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^^ source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts ^^ @@ -1824,7 +1824,7 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^^^^^^^^ @@ -1834,20 +1834,20 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > f(x: V): V; ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ @@ -1855,7 +1855,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -1865,7 +1865,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1876,16 +1876,16 @@ var x = new ^^/* comments */ String(); source.ts meta.declaration.object.ts meta.object.body.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >interface G { ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^ source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^^ source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts ^^ @@ -1895,7 +1895,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts storage.modifier.ts ^^ source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -1907,20 +1907,20 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > f(x: V): V; ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ @@ -1928,7 +1928,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -1938,7 +1938,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1949,7 +1949,7 @@ var x = new ^^/* comments */ String(); source.ts meta.declaration.object.ts meta.object.body.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts @@ -1959,7 +1959,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^ @@ -1967,17 +1967,17 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ source.ts >var x=/*comments*/new String(); @@ -1986,7 +1986,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -1996,15 +1996,15 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ source.ts >var x= new/*comments*/String(); @@ -2013,13 +2013,13 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.operator.new.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^ @@ -2029,9 +2029,9 @@ var x = new ^^/* comments */ String(); ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ source.ts > @@ -2043,7 +2043,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -2055,19 +2055,19 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ source.ts >var x = /* comments */ new String(); @@ -2076,7 +2076,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -2090,15 +2090,15 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ source.ts >var x = new /* comments */ String(); @@ -2107,13 +2107,13 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^ @@ -2127,8 +2127,8 @@ var x = new ^^/* comments */ String(); ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ source.ts \ No newline at end of file diff --git a/tests/baselines/FunctionMethodOverloads.baseline.txt b/tests/baselines/FunctionMethodOverloads.baseline.txt index c64550b9..c6ff4e82 100644 --- a/tests/baselines/FunctionMethodOverloads.baseline.txt +++ b/tests/baselines/FunctionMethodOverloads.baseline.txt @@ -61,7 +61,7 @@ abstract class C { source.ts comment.block.ts punctuation.definition.comment.ts >export function testFunctionOverload(p: number): new() => any ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -71,7 +71,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -79,30 +79,30 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts ^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts >export function testFunctionOverload(p: string) ^^^^^^ - source.ts meta.function.ts meta.function.overload.ts storage.type.ts + source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^ source.ts meta.function.ts meta.function.overload.ts ^^^^^^^^ @@ -112,7 +112,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -120,12 +120,12 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts >export function testFunctionOverload(p: string []) ^^^^^^ - source.ts meta.function.ts meta.function.overload.ts storage.type.ts + source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^ source.ts meta.function.ts meta.function.overload.ts ^^^^^^^^ @@ -135,7 +135,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -143,7 +143,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -151,10 +151,10 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts >export function testFunctionOverload(p: {}) ^^^^^^ - source.ts meta.function.ts meta.function.overload.ts storage.type.ts + source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^ source.ts meta.function.ts meta.function.overload.ts ^^^^^^^^ @@ -164,7 +164,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -172,14 +172,14 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts >export function testFunctionOverload(p: {a: A, b:B} | string []) ^^^^^^ - source.ts meta.function.ts meta.function.overload.ts storage.type.ts + source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^ source.ts meta.function.ts meta.function.overload.ts ^^^^^^^^ @@ -189,7 +189,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -197,9 +197,9 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -207,11 +207,11 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -219,7 +219,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -227,10 +227,10 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts >export function testFunctionOverload(p: any): new() => any { ^^^^^^ - source.ts meta.function.ts meta.function.overload.ts storage.type.ts + source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^ source.ts meta.function.ts meta.function.overload.ts ^^^^^^^^ @@ -240,7 +240,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -248,61 +248,61 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts ^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > throw new Error("") ^^^^ source.ts meta.function.ts meta.decl.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.others.ts + source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts ^^^^^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts >export function testFunctionOverloadWithSemicolon(p: number): new () => any; ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -312,7 +312,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -320,32 +320,34 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts - ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts + ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts ^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts >export function testFunctionOverloadWithSemicolon(p: string); ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -355,7 +357,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -363,14 +365,14 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ source.ts >export function testFunctionOverloadWithSemicolon(p: string[]); ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -380,7 +382,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -388,18 +390,18 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ source.ts >export function testFunctionOverloadWithSemicolon(p: {}); ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -409,7 +411,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -417,16 +419,16 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ source.ts >export function testFunctionOverloadWithSemicolon(p: { a: A, b: B } | string[]); ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -436,7 +438,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -444,11 +446,11 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -456,11 +458,11 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -468,18 +470,18 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ source.ts >export function testFunctionOverloadWithSemicolon(p: any): new () => any { ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -489,7 +491,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -497,55 +499,57 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts - ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts + ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts ^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > throw new Error("") ^^^^ source.ts meta.function.ts meta.decl.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.others.ts + source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts ^^^^^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts @@ -554,7 +558,7 @@ abstract class C { source.ts >class testClass { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^^^^^^^ @@ -562,7 +566,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > /* Function overload tests */ ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -582,7 +586,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -590,27 +594,27 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.others.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts > public testMethodOverload(p: string) ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -621,7 +625,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -629,9 +633,9 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts > public testMethodOverload(p: string []) ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -642,7 +646,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -650,7 +654,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -658,7 +662,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts > public testMethodOverload(p: {}) ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -669,7 +673,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -677,11 +681,11 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts > public testMethodOverload(p: {a: A, b:B} | string []) ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -692,7 +696,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -700,9 +704,9 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -710,11 +714,11 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -722,7 +726,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -730,7 +734,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts > public testMethodOverload(p: any): new() => any { ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -741,7 +745,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -749,57 +753,57 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.others.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > throw new Error("") ^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts > } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -813,7 +817,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -821,27 +825,29 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.others.ts - ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.new.ts + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > public testMethodOverloadWithSemicolon(p: string); @@ -854,7 +860,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -862,9 +868,9 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > public testMethodOverloadWithSemicolon(p: string[]); @@ -877,7 +883,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -885,13 +891,13 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > public testMethodOverloadWithSemicolon(p: {}); @@ -904,7 +910,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -912,11 +918,11 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > public testMethodOverloadWithSemicolon(p: { a: A, b: B } | string[]); @@ -929,7 +935,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -937,11 +943,11 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -949,11 +955,11 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -961,13 +967,13 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > public testMethodOverloadWithSemicolon(p: any): new () => any { @@ -980,7 +986,7 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -988,66 +994,68 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.others.ts - ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.new.ts + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > throw new Error("") ^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts > } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts >interface I { ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^ @@ -1055,42 +1063,42 @@ abstract class C { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > foo(): number ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts > bar(): string; ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts @@ -1100,7 +1108,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^ @@ -1108,7 +1116,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > abstract foo() ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1119,9 +1127,9 @@ abstract class C { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts > abstract bar() ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -1132,9 +1140,9 @@ abstract class C { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/FunctionMethodOverloads.txt b/tests/baselines/FunctionMethodOverloads.txt index 807b7658..f4a6e464 100644 --- a/tests/baselines/FunctionMethodOverloads.txt +++ b/tests/baselines/FunctionMethodOverloads.txt @@ -55,72 +55,72 @@ abstract class C { >/* Function overload tests */ >export function testFunctionOverload(p: number): new() => any ^^^^^^ - [2, 1]: source.ts meta.function.ts storage.type.ts + [2, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^ [2, 17]: source.ts meta.function.ts entity.name.function.ts >export function testFunctionOverload(p: string) ^^^^^^ - [3, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + [3, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^ [3, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts >export function testFunctionOverload(p: string []) ^^^^^^ - [4, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + [4, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^ [4, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts >export function testFunctionOverload(p: {}) ^^^^^^ - [5, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + [5, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^ [5, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts >export function testFunctionOverload(p: {a: A, b:B} | string []) ^^^^^^ - [6, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + [6, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^ [6, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts >export function testFunctionOverload(p: any): new() => any { ^^^^^^ - [7, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + [7, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^ [7, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts > throw new Error("") ^^^^^ - [8, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [8, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts >} > >export function testFunctionOverloadWithSemicolon(p: number): new () => any; ^^^^^^ - [11, 1]: source.ts meta.function.ts storage.type.ts + [11, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [11, 17]: source.ts meta.function.ts entity.name.function.ts >export function testFunctionOverloadWithSemicolon(p: string); ^^^^^^ - [12, 1]: source.ts meta.function.ts storage.type.ts + [12, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [12, 17]: source.ts meta.function.ts entity.name.function.ts >export function testFunctionOverloadWithSemicolon(p: string[]); ^^^^^^ - [13, 1]: source.ts meta.function.ts storage.type.ts + [13, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [13, 17]: source.ts meta.function.ts entity.name.function.ts >export function testFunctionOverloadWithSemicolon(p: {}); ^^^^^^ - [14, 1]: source.ts meta.function.ts storage.type.ts + [14, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [14, 17]: source.ts meta.function.ts entity.name.function.ts >export function testFunctionOverloadWithSemicolon(p: { a: A, b: B } | string[]); ^^^^^^ - [15, 1]: source.ts meta.function.ts storage.type.ts + [15, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [15, 17]: source.ts meta.function.ts entity.name.function.ts >export function testFunctionOverloadWithSemicolon(p: any): new () => any { ^^^^^^ - [16, 1]: source.ts meta.function.ts storage.type.ts + [16, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [16, 17]: source.ts meta.function.ts entity.name.function.ts > throw new Error("") ^^^^^ - [17, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [17, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts >} > > @@ -158,7 +158,7 @@ abstract class C { [28, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts > throw new Error("") ^^^^^ - [29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts > } > > public testMethodOverloadWithSemicolon(p: number): new () => any; @@ -193,7 +193,7 @@ abstract class C { [37, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts > throw new Error("") ^^^^^ - [38, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [38, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts > } >} > diff --git a/tests/baselines/FunctionMethodParameters.baseline.txt b/tests/baselines/FunctionMethodParameters.baseline.txt index 5c9104de..835e0ec8 100644 --- a/tests/baselines/FunctionMethodParameters.baseline.txt +++ b/tests/baselines/FunctionMethodParameters.baseline.txt @@ -48,7 +48,7 @@ class testClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts > m1: string, ^^^^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts @@ -59,7 +59,7 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^^^ source.ts meta.function.ts meta.function.type.parameter.ts > m2: {}, @@ -72,9 +72,9 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts > m3: any [], @@ -87,7 +87,7 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -106,9 +106,9 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -116,11 +116,11 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts > m5: () => void, @@ -130,18 +130,20 @@ class testClass { source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts - ^^ + ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts > m6: (x:(string), y:[number, string]) => number, @@ -151,18 +153,20 @@ class testClass { source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts - ^^ + ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.name.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ @@ -172,23 +176,23 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts > m7: Array, @@ -203,9 +207,9 @@ class testClass { ^^^^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts ^^ @@ -222,11 +226,11 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^ @@ -241,9 +245,9 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -251,11 +255,11 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -265,11 +269,11 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^ @@ -281,22 +285,24 @@ class testClass { source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts - ^^ + ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -304,39 +310,39 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > return m6.length; ^^^^ source.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^^^^^^^^^^^^ source.ts meta.function.ts meta.decl.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts >class testClass { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^^^^^^^ @@ -344,7 +350,7 @@ class testClass { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > /* method param type tests */ ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -364,7 +370,7 @@ class testClass { ^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts > m1: string, ^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts @@ -375,7 +381,7 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m2: {}, @@ -388,9 +394,9 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m3: any [], @@ -403,7 +409,7 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -422,9 +428,9 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -432,11 +438,11 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m5: () => void, @@ -446,18 +452,20 @@ class testClass { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts - ^^ + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m6: (x:(string), y:[number, string]) => number, @@ -467,18 +475,20 @@ class testClass { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts - ^^ + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.name.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ @@ -488,23 +498,23 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m7: Array, @@ -519,9 +529,9 @@ class testClass { ^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts ^^ @@ -538,11 +548,11 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^ @@ -557,9 +567,9 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -567,11 +577,11 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -581,11 +591,11 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^ @@ -597,22 +607,24 @@ class testClass { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts - ^^ + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -620,35 +632,35 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > return m6.length; ^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/FunctionMethodParameters.txt b/tests/baselines/FunctionMethodParameters.txt index 6a5f1733..9e646974 100644 --- a/tests/baselines/FunctionMethodParameters.txt +++ b/tests/baselines/FunctionMethodParameters.txt @@ -67,7 +67,7 @@ class testClass { [12, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts > return m6.length; ^^^^^^ - [13, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [13, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts >} > >class testClass { @@ -105,6 +105,6 @@ class testClass { [28, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts > return m6.length; ^^^^^^ - [29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts > } >} \ No newline at end of file diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt index f3572330..43a1b25c 100644 --- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -42,7 +42,7 @@ class TestClass { source.ts comment.block.ts punctuation.definition.comment.ts >export function testFunctionReturnType1(): string [] { return [""] } ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -52,15 +52,15 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -70,11 +70,11 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ @@ -88,10 +88,10 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >export function testFunctionReturnType2(): {} { return {} } ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -101,38 +101,38 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.block.ts ^^^^^^ - source.ts meta.block.ts keyword.control.ts + source.ts meta.block.ts keyword.control.flow.ts ^ source.ts meta.block.ts ^ - source.ts meta.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.block.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} } ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -142,37 +142,37 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^^^^^^^^^^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.block.ts ^^^^^^ - source.ts meta.block.ts keyword.control.ts + source.ts meta.block.ts keyword.control.flow.ts ^ source.ts meta.block.ts ^ - source.ts meta.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.block.ts meta.block.ts meta.object.member.ts ^ source.ts meta.block.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -184,7 +184,7 @@ class TestClass { ^ source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.block.ts meta.block.ts ^^ @@ -192,7 +192,7 @@ class TestClass { ^ source.ts meta.block.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^^ source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -204,16 +204,16 @@ class TestClass { ^ source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.block.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType4(): [number, number] { return [1, 1] } ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -223,9 +223,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -233,21 +233,21 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ @@ -263,10 +263,10 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >export function testFunctionReturnType5(): Array { return [{ m: "" }] } ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -276,9 +276,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -286,7 +286,7 @@ class TestClass { ^^^^^ source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts meta.type.name.ts ^ @@ -294,17 +294,17 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts ^^ @@ -318,16 +318,16 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >export function testFunctionReturnType6(): new () => number { throw new Error(""); } ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -337,58 +337,60 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts - ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts + ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts ^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.others.ts + source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts ^^^^^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >export function testFunctionReturnType7(): (() => number) { throw new Error(""); } ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -398,58 +400,60 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts - ^^ + ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts ^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.others.ts + source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts ^^^^^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >export function testFunctionReturnType8(): (() => number) [] { throw new Error(""); } ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -459,27 +463,29 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts - ^^ + ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts ^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -489,34 +495,34 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.others.ts + source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts ^^^^^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >export function testFunctionReturnType9(): (() => number) | (() => string) { throw new Error(""); } ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -526,78 +532,82 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts - ^^ + ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts ^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts keyword.operator.type.ts - ^^ + ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts ^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.others.ts + source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts ^^^^^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >export function testFunctionReturnType10(): {a: A, b: B} [] { return [{a: {m: "" }, b: {m1: "" }}] } ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -607,19 +617,19 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^^^^^^^^^^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts ^ @@ -629,23 +639,23 @@ class TestClass { ^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.block.ts ^^^^^^ - source.ts meta.block.ts keyword.control.ts + source.ts meta.block.ts keyword.control.flow.ts ^ source.ts meta.block.ts ^ source.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -657,7 +667,7 @@ class TestClass { ^ source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.block.ts meta.array.literal.ts meta.block.ts ^^ @@ -665,7 +675,7 @@ class TestClass { ^ source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^^ source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -677,18 +687,18 @@ class TestClass { ^ source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ source.ts meta.block.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType11(): number | string { return 1 } ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -698,15 +708,15 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -714,15 +724,15 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ @@ -730,10 +740,10 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >export function testFunctionReturnType12(): number | string [] { return } ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -743,15 +753,15 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -759,7 +769,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -769,18 +779,18 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >export function testFunctionReturnType13(): [number, number] | string [] { return [""] } ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -790,9 +800,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -800,11 +810,11 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ @@ -814,7 +824,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -824,11 +834,11 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ @@ -842,13 +852,13 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts >class TestClass { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^^^^^^^ @@ -856,7 +866,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > /* method return type tests */ ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -876,15 +886,15 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -894,11 +904,11 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -912,7 +922,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > public testMethodReturnType2(): {} { return {} } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -923,35 +933,35 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > public testMethodReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -962,17 +972,17 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -980,29 +990,29 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -1014,7 +1024,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts ^^ @@ -1022,7 +1032,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -1034,13 +1044,13 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > public testMethodReturnType4(): [number, number] { return [1, 1] } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1051,9 +1061,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1061,21 +1071,21 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -1091,7 +1101,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > public testMethodReturnType5(): Array { return [{ m: "" }] } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1102,9 +1112,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1112,7 +1122,7 @@ class TestClass { ^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts meta.type.name.ts ^ @@ -1120,17 +1130,17 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts ^^ @@ -1144,13 +1154,13 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > public testMethodReturnType6(): new () => number { throw new Error(""); } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1161,55 +1171,57 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.others.ts - ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.new.ts + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > public testMethodReturnType7(): (() => number) { throw new Error(""); } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1220,55 +1232,57 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts - ^^ + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > public testMethodReturnType8(): (() => number) [] { throw new Error(""); } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1279,27 +1293,29 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts - ^^ + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1309,31 +1325,31 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > public testMethodReturnType9(): (() => number) | (() => string) { throw new Error(""); } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1344,75 +1360,79 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts - ^^ + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.type.ts - ^^ + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > public testMethodReturnType10(): {a: A, b: B} [] { return [{a: {m: "" }, b: {m1: "" }}] } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1423,17 +1443,17 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -1441,11 +1461,11 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1455,23 +1475,23 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -1483,7 +1503,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts ^^ @@ -1491,7 +1511,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ @@ -1503,15 +1523,15 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > public testMethodReturnType11(): number | string { return 1 } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1522,15 +1542,15 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1538,15 +1558,15 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -1554,7 +1574,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > public testMethodReturnType12(): number | string [] { return } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1565,15 +1585,15 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1581,7 +1601,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1591,15 +1611,15 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > public testMethodReturnType13(): [number, number] | string [] { return [""] } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1610,9 +1630,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1620,11 +1640,11 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ @@ -1634,7 +1654,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1644,11 +1664,11 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -1662,7 +1682,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/FunctionMethodReturnTypes.txt b/tests/baselines/FunctionMethodReturnTypes.txt index 3f9d9bb7..61ecba32 100644 --- a/tests/baselines/FunctionMethodReturnTypes.txt +++ b/tests/baselines/FunctionMethodReturnTypes.txt @@ -36,95 +36,95 @@ class TestClass { >/* Function return type tests */ >export function testFunctionReturnType1(): string [] { return [""] } ^^^^^^ - [2, 1]: source.ts meta.function.ts storage.type.ts + [2, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [2, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [2, 56]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [2, 56]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts >export function testFunctionReturnType2(): {} { return {} } ^^^^^^ - [3, 1]: source.ts meta.function.ts storage.type.ts + [3, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [3, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [3, 49]: source.ts meta.block.ts keyword.control.ts + [3, 49]: source.ts meta.block.ts keyword.control.flow.ts >export function testFunctionReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} } ^^^^^^ - [4, 1]: source.ts meta.function.ts storage.type.ts + [4, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [4, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [4, 59]: source.ts meta.block.ts keyword.control.ts + [4, 59]: source.ts meta.block.ts keyword.control.flow.ts >export function testFunctionReturnType4(): [number, number] { return [1, 1] } ^^^^^^ - [5, 1]: source.ts meta.function.ts storage.type.ts + [5, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [5, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [5, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [5, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts >export function testFunctionReturnType5(): Array { return [{ m: "" }] } ^^^^^^ - [6, 1]: source.ts meta.function.ts storage.type.ts + [6, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [6, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [6, 55]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [6, 55]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts >export function testFunctionReturnType6(): new () => number { throw new Error(""); } ^^^^^^ - [7, 1]: source.ts meta.function.ts storage.type.ts + [7, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [7, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^ - [7, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [7, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts >export function testFunctionReturnType7(): (() => number) { throw new Error(""); } ^^^^^^ - [8, 1]: source.ts meta.function.ts storage.type.ts + [8, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [8, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^ - [8, 61]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [8, 61]: source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts >export function testFunctionReturnType8(): (() => number) [] { throw new Error(""); } ^^^^^^ - [9, 1]: source.ts meta.function.ts storage.type.ts + [9, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [9, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^ - [9, 64]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [9, 64]: source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts >export function testFunctionReturnType9(): (() => number) | (() => string) { throw new Error(""); } ^^^^^^ - [10, 1]: source.ts meta.function.ts storage.type.ts + [10, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [10, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^ - [10, 78]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [10, 78]: source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts >export function testFunctionReturnType10(): {a: A, b: B} [] { return [{a: {m: "" }, b: {m1: "" }}] } ^^^^^^ - [11, 1]: source.ts meta.function.ts storage.type.ts + [11, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^^ [11, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [11, 63]: source.ts meta.block.ts keyword.control.ts + [11, 63]: source.ts meta.block.ts keyword.control.flow.ts >export function testFunctionReturnType11(): number | string { return 1 } ^^^^^^ - [12, 1]: source.ts meta.function.ts storage.type.ts + [12, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^^ [12, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [12, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [12, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts >export function testFunctionReturnType12(): number | string [] { return } ^^^^^^ - [13, 1]: source.ts meta.function.ts storage.type.ts + [13, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^^ [13, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [13, 66]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [13, 66]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts >export function testFunctionReturnType13(): [number, number] | string [] { return [""] } ^^^^^^ - [14, 1]: source.ts meta.function.ts storage.type.ts + [14, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^^ [14, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [14, 76]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [14, 76]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts > >class TestClass { > /* method return type tests */ @@ -134,89 +134,89 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ [18, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [18, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [18, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts > public testMethodReturnType2(): {} { return {} } ^^^^^^ [19, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [19, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [19, 42]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [19, 42]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts > public testMethodReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} } ^^^^^^ [20, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [20, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [20, 52]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [20, 52]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts > public testMethodReturnType4(): [number, number] { return [1, 1] } ^^^^^^ [21, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [21, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [21, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [21, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts > public testMethodReturnType5(): Array { return [{ m: "" }] } ^^^^^^ [22, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [22, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [22, 48]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [22, 48]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts > public testMethodReturnType6(): new () => number { throw new Error(""); } ^^^^^^ [23, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [23, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^ - [23, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [23, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts > public testMethodReturnType7(): (() => number) { throw new Error(""); } ^^^^^^ [24, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [24, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^ - [24, 54]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [24, 54]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts > public testMethodReturnType8(): (() => number) [] { throw new Error(""); } ^^^^^^ [25, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [25, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^ - [25, 57]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [25, 57]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts > public testMethodReturnType9(): (() => number) | (() => string) { throw new Error(""); } ^^^^^^ [26, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [26, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^ - [26, 71]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [26, 71]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts > public testMethodReturnType10(): {a: A, b: B} [] { return [{a: {m: "" }, b: {m1: "" }}] } ^^^^^^ [27, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^^ [27, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [27, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [27, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts > public testMethodReturnType11(): number | string { return 1 } ^^^^^^ [28, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^^ [28, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [28, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [28, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts > public testMethodReturnType12(): number | string [] { return } ^^^^^^ [29, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^^ [29, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [29, 59]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [29, 59]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts > public testMethodReturnType13(): [number, number] | string [] { return [""] } ^^^^^^ [30, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^^ [30, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [30, 69]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + [30, 69]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts >} \ No newline at end of file diff --git a/tests/baselines/Issue110.baseline.txt b/tests/baselines/Issue110.baseline.txt index 2ed65ad9..0ff03865 100644 --- a/tests/baselines/Issue110.baseline.txt +++ b/tests/baselines/Issue110.baseline.txt @@ -29,7 +29,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -44,7 +44,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -57,7 +57,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -80,7 +80,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -93,7 +93,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -110,7 +110,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -131,7 +131,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -148,7 +148,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -161,7 +161,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -174,7 +174,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -191,7 +191,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -204,7 +204,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -225,7 +225,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -242,7 +242,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -259,7 +259,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -276,7 +276,7 @@ let i = ^^1, j = ^^1e3 ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -286,7 +286,7 @@ let i = ^^1, j = ^^1e3 ^^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ diff --git a/tests/baselines/Issue124.baseline.txt b/tests/baselines/Issue124.baseline.txt index 203ebdb2..cbd17fd8 100644 --- a/tests/baselines/Issue124.baseline.txt +++ b/tests/baselines/Issue124.baseline.txt @@ -39,7 +39,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -70,7 +70,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -109,7 +109,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -165,7 +165,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ @@ -175,7 +175,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -189,7 +189,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts punctuation.definition.string.template.end.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -209,7 +209,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^ diff --git a/tests/baselines/Issue124.txt b/tests/baselines/Issue124.txt index 3b4d36a7..06792dcc 100644 --- a/tests/baselines/Issue124.txt +++ b/tests/baselines/Issue124.txt @@ -55,19 +55,19 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; > >var newVar = a ? (b == `hello`) : true; ^^^^^^ - [10, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [10, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^^ [10, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ [10, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - [10, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + [10, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^^^ [10, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.language.boolean.true.ts > >var debArch = arch === 'x64' ? 'amd64' : 'i386'; ^^^^^^^ - [12, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [12, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^^^^^ [12, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ diff --git a/tests/baselines/Issue149.baseline.txt b/tests/baselines/Issue149.baseline.txt index 50fbaa7b..f324d5e6 100644 --- a/tests/baselines/Issue149.baseline.txt +++ b/tests/baselines/Issue149.baseline.txt @@ -17,7 +17,7 @@ original file >export function fn(s: string): new() => View ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -27,7 +27,7 @@ original file ^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -35,30 +35,30 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts ^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^^^^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.name.ts >export function fn(s: string) ^^^^^^ - source.ts meta.function.ts meta.function.overload.ts storage.type.ts + source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^ source.ts meta.function.ts meta.function.overload.ts ^^^^^^^^ @@ -68,7 +68,7 @@ original file ^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -76,12 +76,12 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts >export function fn(n: number) ^^^^^^ - source.ts meta.function.ts meta.function.overload.ts storage.type.ts + source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^ source.ts meta.function.ts meta.function.overload.ts ^^^^^^^^ @@ -91,7 +91,7 @@ original file ^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -99,12 +99,12 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts >export function fn(s: any) { ^^^^^^ - source.ts meta.function.ts meta.function.overload.ts storage.type.ts + source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^ source.ts meta.function.ts meta.function.overload.ts ^^^^^^^^ @@ -114,7 +114,7 @@ original file ^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -122,18 +122,18 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > return ""; ^^^^ source.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ @@ -144,13 +144,13 @@ original file source.ts meta.function.ts meta.decl.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts >export function fn(s: string): new () => View; ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -160,7 +160,7 @@ original file ^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -168,23 +168,25 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ source.ts meta.function.ts meta.return.type.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts - ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts + ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.return.type.ts ^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^^^^ @@ -193,7 +195,7 @@ original file source.ts >export function fn(s: string); ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -203,7 +205,7 @@ original file ^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -211,14 +213,14 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ source.ts >export function fn(n: number); ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -228,7 +230,7 @@ original file ^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -236,14 +238,14 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ source.ts >export function fn(s: any) { ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -253,7 +255,7 @@ original file ^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -261,18 +263,18 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > return ""; ^^^^ source.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ @@ -283,4 +285,4 @@ original file source.ts meta.function.ts meta.decl.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts \ No newline at end of file + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue149.txt b/tests/baselines/Issue149.txt index 864af557..756006ca 100644 --- a/tests/baselines/Issue149.txt +++ b/tests/baselines/Issue149.txt @@ -17,60 +17,60 @@ original file >export function fn(s: string): new() => View ^^^^^^ - [1, 1]: source.ts meta.function.ts storage.type.ts + [1, 1]: source.ts meta.function.ts keyword.control.export.ts ^^ [1, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [1, 23]: source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + [1, 23]: source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^^^ - [1, 32]: source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts + [1, 32]: source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts ^^^^ [1, 41]: source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.name.ts >export function fn(s: string) ^^^^^^ - [2, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + [2, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^^ [2, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts >export function fn(n: number) ^^^^^^ - [3, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + [3, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^^ [3, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts >export function fn(s: any) { ^^^^^^ - [4, 1]: source.ts meta.function.ts meta.function.overload.ts storage.type.ts + [4, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts ^^ [4, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts > return ""; ^^^^^^ - [5, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [5, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts >} > >export function fn(s: string): new () => View; ^^^^^^ - [8, 1]: source.ts meta.function.ts storage.type.ts + [8, 1]: source.ts meta.function.ts keyword.control.export.ts ^^ [8, 17]: source.ts meta.function.ts entity.name.function.ts ^^^ - [8, 32]: source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.ts + [8, 32]: source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts ^^^^ [8, 42]: source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.name.ts >export function fn(s: string); ^^^^^^ - [9, 1]: source.ts meta.function.ts storage.type.ts + [9, 1]: source.ts meta.function.ts keyword.control.export.ts ^^ [9, 17]: source.ts meta.function.ts entity.name.function.ts >export function fn(n: number); ^^^^^^ - [10, 1]: source.ts meta.function.ts storage.type.ts + [10, 1]: source.ts meta.function.ts keyword.control.export.ts ^^ [10, 17]: source.ts meta.function.ts entity.name.function.ts >export function fn(s: any) { ^^^^^^ - [11, 1]: source.ts meta.function.ts storage.type.ts + [11, 1]: source.ts meta.function.ts keyword.control.export.ts ^^ [11, 17]: source.ts meta.function.ts entity.name.function.ts > return ""; ^^^^^^ - [12, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [12, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts >} \ No newline at end of file diff --git a/tests/baselines/Issue156.baseline.txt b/tests/baselines/Issue156.baseline.txt index 688103a3..317b4ff3 100644 --- a/tests/baselines/Issue156.baseline.txt +++ b/tests/baselines/Issue156.baseline.txt @@ -10,7 +10,7 @@ class Test { >class Test { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^^ @@ -18,14 +18,14 @@ class Test { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > mmm(p1: string | {}, p2: string) ^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -33,7 +33,7 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -41,9 +41,9 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ @@ -55,16 +55,16 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts > { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts @@ -72,7 +72,7 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue156.txt b/tests/baselines/Issue156.txt index ba9c6439..46fa6551 100644 --- a/tests/baselines/Issue156.txt +++ b/tests/baselines/Issue156.txt @@ -15,13 +15,13 @@ class Test { ^^ [2, 6]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ - [2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + [2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - [2, 19]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.brace.curly.ts + [2, 19]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ [2, 23]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ - [2, 27]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + [2, 27]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts > { > ^^^^^^^^^ diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index 11b4728f..c241614e 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -24,7 +24,7 @@ class Thing<^^T, ^^U> { >class Thing { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^^^ @@ -32,14 +32,14 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > constructor(public content: string){ ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts ^ @@ -51,11 +51,11 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > var prop = Q.defer(); ^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts @@ -64,7 +64,7 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ @@ -72,51 +72,51 @@ class Thing<^^T, ^^U> { ^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > this.store = new Data(); ^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.relational.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > gaze(path.join(this.content, "**/*.json"), (err, watch) => { ^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -126,28 +126,28 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -155,38 +155,38 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts > }) ^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts > }; ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts >class Thing { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^^^ source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts ^^ @@ -198,14 +198,14 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > constructor(public content: string){ ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts ^ @@ -217,11 +217,11 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > var prop = Q.defer(); ^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts @@ -230,7 +230,7 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ @@ -238,51 +238,51 @@ class Thing<^^T, ^^U> { ^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > this.store = new Data(); ^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.relational.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.others.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > gaze(path.join(this.content, "**/*.json"), (err, watch) => { ^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -292,28 +292,28 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -321,26 +321,26 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts > }) ^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts > }; ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts \ No newline at end of file diff --git a/tests/baselines/Issue191.txt b/tests/baselines/Issue191.txt index d2591000..7210429c 100644 --- a/tests/baselines/Issue191.txt +++ b/tests/baselines/Issue191.txt @@ -31,17 +31,17 @@ class Thing<^^T, ^^U> { ^^^^^^^ [2, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ - [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts > var prop = Q.defer(); ^^^^ - [3, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [3, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^^^^^^ - [3, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [3, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ - [3, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + [3, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts > this.store = new Data(); ^^^^ - [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^ [4, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts > gaze(path.join(this.content, "**/*.json"), (err, watch) => { @@ -50,14 +50,14 @@ class Thing<^^T, ^^U> { ^^^^^^^^^ [5, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts ^ - [5, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + [5, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [6, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts ^^^^^^^^^^^^^^^^^^^^^^^^ [6, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts ^ - [6, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts + [6, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts > }) > }; >} @@ -75,17 +75,17 @@ class Thing<^^T, ^^U> { ^^^^^^^ [12, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ - [12, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + [12, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts > var prop = Q.defer(); ^^^^ - [13, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [13, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^^^^^^ - [13, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [13, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ - [13, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + [13, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts > this.store = new Data(); ^^^^ - [14, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + [14, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^ [14, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts > gaze(path.join(this.content, "**/*.json"), (err, watch) => { @@ -94,14 +94,14 @@ class Thing<^^T, ^^U> { ^^^^^^^^^ [15, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts ^ - [15, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + [15, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [16, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts ^^^^^^^^^^^^^^^^^^^^^^^^ [16, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts ^ - [16, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.paren.ts + [16, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts > }) > }; >} diff --git a/tests/baselines/Issue200.baseline.txt b/tests/baselines/Issue200.baseline.txt index 8760d47f..ec1627d4 100644 --- a/tests/baselines/Issue200.baseline.txt +++ b/tests/baselines/Issue200.baseline.txt @@ -16,7 +16,7 @@ original file source.ts >declare module 'goog:goog.i18n.NumberFormatSymbols_en_TT' { ^^^^^^^ - source.ts keyword.control.ts + source.ts storage.modifier.ts ^ source.ts ^^^^^^ @@ -32,18 +32,18 @@ original file ^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.block.ts > import alias = lool.clutz.goog.i18n.NumberFormatSymbols_en_TT; ^^ source.ts meta.block.ts ^^^^^^ - source.ts meta.block.ts keyword.control.import.include.ts + source.ts meta.block.ts keyword.control.import.ts ^^^^^^^ source.ts meta.block.ts ^ - source.ts meta.block.ts keyword.operator.comparison.ts + source.ts meta.block.ts keyword.operator.relational.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.block.ts > export default alias; @@ -54,9 +54,9 @@ original file ^ source.ts meta.block.ts ^^^^^^^ - source.ts meta.block.ts keyword.control.ts + source.ts meta.block.ts keyword.control.switch.ts ^^^^^^^^^ source.ts meta.block.ts >} ^ - source.ts meta.block.ts meta.brace.curly.ts \ No newline at end of file + source.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue200.txt b/tests/baselines/Issue200.txt index ad0e384c..9431eb5a 100644 --- a/tests/baselines/Issue200.txt +++ b/tests/baselines/Issue200.txt @@ -14,14 +14,14 @@ original file > >declare module 'goog:goog.i18n.NumberFormatSymbols_en_TT' { ^^^^^^^ - [3, 1]: source.ts keyword.control.ts + [3, 1]: source.ts storage.modifier.ts ^^^^^^ [3, 9]: source.ts storage.type.ts ^ [3, 16]: source.ts string.quoted.single.ts punctuation.definition.string.begin.ts > import alias = lool.clutz.goog.i18n.NumberFormatSymbols_en_TT; ^^^^^^ - [4, 3]: source.ts meta.block.ts keyword.control.import.include.ts + [4, 3]: source.ts meta.block.ts keyword.control.import.ts ^^^^^^^ [4, 10]: source.ts meta.block.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -30,9 +30,9 @@ original file ^^^^^^ [5, 3]: source.ts meta.block.ts storage.type.ts ^^^^^^^ - [5, 10]: source.ts meta.block.ts keyword.control.ts + [5, 10]: source.ts meta.block.ts keyword.control.switch.ts ^^^^^^^^^ [5, 18]: source.ts meta.block.ts >} ^ - [6, 1]: source.ts meta.block.ts meta.brace.curly.ts \ No newline at end of file + [6, 1]: source.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue208.baseline.txt b/tests/baselines/Issue208.baseline.txt index e18f2b9d..c464ce54 100644 --- a/tests/baselines/Issue208.baseline.txt +++ b/tests/baselines/Issue208.baseline.txt @@ -18,29 +18,29 @@ class MyClass { ^ source.ts meta.var.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^ @@ -48,7 +48,7 @@ class MyClass { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ source.ts >var someVar = makeThing('data'); @@ -57,7 +57,7 @@ class MyClass { ^ source.ts meta.var.expr.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -65,17 +65,17 @@ class MyClass { ^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^ @@ -83,7 +83,7 @@ class MyClass { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ source.ts > @@ -91,7 +91,7 @@ class MyClass { source.ts >class MyClass { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^^^^^ @@ -99,40 +99,40 @@ class MyClass { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > static someProp = new Thing('data'); ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts keyword.others.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts ^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^ @@ -140,38 +140,38 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > static someProp = makeThing('data'); ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^ @@ -179,7 +179,7 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > @@ -189,31 +189,31 @@ class MyClass { ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts keyword.others.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts ^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^ @@ -221,34 +221,34 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > someProp = makeThing('data'); ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^ @@ -256,9 +256,9 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.paren.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue208.txt b/tests/baselines/Issue208.txt index c2b6fbce..17e0fbf4 100644 --- a/tests/baselines/Issue208.txt +++ b/tests/baselines/Issue208.txt @@ -14,61 +14,61 @@ class MyClass { >var someVar = new Thing('data'); ^^^ - [1, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + [1, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.operator.new.ts ^^^^^ [1, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts ^^^^^^ - [1, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [1, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^^^^^ - [1, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [1, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^^^ [1, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - [1, 47]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + [1, 47]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts >var someVar = makeThing('data'); ^^^^^^^^^ [2, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts ^^^^^^ - [2, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [2, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^^^^^ - [2, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [2, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^^^ [2, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ - [2, 47]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + [2, 47]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts > >class MyClass { > static someProp = new Thing('data'); ^^^^^^^^ - [5, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + [5, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^^^^ [5, 27]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts ^^^^^^ - [5, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [5, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^^^^^ - [5, 41]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [5, 41]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts > static someProp = makeThing('data'); ^^^^^^^^ - [6, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + [6, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^^^^ [6, 23]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.type.ts ^^^^^^ - [6, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [6, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^^^^^ - [6, 41]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [6, 41]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts > > someProp = new Thing('data'); ^^^^^ [8, 20]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts ^^^^^^ - [8, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [8, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^^^^^ - [8, 34]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [8, 34]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts > someProp = makeThing('data'); ^^^^^^^^^ [9, 16]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.type.ts ^^^^^^ - [9, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [9, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^^^^^ - [9, 34]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [9, 34]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts >} \ No newline at end of file diff --git a/tests/baselines/Issue262.baseline.txt b/tests/baselines/Issue262.baseline.txt index 4e0f61cd..d019695f 100644 --- a/tests/baselines/Issue262.baseline.txt +++ b/tests/baselines/Issue262.baseline.txt @@ -9,17 +9,17 @@ for (^^let a = 1; a ^^< 10; a++) { >for (let a = 1; a < 10; a++) { ^^^ - source.ts keyword.control.ts + source.ts keyword.control.loop.ts ^ source.ts ^ - source.ts meta.brace.paren.ts + source.ts meta.brace.round.ts ^^^ source.ts storage.type.ts ^^^ source.ts ^ - source.ts keyword.operator.comparison.ts + source.ts keyword.operator.relational.ts ^ source.ts ^ @@ -27,7 +27,7 @@ for (^^let a = 1; a ^^< 10; a++) { ^^^^ source.ts ^ - source.ts keyword.operator.comparison.ts + source.ts keyword.operator.relational.ts ^ source.ts ^^ @@ -35,28 +35,28 @@ for (^^let a = 1; a ^^< 10; a++) { ^^^ source.ts ^^ - source.ts keyword.operator.arithmetic.ts + source.ts keyword.operator.increment.ts ^ - source.ts meta.brace.paren.ts + source.ts meta.brace.round.ts ^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts > for (let b = 1; b < a; b++) { ^^^^ source.ts meta.block.ts ^^^ - source.ts meta.block.ts keyword.control.ts + source.ts meta.block.ts keyword.control.loop.ts ^ source.ts meta.block.ts ^ - source.ts meta.block.ts meta.brace.paren.ts + source.ts meta.block.ts meta.brace.round.ts ^^^ source.ts meta.block.ts storage.type.ts ^^^ source.ts meta.block.ts ^ - source.ts meta.block.ts keyword.operator.comparison.ts + source.ts meta.block.ts keyword.operator.relational.ts ^ source.ts meta.block.ts ^ @@ -64,17 +64,17 @@ for (^^let a = 1; a ^^< 10; a++) { ^^^^ source.ts meta.block.ts ^ - source.ts meta.block.ts keyword.operator.comparison.ts + source.ts meta.block.ts keyword.operator.relational.ts ^^^^^ source.ts meta.block.ts ^^ - source.ts meta.block.ts keyword.operator.arithmetic.ts + source.ts meta.block.ts keyword.operator.increment.ts ^ - source.ts meta.block.ts meta.brace.paren.ts + source.ts meta.block.ts meta.brace.round.ts ^ source.ts meta.block.ts ^ - source.ts meta.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts > ^^^^^^^^^ source.ts meta.block.ts meta.block.ts @@ -82,7 +82,7 @@ for (^^let a = 1; a ^^< 10; a++) { ^^^^ source.ts meta.block.ts meta.block.ts ^ - source.ts meta.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.block.ts meta.brace.curly.ts \ No newline at end of file + source.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue262.txt b/tests/baselines/Issue262.txt index a86e1491..3f158574 100644 --- a/tests/baselines/Issue262.txt +++ b/tests/baselines/Issue262.txt @@ -11,10 +11,10 @@ for (^^let a = 1; a ^^< 10; a++) { ^^^ [1, 6]: source.ts storage.type.ts ^ - [1, 19]: source.ts keyword.operator.comparison.ts + [1, 19]: source.ts keyword.operator.relational.ts > for (let b = 1; b < a; b++) { ^^^ - [2, 5]: source.ts meta.block.ts keyword.control.ts + [2, 5]: source.ts meta.block.ts keyword.control.loop.ts ^^^ [2, 10]: source.ts meta.block.ts storage.type.ts > diff --git a/tests/baselines/Issue28.baseline.txt b/tests/baselines/Issue28.baseline.txt index 8cdcd613..38132aed 100644 --- a/tests/baselines/Issue28.baseline.txt +++ b/tests/baselines/Issue28.baseline.txt @@ -31,7 +31,7 @@ var w = ^^0O767; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -46,7 +46,7 @@ var w = ^^0O767; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -61,7 +61,7 @@ var w = ^^0O767; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -76,7 +76,7 @@ var w = ^^0O767; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -91,7 +91,7 @@ var w = ^^0O767; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -106,7 +106,7 @@ var w = ^^0O767; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ diff --git a/tests/baselines/Issue288.baseline.txt b/tests/baselines/Issue288.baseline.txt index 2f24dc8c..e374f7bd 100644 --- a/tests/baselines/Issue288.baseline.txt +++ b/tests/baselines/Issue288.baseline.txt @@ -47,21 +47,21 @@ return^^Name+=1; ^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >var AnotherName = function(){ ^^^ source.ts meta.var.expr.ts storage.type.ts ^ source.ts meta.var.expr.ts ^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -69,20 +69,20 @@ return^^Name+=1; ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts storage.type.function.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts >export function eName(){ ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -92,14 +92,14 @@ return^^Name+=1; ^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >export var eAnotherName = function(){ ^^^^^^ source.ts storage.type.ts @@ -110,7 +110,7 @@ return^^Name+=1; ^ source.ts meta.var.expr.ts ^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -118,14 +118,14 @@ return^^Name+=1; ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts storage.type.function.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts @@ -135,7 +135,7 @@ return^^Name+=1; ^ source.ts meta.var.expr.ts ^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -146,7 +146,7 @@ return^^Name+=1; ^^^^^^^^^^^^ source.ts ^ - source.ts keyword.operator.comparison.ts + source.ts keyword.operator.relational.ts ^ source.ts constant.numeric.decimal.ts ^^ @@ -164,7 +164,7 @@ return^^Name+=1; ^ source.ts meta.var.expr.ts ^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -180,7 +180,7 @@ return^^Name+=1; ^ source.ts meta.var.expr.ts ^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -195,7 +195,7 @@ return^^Name+=1; ^^^^^^^^^^^ source.ts ^ - source.ts keyword.operator.comparison.ts + source.ts keyword.operator.relational.ts ^ source.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ @@ -213,7 +213,7 @@ return^^Name+=1; ^ source.ts meta.var.expr.ts ^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -223,10 +223,8 @@ return^^Name+=1; >returnName+=1; ^^^^^^^^^^ source.ts - ^ - source.ts keyword.operator.arithmetic.ts - ^ - source.ts keyword.operator.comparison.ts + ^^ + source.ts keyword.operator.assignment.compound.ts ^ source.ts constant.numeric.decimal.ts ^^ diff --git a/tests/baselines/Issue288.txt b/tests/baselines/Issue288.txt index fdfcb3bb..926dba91 100644 --- a/tests/baselines/Issue288.txt +++ b/tests/baselines/Issue288.txt @@ -35,7 +35,7 @@ return^^Name+=1; >} >var AnotherName = function(){ ^ - [6, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + [6, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts >} > >export function eName(){ @@ -44,30 +44,30 @@ return^^Name+=1; >} >export var eAnotherName = function(){ ^ - [11, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + [11, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts >} > >var functionName=1; ^^^^^^^^^^^^ - [14, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [14, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts >functionName=1; ^^^^^^^^^^^^ [15, 9]: source.ts > >export var functionName2=1; ^^^^^^^^^^^^^ - [17, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [17, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts > >var exportName="hello"; ^^^^^^^^^^ - [19, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [19, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts >exportName2="hello"; ^^^^^^^^^^^ [20, 7]: source.ts > >var returnName=1; ^^^^^^^^^^ - [22, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [22, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts >returnName+=1; ^^^^^^^^^^ [23, 7]: source.ts diff --git a/tests/baselines/Issue32.baseline.txt b/tests/baselines/Issue32.baseline.txt index 80bfd046..7c3348c6 100644 --- a/tests/baselines/Issue32.baseline.txt +++ b/tests/baselines/Issue32.baseline.txt @@ -37,18 +37,18 @@ original file source.ts >interface NewInterface{ ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > currentData: Data; ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^ @@ -59,7 +59,7 @@ original file ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -69,10 +69,10 @@ original file ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts @@ -81,7 +81,7 @@ original file source.ts >class NewClass implements NewInterface { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^^^^^^ @@ -89,20 +89,20 @@ original file ^ source.ts meta.declaration.object.ts ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > currentData: Data; ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^ @@ -113,7 +113,7 @@ original file ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -123,32 +123,32 @@ original file ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > this.currentData = d; ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.relational.ts ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > } ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > constructor(m: number, n: string){} ^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -156,7 +156,7 @@ original file ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ @@ -168,16 +168,16 @@ original file ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts diff --git a/tests/baselines/Issue32.txt b/tests/baselines/Issue32.txt index ae9ac84a..3c38e53f 100644 --- a/tests/baselines/Issue32.txt +++ b/tests/baselines/Issue32.txt @@ -29,12 +29,12 @@ original file > >interface NewInterface{ ^^^^^^^^^ - [5, 1]: source.ts meta.declaration.object.ts storage.type.ts + [5, 1]: source.ts meta.declaration.object.ts storage.type.interface.ts ^^^^^^^^^^^^ [5, 11]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts > currentData: Data; ^^^^^^^^^^^ - [6, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + [6, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts > setVal(d: Data) ^^^^^^ [7, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts @@ -43,16 +43,16 @@ original file > >class NewClass implements NewInterface { ^^^^^ - [11, 1]: source.ts meta.declaration.object.ts storage.type.ts + [11, 1]: source.ts meta.declaration.object.ts storage.type.class.ts > currentData: Data; ^^^^^^^^^^^ - [12, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + [12, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts > setVal(d: Data){ ^^^^^^ [13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts > this.currentData = d; ^^^^ - [14, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + [14, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts > } > constructor(m: number, n: string){} ^^^^^^^^^^^ @@ -60,11 +60,11 @@ original file ^ [16, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ - [16, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + [16, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ [16, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ - [16, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + [16, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts >} > ^ diff --git a/tests/baselines/Issue335.baseline.txt b/tests/baselines/Issue335.baseline.txt index 3e07625d..dcd9362c 100644 --- a/tests/baselines/Issue335.baseline.txt +++ b/tests/baselines/Issue335.baseline.txt @@ -55,7 +55,7 @@ class A4 { >class A1 { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^ @@ -63,20 +63,20 @@ class A4 { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > b() { ^ source.ts meta.declaration.object.ts meta.object.body.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > let d; ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts @@ -85,14 +85,14 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > d.default = 1; ^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.relational.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -103,7 +103,7 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -115,33 +115,33 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > } ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts >class A2 { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^ @@ -149,20 +149,20 @@ class A4 { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > b() { ^ source.ts meta.declaration.object.ts meta.object.body.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > let d; ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts @@ -171,14 +171,14 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > d.case = 1 ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.relational.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -187,7 +187,7 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -199,33 +199,33 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > } ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts >class A3 { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^ @@ -233,20 +233,20 @@ class A4 { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > b() { ^ source.ts meta.declaration.object.ts meta.object.body.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > let d ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts @@ -255,12 +255,12 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts > d.default = 1 ^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -269,7 +269,7 @@ class A4 { ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts ^^^^^^^^^ @@ -279,12 +279,12 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts > case 1: ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ @@ -295,7 +295,7 @@ class A4 { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ @@ -306,26 +306,26 @@ class A4 { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts > break; ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts > } ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts punctuation.definition.block.ts > } ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -337,33 +337,33 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > } ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts >class A4 { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^ @@ -371,20 +371,20 @@ class A4 { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > b() { ^ source.ts meta.declaration.object.ts meta.object.body.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > let d ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts @@ -393,12 +393,12 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts > d.case = 1 ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -407,7 +407,7 @@ class A4 { ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts ^^^^^^^^^ @@ -417,12 +417,12 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts > case 1: ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ @@ -433,7 +433,7 @@ class A4 { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ @@ -444,26 +444,26 @@ class A4 { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts > break; ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts > } ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts punctuation.definition.block.ts > } ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -475,24 +475,24 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > } ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue335.txt b/tests/baselines/Issue335.txt index 97efb4cd..2abc21f0 100644 --- a/tests/baselines/Issue335.txt +++ b/tests/baselines/Issue335.txt @@ -65,7 +65,7 @@ class A4 { ^^^^^^^ [7, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^^^^^^ - [7, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + [7, 10]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts > } >} > @@ -81,7 +81,7 @@ class A4 { ^^^^^^^ [17, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^^^^^^ - [17, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + [17, 10]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts > } >} > @@ -96,13 +96,13 @@ class A4 { [25, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts > case 1: ^^^^ - [26, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + [26, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > case 2: ^^^^ - [27, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + [27, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > default: ^^^^^^^ - [28, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + [28, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > break; > } > } @@ -111,7 +111,7 @@ class A4 { ^^^^^^^ [33, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^^^^^^ - [33, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + [33, 10]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts > } >} > @@ -126,13 +126,13 @@ class A4 { [41, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts > case 1: ^^^^ - [42, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + [42, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > case 2: ^^^^ - [43, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + [43, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > default: ^^^^^^^ - [44, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + [44, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > break; > } > } @@ -141,6 +141,6 @@ class A4 { ^^^^^^^ [49, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^^^^^^ - [49, 10]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + [49, 10]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts > } >} \ No newline at end of file diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index 58e0b216..a1c13b06 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -80,7 +80,7 @@ var j: I = {} source.ts >import * as req from "./Required" ^^^^^^ - source.ts keyword.control.import.include.ts + source.ts keyword.control.import.ts ^ source.ts ^ @@ -88,11 +88,11 @@ var j: I = {} ^ source.ts ^^ - source.ts keyword.others.ts + source.ts keyword.control.as.ts ^^^^^ source.ts ^^^^ - source.ts keyword.control.import.include.ts + source.ts keyword.control.from.ts ^ source.ts ^ @@ -103,19 +103,19 @@ var j: I = {} source.ts string.quoted.double.ts punctuation.definition.string.end.ts >import { Scale } from "./scale"; ^^^^^^ - source.ts keyword.control.import.include.ts + source.ts keyword.control.import.ts ^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^^^^^^ source.ts meta.block.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ source.ts ^^^^ - source.ts keyword.control.import.include.ts + source.ts keyword.control.from.ts ^ source.ts ^ @@ -131,36 +131,36 @@ var j: I = {} source.ts >if (object.instanceof(ClassNew)) { ^^ - source.ts keyword.control.ts + source.ts keyword.control.conditional.ts ^ source.ts ^ - source.ts meta.brace.paren.ts + source.ts meta.brace.round.ts ^^^^^^^ source.ts ^^^^^^^^^^ - source.ts keyword.others.ts + source.ts keyword.operator.instanceof.ts ^ - source.ts meta.brace.paren.ts + source.ts meta.brace.round.ts ^^^^^^^^ source.ts ^ - source.ts meta.brace.paren.ts + source.ts meta.brace.round.ts ^ - source.ts meta.brace.paren.ts + source.ts meta.brace.round.ts ^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts >class class1(){ ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^^^^ @@ -168,22 +168,22 @@ var j: I = {} ^^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > static functioname(){ ^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts @@ -191,20 +191,20 @@ var j: I = {} ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts >export class className(){ ^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts keyword.control.export.ts ^ source.ts meta.declaration.object.ts ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^^^^^^^ @@ -212,7 +212,7 @@ var j: I = {} ^^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > private state = { } ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -221,36 +221,36 @@ var j: I = {} ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts >void newFunctionName(){ ^^^^ - source.ts storage.type.ts + source.ts keyword.operator.void.ts ^^^^^^^^^^^^^^^^ source.ts ^ - source.ts meta.brace.paren.ts + source.ts meta.brace.round.ts ^ - source.ts meta.brace.paren.ts + source.ts meta.brace.round.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts meta.block.ts @@ -262,7 +262,7 @@ var j: I = {} ^ source.ts meta.block.ts meta.var.expr.ts ^ - source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ @@ -280,7 +280,7 @@ var j: I = {} ^ source.ts meta.block.ts ^^^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts + source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts ^^ source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts ^^^^^^^ @@ -290,12 +290,12 @@ var j: I = {} ^ source.ts meta.block.ts switch-statement.expr.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts > case 1: break; ^^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ @@ -305,14 +305,14 @@ var j: I = {} ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts ^^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts > case 2: break; ^^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ @@ -322,27 +322,27 @@ var j: I = {} ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts ^^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts > default: break; ^^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts ^^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts > } ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^ - source.ts meta.block.ts switch-statement.expr.ts + source.ts meta.block.ts switch-statement.expr.ts punctuation.definition.block.ts ^^ source.ts meta.block.ts > @@ -350,7 +350,7 @@ var j: I = {} source.ts meta.block.ts >} ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts @@ -374,12 +374,12 @@ var j: I = {} ^^^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts > export function myFun(x: number) { ^^^^ source.ts meta.block.ts ^^^^^^ - source.ts meta.block.ts meta.function.ts storage.type.ts + source.ts meta.block.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.block.ts meta.function.ts ^^^^^^^^ @@ -389,7 +389,7 @@ var j: I = {} ^^^^^ source.ts meta.block.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -397,28 +397,28 @@ var j: I = {} ^ source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.block.ts meta.function.ts ^ - source.ts meta.block.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > return x; ^^^^^^^^ source.ts meta.block.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.block.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.block.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^^^^ source.ts meta.block.ts meta.function.ts meta.decl.block.ts > } ^^^^ source.ts meta.block.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts @@ -428,13 +428,13 @@ var j: I = {} ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.typeof.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -442,7 +442,7 @@ var j: I = {} ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -456,19 +456,19 @@ var j: I = {} ^ source.ts meta.var.expr.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.operator.new.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ @@ -476,20 +476,20 @@ var j: I = {} ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ source.ts >delete (adder) ^^^^^^ - source.ts keyword.others.ts + source.ts keyword.operator.delete.ts ^ source.ts ^ - source.ts meta.brace.paren.ts + source.ts meta.brace.round.ts ^^^^^ source.ts ^ - source.ts meta.brace.paren.ts + source.ts meta.brace.round.ts > ^ source.ts @@ -499,24 +499,24 @@ var j: I = {} ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.others.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.typeof.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts ^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts >interface I {} ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^ @@ -524,16 +524,16 @@ var j: I = {} ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >var j: I = {} ^^^ source.ts meta.var.expr.ts storage.type.ts ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -543,13 +543,13 @@ var j: I = {} ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts @@ -562,16 +562,16 @@ var j: I = {} ^^^^^^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts > export class Cell { ^^^^ source.ts meta.block.ts ^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts storage.type.ts + source.ts meta.block.ts meta.declaration.object.ts keyword.control.export.ts ^ source.ts meta.block.ts meta.declaration.object.ts ^^^^^ - source.ts meta.block.ts meta.declaration.object.ts storage.type.ts + source.ts meta.block.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.block.ts meta.declaration.object.ts ^^^^ @@ -579,7 +579,7 @@ var j: I = {} ^ source.ts meta.block.ts meta.declaration.object.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > public parent: Cell; ^^^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts @@ -588,7 +588,7 @@ var j: I = {} ^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^ @@ -602,7 +602,7 @@ var j: I = {} ^^^^^^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -612,33 +612,33 @@ var j: I = {} ^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > this.parent = parent; ^^^^^^^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.relational.ts ^^^^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > if (typeof parent === 'object' || parent instanceof Error) { ^^^^^^^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts ^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.others.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.typeof.ts ^^^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ @@ -654,19 +654,19 @@ var j: I = {} ^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.arithmetic.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.logical.ts ^^^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.others.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.instanceof.ts ^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts > ^^^^^^^^^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts @@ -674,20 +674,20 @@ var j: I = {} ^^^^^^^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts > } ^^^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > } ^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >} ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt index f33652e1..d546e481 100644 --- a/tests/baselines/Issue37.txt +++ b/tests/baselines/Issue37.txt @@ -74,30 +74,30 @@ var j: I = {} > >import * as req from "./Required" ^^^^^^ - [3, 1]: source.ts keyword.control.import.include.ts + [3, 1]: source.ts keyword.control.import.ts ^ [3, 8]: source.ts keyword.operator.arithmetic.ts ^^ - [3, 10]: source.ts keyword.others.ts + [3, 10]: source.ts keyword.control.as.ts ^^^^ - [3, 17]: source.ts keyword.control.import.include.ts + [3, 17]: source.ts keyword.control.from.ts >import { Scale } from "./scale"; > >if (object.instanceof(ClassNew)) { ^^ - [6, 1]: source.ts keyword.control.ts + [6, 1]: source.ts keyword.control.conditional.ts ^^^^^^^^^^ - [6, 12]: source.ts keyword.others.ts + [6, 12]: source.ts keyword.operator.instanceof.ts >} > >class class1(){ ^^^^^ - [9, 1]: source.ts meta.declaration.object.ts storage.type.ts + [9, 1]: source.ts meta.declaration.object.ts storage.type.class.ts ^^^^^^ [9, 7]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts > static functioname(){ ^^^^^^ - [10, 2]: source.ts meta.declaration.object.ts meta.object.body.ts keyword.other.ts + [10, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^^^^^^^^^^^ [10, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts > @@ -106,19 +106,19 @@ var j: I = {} > >export class className(){ ^^^^^^ - [15, 1]: source.ts meta.declaration.object.ts storage.type.ts + [15, 1]: source.ts meta.declaration.object.ts keyword.control.export.ts ^^^^^ - [15, 8]: source.ts meta.declaration.object.ts storage.type.ts + [15, 8]: source.ts meta.declaration.object.ts storage.type.class.ts > private state = { } ^^^^^^^ [16, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^^^^^ - [16, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + [16, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts >} > >void newFunctionName(){ ^^^^ - [19, 1]: source.ts storage.type.ts + [19, 1]: source.ts keyword.operator.void.ts ^^^^^^^^^^^^^^^^ [19, 6]: source.ts > @@ -130,16 +130,16 @@ var j: I = {} > > switch (someNum) { ^^^^^^ - [23, 2]: source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts + [23, 2]: source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts > case 1: break; ^^^^ - [24, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + [24, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > case 2: break; ^^^^ - [25, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + [25, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > default: break; ^^^^^^^ - [26, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + [26, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > } > >} @@ -153,21 +153,21 @@ var j: I = {} [35, 1]: source.ts storage.type.ts > export function myFun(x: number) { ^^^^^^ - [36, 5]: source.ts meta.block.ts meta.function.ts storage.type.ts + [36, 5]: source.ts meta.block.ts meta.function.ts keyword.control.export.ts > return x; > } >} > >var m: typeof M = M; ^^^^^^ - [41, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.others.ts + [41, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.typeof.ts > >var adder = new Adder(3, 4); ^^^ - [43, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.others.ts + [43, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.operator.new.ts >delete (adder) ^^^^^^ - [44, 1]: source.ts keyword.others.ts + [44, 1]: source.ts keyword.operator.delete.ts > >var s = typeof {}git >interface I {} @@ -181,16 +181,16 @@ var j: I = {} [51, 8]: source.ts > export class Cell { ^^^^^^ - [52, 5]: source.ts meta.block.ts meta.declaration.object.ts storage.type.ts + [52, 5]: source.ts meta.block.ts meta.declaration.object.ts keyword.control.export.ts ^^^^^ - [52, 12]: source.ts meta.block.ts meta.declaration.object.ts storage.type.ts + [52, 12]: source.ts meta.block.ts meta.declaration.object.ts storage.type.class.ts ^^^^ [52, 18]: source.ts meta.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts > public parent: Cell; ^^^^^^ [53, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^^^^^^ - [53, 16]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + [53, 16]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^ [53, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts > @@ -203,12 +203,12 @@ var j: I = {} [55, 29]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts > this.parent = parent; ^^^^ - [56, 13]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + [56, 13]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^^^^^^ [56, 27]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > if (typeof parent === 'object' || parent instanceof Error) { ^^^^^^ - [57, 17]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.others.ts + [57, 17]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.typeof.ts ^^^^^^^^ [57, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ @@ -218,7 +218,7 @@ var j: I = {} ^^^^^^^^ [57, 47]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^^^^^ - [57, 54]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.others.ts + [57, 54]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.instanceof.ts ^^^^^^ [57, 65]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > diff --git a/tests/baselines/Issue44.baseline.txt b/tests/baselines/Issue44.baseline.txt index a3ca0b25..07f9eca7 100644 --- a/tests/baselines/Issue44.baseline.txt +++ b/tests/baselines/Issue44.baseline.txt @@ -17,7 +17,7 @@ original file source.ts >interface TestInterface { ^^^^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.interface.ts ^ source.ts meta.declaration.object.ts ^^^^^^^^^^^^^ @@ -25,16 +25,16 @@ original file ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > testvar: string; ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > testfunc(): string; @@ -43,20 +43,20 @@ original file ^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts diff --git a/tests/baselines/Issue44.txt b/tests/baselines/Issue44.txt index 013b0bfa..eafea979 100644 --- a/tests/baselines/Issue44.txt +++ b/tests/baselines/Issue44.txt @@ -15,22 +15,22 @@ original file > >interface TestInterface { ^^^^^^^^^ - [2, 1]: source.ts meta.declaration.object.ts storage.type.ts + [2, 1]: source.ts meta.declaration.object.ts storage.type.interface.ts ^^^^^^^^^^^^^ [2, 11]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts > testvar: string; ^^^^^^^ - [3, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + [3, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^ - [3, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.primitive.ts support.type.ts + [3, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.primitive.ts support.type.primitive.ts > testfunc(): string; ^^^^^^^^ [4, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [4, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + [4, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts >} ^ - [5, 1]: source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + [5, 1]: source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > >/* > Testing Comments diff --git a/tests/baselines/Issue5.baseline.txt b/tests/baselines/Issue5.baseline.txt index db8da4a1..13f66a12 100644 --- a/tests/baselines/Issue5.baseline.txt +++ b/tests/baselines/Issue5.baseline.txt @@ -43,7 +43,7 @@ let new_string = ^^"^^Changes End here^^" ^ source.ts meta.var.expr.ts ^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -66,7 +66,7 @@ let new_string = ^^"^^Changes End here^^" ^ source.ts meta.var.expr.ts ^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -101,7 +101,7 @@ let new_string = ^^"^^Changes End here^^" ^ source.ts meta.var.expr.ts ^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -140,7 +140,7 @@ let new_string = ^^"^^Changes End here^^" ^ source.ts meta.var.expr.ts ^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -210,7 +210,7 @@ let new_string = ^^"^^Changes End here^^" ^ source.ts meta.var.expr.ts ^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -302,7 +302,7 @@ let new_string = ^^"^^Changes End here^^" ^ source.ts meta.var.expr.ts ^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ diff --git a/tests/baselines/Issue63.baseline.txt b/tests/baselines/Issue63.baseline.txt index 3d275a6c..db5612bc 100644 --- a/tests/baselines/Issue63.baseline.txt +++ b/tests/baselines/Issue63.baseline.txt @@ -18,15 +18,15 @@ type Callback = ^^(error: Error, value: T) => ^^any >type Callback = (error: Error, value: T) => any ^^^^ - source.ts meta.type.declaration.ts keyword.other.ts + source.ts meta.type.declaration.ts storage.type.type.ts ^ source.ts meta.type.declaration.ts ^^^^^^^^ - source.ts meta.type.declaration.ts entity.name.class.ts + source.ts meta.type.declaration.ts entity.name.type.ts ^ source.ts meta.type.declaration.ts ^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts ^ @@ -34,9 +34,9 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts ^^ - source.ts meta.type.declaration.ts keyword.operator.comparison.ts + source.ts meta.type.declaration.ts keyword.operator.assignment.ts ^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts ^^ @@ -52,27 +52,27 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts ^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.type.declaration.ts ^^ - source.ts meta.type.declaration.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.type.declaration.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.type.declaration.ts meta.type.function.return.ts ^^^ - source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts > ^ source.ts >type Callback = (error: Error, value: T) => any ^^^^ - source.ts meta.type.declaration.ts keyword.other.ts + source.ts meta.type.declaration.ts storage.type.type.ts ^ source.ts meta.type.declaration.ts ^^^^^^^^ - source.ts meta.type.declaration.ts entity.name.class.ts + source.ts meta.type.declaration.ts entity.name.type.ts ^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts ^ @@ -82,9 +82,9 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts ^^ - source.ts meta.type.declaration.ts keyword.operator.comparison.ts + source.ts meta.type.declaration.ts keyword.operator.assignment.ts ^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts ^^ @@ -100,31 +100,31 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts ^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.type.declaration.ts ^^ - source.ts meta.type.declaration.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.type.declaration.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.type.declaration.ts meta.type.function.return.ts ^^^ - source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts > ^ source.ts >type Callback = (error: Error, value: T) => any ^^^^ - source.ts meta.type.declaration.ts keyword.other.ts + source.ts meta.type.declaration.ts storage.type.type.ts ^ source.ts meta.type.declaration.ts ^^^^^^^^ - source.ts meta.type.declaration.ts entity.name.class.ts + source.ts meta.type.declaration.ts entity.name.type.ts ^ source.ts meta.type.declaration.ts ^^ - source.ts meta.type.declaration.ts keyword.operator.comparison.ts + source.ts meta.type.declaration.ts keyword.operator.assignment.ts ^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts ^^ @@ -140,41 +140,43 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts ^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.type.declaration.ts ^^ - source.ts meta.type.declaration.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.type.declaration.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.type.declaration.ts meta.type.function.return.ts ^^^ - source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts > ^ source.ts >type Callback void> = (error: Error, value: T) => any ^^^^ - source.ts meta.type.declaration.ts keyword.other.ts + source.ts meta.type.declaration.ts storage.type.type.ts ^ source.ts meta.type.declaration.ts ^^^^^^^^ - source.ts meta.type.declaration.ts entity.name.class.ts + source.ts meta.type.declaration.ts entity.name.type.ts ^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts keyword.operator.type.ts - ^^ + ^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts + ^ + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.type.name.ts ^^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts ^^^^^^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts ^ @@ -182,25 +184,25 @@ type Callback = ^^(error: Error, value: T) => ^^any ^^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts ^^^^^^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts ^^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts ^^^^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts ^ source.ts meta.type.declaration.ts ^^ - source.ts meta.type.declaration.ts keyword.operator.comparison.ts + source.ts meta.type.declaration.ts keyword.operator.assignment.ts ^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts ^^ @@ -216,15 +218,15 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts ^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.type.declaration.ts ^^ - source.ts meta.type.declaration.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.type.declaration.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.type.declaration.ts meta.type.function.return.ts ^^^ - source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts > ^ source.ts @@ -232,15 +234,15 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts ^^^^ - source.ts meta.type.declaration.ts keyword.other.ts + source.ts meta.type.declaration.ts storage.type.type.ts ^ source.ts meta.type.declaration.ts ^^^ - source.ts meta.type.declaration.ts entity.name.class.ts + source.ts meta.type.declaration.ts entity.name.type.ts ^ source.ts meta.type.declaration.ts ^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts ^ @@ -250,9 +252,9 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts ^^ - source.ts meta.type.declaration.ts keyword.operator.comparison.ts + source.ts meta.type.declaration.ts keyword.operator.assignment.ts ^ - source.ts meta.type.declaration.ts meta.object.type.ts meta.brace.curly.ts + source.ts meta.type.declaration.ts meta.object.type.ts punctuation.definition.block.ts > ^ source.ts meta.type.declaration.ts meta.object.type.ts @@ -260,7 +262,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts ^^^ - source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts ^^ @@ -269,14 +271,14 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts ^^^ - source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.ts + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^ source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts ^^^^^^ - source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.primitive.ts support.type.ts + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.primitive.ts support.type.primitive.ts > ^ source.ts meta.type.declaration.ts meta.object.type.ts >} ^ - source.ts meta.type.declaration.ts meta.object.type.ts meta.brace.curly.ts \ No newline at end of file + source.ts meta.type.declaration.ts meta.object.type.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue63.txt b/tests/baselines/Issue63.txt index 1eff86a5..e1e70280 100644 --- a/tests/baselines/Issue63.txt +++ b/tests/baselines/Issue63.txt @@ -18,71 +18,71 @@ type Callback = ^^(error: Error, value: T) => ^^any >type Callback = (error: Error, value: T) => any ^^^^ - [1, 1]: source.ts meta.type.declaration.ts keyword.other.ts + [1, 1]: source.ts meta.type.declaration.ts storage.type.type.ts ^^^^^^^^ - [1, 6]: source.ts meta.type.declaration.ts entity.name.class.ts + [1, 6]: source.ts meta.type.declaration.ts entity.name.type.ts ^ [1, 16]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts ^ - [1, 21]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts + [1, 21]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts > >type Callback = (error: Error, value: T) => any ^^^^ - [3, 1]: source.ts meta.type.declaration.ts keyword.other.ts + [3, 1]: source.ts meta.type.declaration.ts storage.type.type.ts ^ - [3, 14]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + [3, 14]: source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - [3, 21]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts + [3, 21]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^^ - [3, 46]: source.ts meta.type.declaration.ts meta.type.function.return.ts keyword.operator.ts + [3, 46]: source.ts meta.type.declaration.ts meta.type.function.return.ts storage.type.function.arrow.ts ^^^ - [3, 49]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + [3, 49]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts > >type Callback = (error: Error, value: T) => any ^ - [5, 17]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts + [5, 17]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^ - [5, 45]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + [5, 45]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts > >type Callback void> = (error: Error, value: T) => any ^^^^ - [7, 1]: source.ts meta.type.declaration.ts keyword.other.ts + [7, 1]: source.ts meta.type.declaration.ts storage.type.type.ts ^^^^^^^^ - [7, 6]: source.ts meta.type.declaration.ts entity.name.class.ts + [7, 6]: source.ts meta.type.declaration.ts entity.name.type.ts ^ - [7, 14]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.brace.angle.ts + [7, 14]: source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ [7, 22]: source.ts meta.type.declaration.ts meta.type.parameters.ts keyword.operator.type.ts - ^^ - [7, 24]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts + ^ + [7, 24]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^ - [7, 50]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + [7, 50]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ - [7, 58]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts + [7, 58]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^ - [7, 86]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + [7, 86]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts > > type Foo = { ^ [9, 1]: source.ts ^^^ - [9, 7]: source.ts meta.type.declaration.ts entity.name.class.ts + [9, 7]: source.ts meta.type.declaration.ts entity.name.type.ts ^ [9, 12]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts ^ - [9, 18]: source.ts meta.type.declaration.ts meta.object.type.ts meta.brace.curly.ts + [9, 18]: source.ts meta.type.declaration.ts meta.object.type.ts punctuation.definition.block.ts > > foo: T, ^^^ - [11, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.ts + [11, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^ [11, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts > bar: number ^^^ - [12, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.ts + [12, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^ - [12, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.primitive.ts support.type.ts + [12, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.primitive.ts support.type.primitive.ts > >} ^ - [14, 1]: source.ts meta.type.declaration.ts meta.object.type.ts meta.brace.curly.ts \ No newline at end of file + [14, 1]: source.ts meta.type.declaration.ts meta.object.type.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue82.baseline.txt b/tests/baselines/Issue82.baseline.txt index d63a99e2..62c92129 100644 --- a/tests/baselines/Issue82.baseline.txt +++ b/tests/baselines/Issue82.baseline.txt @@ -12,7 +12,7 @@ class Foo { >class Foo { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^ @@ -20,14 +20,14 @@ class Foo { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > constructor( ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts > test: number, // foo bar, ^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts @@ -38,7 +38,7 @@ class Foo { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^ @@ -52,18 +52,20 @@ class Foo { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts - ^^ + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts ^^ @@ -74,11 +76,11 @@ class Foo { ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts @@ -86,7 +88,7 @@ class Foo { ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue82.txt b/tests/baselines/Issue82.txt index d3e8a00f..1a692d43 100644 --- a/tests/baselines/Issue82.txt +++ b/tests/baselines/Issue82.txt @@ -16,14 +16,14 @@ class Foo { ^^^^ [3, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ - [3, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + [3, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^^^^^^^^^ [3, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts > exitEditModeCallback: () => void // Used to re-enable View updates. ^^^^^^^^^^^^^^^^^^^^ [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts - ^^ - [4, 31]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + [4, 31]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [4, 44]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts > ) { diff --git a/tests/baselines/Issue89.baseline.txt b/tests/baselines/Issue89.baseline.txt index b6c22ad5..b5e69767 100644 --- a/tests/baselines/Issue89.baseline.txt +++ b/tests/baselines/Issue89.baseline.txt @@ -28,11 +28,11 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ >export class A extends /* */B implements/**/ C{ ^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts keyword.control.export.ts ^ source.ts meta.declaration.object.ts ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^ @@ -40,7 +40,7 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -50,11 +50,11 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts storage.modifier.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -62,15 +62,15 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^^^ source.ts meta.declaration.object.ts meta.object.body.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts @@ -82,11 +82,11 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ source.ts >export class D implements/**/ F extends /**/G { ^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts keyword.control.export.ts ^ source.ts meta.declaration.object.ts ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^ @@ -94,7 +94,7 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^ source.ts meta.declaration.object.ts ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -102,11 +102,11 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts ^^ @@ -114,17 +114,17 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^^^ source.ts meta.declaration.object.ts meta.object.body.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts @@ -133,11 +133,11 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ source.ts >export class E extends /**/H implements/**/ One, Two, Three{ ^^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts keyword.control.export.ts ^ source.ts meta.declaration.object.ts ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^ @@ -145,7 +145,7 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ @@ -153,11 +153,11 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts storage.modifier.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -165,23 +165,23 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts ^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts ^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^^^ source.ts meta.declaration.object.ts meta.object.body.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts @@ -190,7 +190,7 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ source.ts >class className extends class1 implements class2 { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^^^^^^^ @@ -198,29 +198,29 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^ source.ts meta.declaration.object.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts storage.modifier.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts diff --git a/tests/baselines/Issue89.txt b/tests/baselines/Issue89.txt index 9e7a9048..fe17f4a7 100644 --- a/tests/baselines/Issue89.txt +++ b/tests/baselines/Issue89.txt @@ -28,19 +28,19 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ >export class A extends /* */B implements/**/ C{ ^^^^^ - [1, 8]: source.ts meta.declaration.object.ts storage.type.ts + [1, 8]: source.ts meta.declaration.object.ts storage.type.class.ts ^ [1, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^^^^^^^ - [1, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + [1, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^^ [1, 27]: source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts ^ - [1, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + [1, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^^^^^^^^^ - [1, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts + [1, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts storage.modifier.ts ^ - [1, 47]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + [1, 47]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts > ^^^ [2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts @@ -54,13 +54,13 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^ [7, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^^^^^^^^^^ - [7, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + [7, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^^ [7, 31]: source.ts meta.declaration.object.ts meta.object.heritage.ts ^^^^^^^ - [7, 34]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts + [7, 34]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts storage.modifier.ts ^ - [7, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + [7, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ [7, 48]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts > @@ -75,19 +75,19 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ ^ [12, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^^^^^^^ - [12, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + [12, 16]: source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^ - [12, 28]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + [12, 28]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^ [12, 30]: source.ts meta.declaration.object.ts meta.object.heritage.ts ^^ [12, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^^ - [12, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + [12, 46]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^^ - [12, 51]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + [12, 51]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^^^^ - [12, 56]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + [12, 56]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts > ^^^ [13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts @@ -98,17 +98,17 @@ export class ^^E ^^extends /**/^^H ^^ implements/*^^*/ ^^One, ^^Two, ^^Three{ > >class className extends class1 implements class2 { ^^^^^ - [17, 1]: source.ts meta.declaration.object.ts storage.type.ts + [17, 1]: source.ts meta.declaration.object.ts storage.type.class.ts ^^^^^^^^^ [17, 7]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^^^^^^^ - [17, 17]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts + [17, 17]: source.ts meta.declaration.object.ts meta.object.heritage.ts storage.modifier.ts ^^^^^^ - [17, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + [17, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts ^^^^^^^^^^ - [17, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts + [17, 32]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts storage.modifier.ts ^^^^^^ - [17, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts support.type.ts + [17, 43]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts entity.other.inherited-class.ts > ^^^^^ [18, 5]: source.ts meta.declaration.object.ts meta.object.body.ts diff --git a/tests/baselines/Issue90.baseline.txt b/tests/baselines/Issue90.baseline.txt index 9c3048c7..f0e6197a 100644 --- a/tests/baselines/Issue90.baseline.txt +++ b/tests/baselines/Issue90.baseline.txt @@ -15,7 +15,7 @@ original file ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -32,7 +32,7 @@ original file ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -49,13 +49,13 @@ original file ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.bitwise.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ diff --git a/tests/baselines/Issue90.txt b/tests/baselines/Issue90.txt index d50b3f7c..62673272 100644 --- a/tests/baselines/Issue90.txt +++ b/tests/baselines/Issue90.txt @@ -14,18 +14,18 @@ original file ^ [2, 1]: source.ts meta.var.expr.ts ^ - [2, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [2, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ [2, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts > var c = a ^ b; ^ [3, 1]: source.ts meta.var.expr.ts ^ - [3, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [3, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^^ [3, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - [3, 12]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts + [3, 12]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.bitwise.ts ^^ [3, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts > diff --git a/tests/baselines/Issue96.baseline.txt b/tests/baselines/Issue96.baseline.txt index 8e45639f..26d4d5d1 100644 --- a/tests/baselines/Issue96.baseline.txt +++ b/tests/baselines/Issue96.baseline.txt @@ -20,7 +20,7 @@ const^^able^^ += " Royal, I say!"; ^ source.ts meta.var.expr.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts >let variable; @@ -29,7 +29,7 @@ const^^able^^ += " Royal, I say!"; ^ source.ts meta.var.expr.ts ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts > @@ -50,7 +50,7 @@ const^^able^^ += " Royal, I say!"; ^ source.ts meta.var.expr.ts ^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -62,10 +62,8 @@ const^^able^^ += " Royal, I say!"; >constenum += 10; ^^^^^^^^^^ source.ts - ^ - source.ts keyword.operator.arithmetic.ts - ^ - source.ts keyword.operator.comparison.ts + ^^ + source.ts keyword.operator.assignment.compound.ts ^ source.ts ^^ @@ -78,19 +76,19 @@ const^^able^^ += " Royal, I say!"; ^ source.ts meta.enum.declaration.ts ^^^^ - source.ts meta.enum.declaration.ts storage.type.ts + source.ts meta.enum.declaration.ts storage.type.enum.ts ^ source.ts meta.enum.declaration.ts ^ - source.ts meta.enum.declaration.ts entity.name.class.ts + source.ts meta.enum.declaration.ts entity.name.type.enum.ts ^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.block.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts @@ -100,7 +98,7 @@ const^^able^^ += " Royal, I say!"; ^ source.ts meta.var.expr.ts ^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -116,10 +114,8 @@ const^^able^^ += " Royal, I say!"; >constable += " Royal, I say!"; ^^^^^^^^^^ source.ts - ^ - source.ts keyword.operator.arithmetic.ts - ^ - source.ts keyword.operator.comparison.ts + ^^ + source.ts keyword.operator.assignment.compound.ts ^ source.ts ^ diff --git a/tests/baselines/Issue96.txt b/tests/baselines/Issue96.txt index 5def80ee..b9fd0e57 100644 --- a/tests/baselines/Issue96.txt +++ b/tests/baselines/Issue96.txt @@ -30,7 +30,7 @@ const^^able^^ += " Royal, I say!"; > >var constenum = 10; ^^^^^^^^^ - [7, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [7, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ [7, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts >constenum += 10; @@ -46,7 +46,7 @@ const^^able^^ += " Royal, I say!"; > >var constable = "I am rrrrrroyal!"; ^^^^^^^^^ - [11, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [11, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ [11, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts >constable += " Royal, I say!"; diff --git a/tests/baselines/ParameterProperties.baseline.txt b/tests/baselines/ParameterProperties.baseline.txt index b75d020d..9f17d003 100644 --- a/tests/baselines/ParameterProperties.baseline.txt +++ b/tests/baselines/ParameterProperties.baseline.txt @@ -11,7 +11,7 @@ class A { >class A { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^ @@ -19,14 +19,14 @@ class A { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > constructor(private a: string, protected b: string, public c: string) { ^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts ^ @@ -38,7 +38,7 @@ class A { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ @@ -54,7 +54,7 @@ class A { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ @@ -70,40 +70,40 @@ class A { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > } ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > foo() { ^ source.ts meta.declaration.object.ts meta.object.body.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > return this.a + this.b + this.c; ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -111,7 +111,7 @@ class A { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -119,14 +119,14 @@ class A { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > } ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts \ No newline at end of file + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt b/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt index aa946ed7..15c7e5da 100644 --- a/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt +++ b/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt @@ -21,7 +21,7 @@ var y ^^"some string 2" source.ts >class SomeClass { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^^^^^^^ @@ -29,7 +29,7 @@ var y ^^"some string 2" ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > "some string" ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -41,7 +41,7 @@ var y ^^"some string 2" source.ts meta.declaration.object.ts meta.object.body.ts string.quoted.double.ts punctuation.definition.string.end.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts @@ -51,7 +51,7 @@ var y ^^"some string 2" ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index f7eca169..551f5c91 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -57,7 +57,7 @@ var e =
>class MyComponent extends React.Component{ ^^^^^ - source.tsx meta.declaration.object.tsx storage.type.tsx + source.tsx meta.declaration.object.tsx storage.type.class.tsx ^ source.tsx meta.declaration.object.tsx ^^^^^^^^^^^ @@ -65,17 +65,17 @@ var e =
^ source.tsx meta.declaration.object.tsx ^^^^^^^ - source.tsx meta.declaration.object.tsx meta.object.heritage.tsx keyword.other.tsx + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx storage.modifier.tsx ^ source.tsx meta.declaration.object.tsx meta.object.heritage.tsx ^^^^^ - source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.object.heritage.parent.tsx support.type.tsx + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.object.heritage.parent.tsx entity.other.inherited-class.tsx ^ source.tsx meta.declaration.object.tsx meta.object.heritage.tsx ^^^^^^^^^ source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx entity.name.type.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx meta.brace.angle.tsx + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx punctuation.definition.typeparameters.begin.tsx ^^^^^ source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx meta.type.name.tsx ^^ @@ -85,54 +85,54 @@ var e =
^ source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.brace.curly.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx punctuation.definition.block.tsx > render() { ^^^^ source.tsx meta.declaration.object.tsx meta.object.body.tsx ^^^^^^ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx entity.name.function.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.function.type.parameter.tsx meta.brace.round.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.function.type.parameter.tsx punctuation.definition.parameters.begin.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.function.type.parameter.tsx meta.brace.round.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.function.type.parameter.tsx punctuation.definition.parameters.end.tsx ^ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.brace.curly.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx punctuation.definition.block.tsx > return
^^^^^^^^ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx ^^^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx keyword.control.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx keyword.control.flow.tsx ^ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx entity.name.tag.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx entity.name.tag.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.tag.attribute-name.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx ^^^^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx keyword.operator.assignment.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.brace.curly.tsx constant.language.this.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx variable.language.this.tsx ^^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.brace.curly.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx > This is a test: {this.state.count} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx ^ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx constant.language.this.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx variable.language.this.tsx ^^^^^^^^^^^^ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx ^ @@ -141,19 +141,19 @@ var e =
^^^^^^^^ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx ^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.close.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.close.tsx punctuation.definition.tag.begin.tsx ^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.close.tsx entity.name.tag.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.close.tsx entity.name.tag.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.close.tsx punctuation.definition.tag.end.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx > } ^^^^ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.brace.curly.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx punctuation.definition.block.tsx >} ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.brace.curly.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx punctuation.definition.block.tsx > ^ source.tsx @@ -173,91 +173,91 @@ var e =
^ source.tsx meta.var.expr.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx ^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx >
^^^^ source.tsx ^ - source.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^ - source.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx > ^^^^^^^^ - source.tsx tag.without-attributes.tsx + source.tsx meta.tag.without-attributes.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^^^^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx > ^^^^^^^^^^^^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^^^^^^^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx entity.name.tag.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx ^^^^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx keyword.operator.assignment.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx ^^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx > ^^^^^^^^^^^^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^^^^^^^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx entity.name.tag.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx ^^^^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx keyword.operator.assignment.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx ^^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx > ^^^^^^^^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx ^^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^^^^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx >
^^^^ - source.tsx tag.without-attributes.tsx + source.tsx meta.tag.without-attributes.tsx ^^ - source.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^ - source.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx > ^ source.tsx @@ -267,98 +267,98 @@ var e =
^ source.tsx meta.var.expr.tsx ^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx ^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.brace.paren.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.brace.round.tsx >
^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx > ^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx > ^^^^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx ^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx keyword.operator.assignment.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx > ^^^^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx ^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx keyword.operator.assignment.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx > ^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx >
^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx >) ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.brace.paren.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.brace.round.tsx > ^ source.tsx @@ -368,75 +368,75 @@ var e =
^ source.tsx meta.var.expr.tsx ^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx ^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.brace.paren.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.brace.round.tsx > ^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx >); ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.brace.paren.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.brace.round.tsx ^^ source.tsx > @@ -458,29 +458,29 @@ var e =
^ source.tsx meta.var.expr.tsx ^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx ^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.brace.curly.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx punctuation.definition.block.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.brace.curly.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx punctuation.definition.block.tsx ^^ source.tsx >props.foo = x; ^^^^^^^^^^ source.tsx ^ - source.tsx keyword.operator.comparison.tsx + source.tsx keyword.operator.relational.tsx ^^^^ source.tsx >props.bar = y; ^^^^^^^^^^ source.tsx ^ - source.tsx keyword.operator.comparison.tsx + source.tsx keyword.operator.relational.tsx ^^^^ source.tsx >var component = ; @@ -489,27 +489,27 @@ var e =
^ source.tsx meta.var.expr.tsx ^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx ^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx ^^ source.tsx > @@ -521,13 +521,13 @@ var e =
^ source.tsx meta.var.expr.tsx ^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx ^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.brace.curly.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx punctuation.definition.block.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx ^^^^ @@ -543,50 +543,50 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.brace.curly.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx punctuation.definition.block.tsx >var component2 = ^^^ source.tsx meta.var.expr.tsx storage.type.tsx ^ source.tsx meta.var.expr.tsx ^^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx ^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.tag.attribute-name.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx keyword.operator.assignment.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx string.quoted.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx > ^ source.tsx @@ -606,233 +606,233 @@ var e =
^ source.tsx meta.var.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx ^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx constant.character.escape.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx constant.character.escape.tsx ^^^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx >var b =
{'First ' + String.fromCharCode(183) + ' Second'}
^^^ source.tsx meta.var.expr.tsx storage.type.tsx ^ source.tsx meta.var.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx ^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx keyword.operator.arithmetic.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx keyword.operator.arithmetic.tsx ^^^^^^^^^^^^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.brace.paren.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.brace.round.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx constant.numeric.decimal.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx constant.numeric.decimal.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.brace.paren.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.brace.round.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx keyword.operator.arithmetic.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx keyword.operator.arithmetic.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx >var c =
{['First ', ·, ' Second']}
^^^ source.tsx meta.var.expr.tsx storage.type.tsx ^ source.tsx meta.var.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx ^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.brace.square.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.brace.square.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx constant.character.entity.tsx punctuation.definition.entity.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.tag.without-attributes.tsx constant.character.entity.tsx punctuation.definition.entity.tsx ^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx constant.character.entity.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.tag.without-attributes.tsx constant.character.entity.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx constant.character.entity.tsx punctuation.definition.entity.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.tag.without-attributes.tsx constant.character.entity.tsx punctuation.definition.entity.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.brace.square.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.brace.square.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx >var d =
^^^ source.tsx meta.var.expr.tsx storage.type.tsx ^ source.tsx meta.var.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx ^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.tag.attribute-name.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx ^^^^^^^^^^^^^^^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx keyword.operator.assignment.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.brace.curly.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx punctuation.definition.block.tsx ^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^^^^^^^^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.brace.curly.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx punctuation.definition.block.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx >var e =
^^^ source.tsx meta.var.expr.tsx storage.type.tsx ^ source.tsx meta.var.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx ^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx entity.name.tag.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx entity.name.tag.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.tag.attribute-name.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx ^^^^^^^^^^^^^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx keyword.operator.assignment.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx string.quoted.double.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx string.quoted.double.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx > ^ source.tsx \ No newline at end of file diff --git a/tests/baselines/TsxSamples.txt b/tests/baselines/TsxSamples.txt index e00110c1..0fd9340c 100644 --- a/tests/baselines/TsxSamples.txt +++ b/tests/baselines/TsxSamples.txt @@ -59,13 +59,13 @@ var e =
> render() { > return
^ - [3, 16]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + [3, 16]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^ - [3, 17]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx entity.name.tag.tsx + [3, 17]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx entity.name.tag.tsx ^^^^^^^ - [3, 21]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + [3, 21]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^^^^ - [3, 30]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx tag.open.tsx meta.brace.curly.tsx constant.language.this.tsx + [3, 30]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx variable.language.this.tsx > This is a test: {this.state.count} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [4, 13]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx @@ -78,106 +78,106 @@ var e =
>var App = >
^ - [12, 5]: source.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + [12, 5]: source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^ - [12, 6]: source.tsx tag.without-attributes.tsx entity.name.tag.tsx + [12, 6]: source.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx > ^ - [13, 9]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + [13, 9]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^^^^ - [13, 10]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx + [13, 10]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx > ^ - [14, 13]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + [14, 13]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^^^^^^^ - [14, 14]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + [14, 14]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx entity.name.tag.tsx ^^^^ - [14, 24]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + [14, 24]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - [14, 30]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx + [14, 30]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx > ^ - [15, 13]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + [15, 13]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^^^^^^^ - [15, 14]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + [15, 14]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx entity.name.tag.tsx ^^^^ - [15, 24]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + [15, 24]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - [15, 30]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.double.tsx + [15, 30]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx > ^^ - [16, 9]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + [16, 9]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^^^^ - [16, 11]: source.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx + [16, 11]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx >
^^ - [17, 5]: source.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + [17, 5]: source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^ - [17, 7]: source.tsx tag.without-attributes.tsx entity.name.tag.tsx + [17, 7]: source.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx > >var App2 = ( >
^ - [20, 5]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + [20, 5]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^ - [20, 6]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + [20, 6]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx > ^ - [21, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + [21, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^^^^ - [21, 10]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx + [21, 10]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx > ^ - [22, 13]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + [22, 13]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^^^^^^^ - [22, 14]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + [22, 14]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx entity.name.tag.tsx ^^^^ - [22, 24]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + [22, 24]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - [22, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx + [22, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx > ^ - [23, 13]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + [23, 13]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^^^^^^^ - [23, 14]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx entity.name.tag.tsx + [23, 14]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx entity.name.tag.tsx ^^^^ - [23, 24]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + [23, 24]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - [23, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx tag.open.tsx string.quoted.single.tsx + [23, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx > ^^ - [24, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + [24, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^^^^ - [24, 11]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx tag.without-attributes.tsx entity.name.tag.tsx + [24, 11]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx >
^^ - [25, 7]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + [25, 7]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^ - [25, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx entity.name.tag.tsx + [25, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx >) > >var content = ( > ^^ - [33, 5]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + [33, 5]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx >); > >// JSX Spread Attributes @@ -187,42 +187,42 @@ var e =
>props.bar = y; >var component = ; ^ - [41, 17]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + [41, 17]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^^^^^^^ - [41, 18]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx entity.name.tag.tsx + [41, 18]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx entity.name.tag.tsx ^^^^^^^^ - [41, 29]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx + [41, 29]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx ^^ - [41, 39]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.end.tsx + [41, 39]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx > >var props2 = { foo: 'default' } >var component2 = ^ - [44, 18]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.begin.tsx + [44, 18]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^^^^^^^ - [44, 19]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx entity.name.tag.tsx + [44, 19]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx entity.name.tag.tsx ^^^^^^^^ - [44, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx + [44, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx ^^ - [44, 57]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx punctuation.definition.tag.end.tsx + [44, 57]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx > >// JSX Gotchas >// http://facebook.github.io/react/docs/jsx-gotchas.html >var a =
{'First \u00b7 Second'}
^ - [48, 15]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + [48, 15]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx >var b =
{'First ' + String.fromCharCode(183) + ' Second'}
^^^^^^^^^^^^^^^^^^^^ - [49, 26]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx + [49, 26]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx >var c =
{['First ', ·, ' Second']}
^ - [50, 26]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + [50, 26]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx >var d =
^^^^^^^ - [51, 40]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx + [51, 40]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx ^ - [51, 48]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + [51, 48]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx >var e =
^^^ - [52, 37]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx tag.open.tsx string.quoted.double.tsx + [52, 37]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx string.quoted.double.tsx > \ No newline at end of file diff --git a/tests/baselines/awaitColoring.baseline.txt b/tests/baselines/awaitColoring.baseline.txt index 699f0524..d646f209 100644 --- a/tests/baselines/awaitColoring.baseline.txt +++ b/tests/baselines/awaitColoring.baseline.txt @@ -6,7 +6,7 @@ original file >await 1; ^^^^^ - source.ts storage.modifier.ts + source.ts storage.modifier.await.ts ^ source.ts ^ diff --git a/tests/baselines/awaitColoring.txt b/tests/baselines/awaitColoring.txt index e319b471..a49cc21c 100644 --- a/tests/baselines/awaitColoring.txt +++ b/tests/baselines/awaitColoring.txt @@ -6,7 +6,7 @@ original file >await 1; ^^^^^ - [1, 1]: source.ts storage.modifier.ts + [1, 1]: source.ts storage.modifier.await.ts >awaiting 1; ^^^^^^^^^ [2, 1]: source.ts \ No newline at end of file diff --git a/tests/baselines/constants.baseline.txt b/tests/baselines/constants.baseline.txt index 0b1276d0..17aa32e3 100644 --- a/tests/baselines/constants.baseline.txt +++ b/tests/baselines/constants.baseline.txt @@ -15,7 +15,7 @@ var e = Infinity; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -30,7 +30,7 @@ var e = Infinity; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -45,7 +45,7 @@ var e = Infinity; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -60,7 +60,7 @@ var e = Infinity; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -75,7 +75,7 @@ var e = Infinity; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -92,7 +92,7 @@ var e = Infinity; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -109,7 +109,7 @@ var e = Infinity; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ diff --git a/tests/baselines/docComments.baseline.txt b/tests/baselines/docComments.baseline.txt index 4d60d13b..ec5279d1 100644 --- a/tests/baselines/docComments.baseline.txt +++ b/tests/baselines/docComments.baseline.txt @@ -70,7 +70,7 @@ function foo(param1: string, param2: number) { ^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^^^^^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -78,7 +78,7 @@ function foo(param1: string, param2: number) { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts ^ @@ -90,15 +90,15 @@ function foo(param1: string, param2: number) { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^^ source.ts meta.function.ts meta.decl.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts \ No newline at end of file + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/javascript.baseline.txt b/tests/baselines/javascript.baseline.txt index e0dcc7c1..07d8734c 100644 --- a/tests/baselines/javascript.baseline.txt +++ b/tests/baselines/javascript.baseline.txt @@ -12,7 +12,7 @@ x ^^instanceof y; >switch (x) { ^^^^^^ - source.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts + source.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts ^^ source.ts switch-statement.expr.ts switch-expression.expr.ts ^ @@ -22,14 +22,14 @@ x ^^instanceof y; ^ source.ts switch-statement.expr.ts ^ - source.ts switch-statement.expr.ts switch-block.expr.ts + source.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts ^^ source.ts switch-statement.expr.ts switch-block.expr.ts > case 0: ^^^^ source.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ @@ -42,35 +42,35 @@ x ^^instanceof y; ^^^^ source.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^^^ - source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^^ source.ts switch-statement.expr.ts switch-block.expr.ts >} ^ - source.ts switch-statement.expr.ts + source.ts switch-statement.expr.ts punctuation.definition.block.ts ^^ source.ts >typeof x; ^^^^^^ - source.ts keyword.others.ts + source.ts keyword.operator.typeof.ts ^^^^^ source.ts >void x; ^^^^ - source.ts storage.type.ts + source.ts keyword.operator.void.ts ^^^^^ source.ts >delete x.y; ^^^^^^ - source.ts keyword.others.ts + source.ts keyword.operator.delete.ts ^^^^^^^ source.ts >x instanceof y; ^^ source.ts ^^^^^^^^^^ - source.ts keyword.others.ts + source.ts keyword.operator.instanceof.ts ^^^^ source.ts \ No newline at end of file diff --git a/tests/baselines/javascript.txt b/tests/baselines/javascript.txt index ce33f34c..7c044929 100644 --- a/tests/baselines/javascript.txt +++ b/tests/baselines/javascript.txt @@ -12,23 +12,23 @@ x ^^instanceof y; >switch (x) { ^^^^^^ - [1, 1]: source.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.ts + [1, 1]: source.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts > case 0: ^^^^ - [2, 5]: source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + [2, 5]: source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > default: ^^^^^^^ - [3, 5]: source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.ts + [3, 5]: source.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts >} >typeof x; ^^^^^^ - [5, 1]: source.ts keyword.others.ts + [5, 1]: source.ts keyword.operator.typeof.ts >void x; ^^^^ - [6, 1]: source.ts storage.type.ts + [6, 1]: source.ts keyword.operator.void.ts >delete x.y; ^^^^^^ - [7, 1]: source.ts keyword.others.ts + [7, 1]: source.ts keyword.operator.delete.ts >x instanceof y; ^^^^^^^^^^ - [8, 3]: source.ts keyword.others.ts \ No newline at end of file + [8, 3]: source.ts keyword.operator.instanceof.ts \ No newline at end of file diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index 74dcda2c..875ba179 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -14,22 +14,22 @@ var ^^obj = { ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts >var a1 = 1, b1 = function (x) { return 1; }, c1 = "string" ^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts storage.type.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -39,7 +39,7 @@ var ^^obj = { ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -49,19 +49,19 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts ^ @@ -69,11 +69,11 @@ var ^^obj = { ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -90,17 +90,17 @@ var ^^obj = { ^ source.ts meta.var.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -112,43 +112,45 @@ var ^^obj = { ^^ source.ts meta.var.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.function.return.ts keyword.operator.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts storage.type.function.arrow.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts ^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.round.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ @@ -156,21 +158,21 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.round.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.var.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -178,7 +180,7 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts >var obj = { @@ -187,13 +189,13 @@ var ^^obj = { ^ source.ts meta.var.expr.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts > foo: "10" ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts @@ -209,11 +211,11 @@ var ^^obj = { source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts >}, other = 10; ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.curly.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.var.expr.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ diff --git a/tests/baselines/multipleVariableDeclaration.txt b/tests/baselines/multipleVariableDeclaration.txt index a73731b0..1b51c48a 100644 --- a/tests/baselines/multipleVariableDeclaration.txt +++ b/tests/baselines/multipleVariableDeclaration.txt @@ -10,29 +10,29 @@ var ^^obj = { >var a, b, c ^ - [1, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [1, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - [1, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [1, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - [1, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [1, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts >var a1 = 1, b1 = function (x) { return 1; }, c1 = "string" ^^ - [2, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [2, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ - [2, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [2, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ - [2, 46]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [2, 46]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts >var a2: string = "test", b2: () => void = () => { console.log("hello"); }, c2: string | number; ^^ - [3, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [3, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ - [3, 26]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [3, 26]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ - [3, 76]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [3, 76]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts >var obj = { ^^^ - [4, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [4, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts > foo: "10" >}, other = 10; ^^^^^ - [6, 4]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts \ No newline at end of file + [6, 4]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts \ No newline at end of file diff --git a/tests/baselines/namespaceAndModule.baseline.txt b/tests/baselines/namespaceAndModule.baseline.txt index 30a9e117..4bf05606 100644 --- a/tests/baselines/namespaceAndModule.baseline.txt +++ b/tests/baselines/namespaceAndModule.baseline.txt @@ -13,11 +13,11 @@ declare ^^module "x" {} ^^^^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.block.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts >module ts { } @@ -26,16 +26,16 @@ declare ^^module "x" {} ^^^^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.block.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts >declare namespace ts {} ^^^^^^^ - source.ts keyword.control.ts + source.ts storage.modifier.ts ^ source.ts ^^^^^^^^^ @@ -43,14 +43,14 @@ declare ^^module "x" {} ^^^^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts >declare module ts {} ^^^^^^^ - source.ts keyword.control.ts + source.ts storage.modifier.ts ^ source.ts ^^^^^^ @@ -58,14 +58,14 @@ declare ^^module "x" {} ^^^^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts >declare module "x" {} ^^^^^^^ - source.ts keyword.control.ts + source.ts storage.modifier.ts ^ source.ts ^^^^^^ @@ -81,6 +81,6 @@ declare ^^module "x" {} ^ source.ts ^ - source.ts meta.block.ts meta.brace.curly.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts meta.brace.curly.ts \ No newline at end of file + source.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/numeric.baseline.txt b/tests/baselines/numeric.baseline.txt index f6700004..aec781aa 100644 --- a/tests/baselines/numeric.baseline.txt +++ b/tests/baselines/numeric.baseline.txt @@ -19,7 +19,7 @@ var k = 1; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -34,7 +34,7 @@ var k = 1; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -49,7 +49,7 @@ var k = 1; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -64,7 +64,7 @@ var k = 1; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -83,7 +83,7 @@ var k = 1; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -102,7 +102,7 @@ var k = 1; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -119,7 +119,7 @@ var k = 1; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -134,7 +134,7 @@ var k = 1; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -153,7 +153,7 @@ var k = 1; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -170,7 +170,7 @@ var k = 1; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -187,7 +187,7 @@ var k = 1; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index 8a77e467..c1b585a0 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -25,7 +25,7 @@ class Test { >class Test { ^^^^^ - source.ts meta.declaration.object.ts storage.type.ts + source.ts meta.declaration.object.ts storage.type.class.ts ^ source.ts meta.declaration.object.ts ^^^^ @@ -33,7 +33,7 @@ class Test { ^ source.ts meta.declaration.object.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > private data: TemplateData[] = [] ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -42,7 +42,7 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ @@ -52,7 +52,7 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ @@ -67,17 +67,17 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts > private state = {} ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -86,20 +86,20 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.brace.curly.ts + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > ^ source.ts @@ -109,15 +109,15 @@ class Test { ^ source.ts ^^^^ - source.ts meta.type.declaration.ts keyword.other.ts + source.ts meta.type.declaration.ts storage.type.type.ts ^ source.ts meta.type.declaration.ts ^^^^^ - source.ts meta.type.declaration.ts entity.name.class.ts + source.ts meta.type.declaration.ts entity.name.type.ts ^ source.ts meta.type.declaration.ts ^^ - source.ts meta.type.declaration.ts keyword.operator.comparison.ts + source.ts meta.type.declaration.ts keyword.operator.assignment.ts ^^^^^^^^ source.ts meta.type.declaration.ts meta.type.name.ts >export const touch = thenify(tch) @@ -130,17 +130,17 @@ class Test { ^ source.ts meta.var.expr.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts > ^ source.ts @@ -157,7 +157,7 @@ class Test { source.ts comment.block.documentation.ts punctuation.definition.comment.ts >export function isFile(path: string): Promise { ^^^^^^ - source.ts meta.function.ts storage.type.ts + source.ts meta.function.ts keyword.control.export.ts ^ source.ts meta.function.ts ^^^^^^^^ @@ -167,7 +167,7 @@ class Test { ^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^^^ source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^ @@ -175,9 +175,9 @@ class Test { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -185,61 +185,61 @@ class Test { ^^^^^^^ source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > return stat(path).then(stat => stat.isFile(), () => false) ^ source.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^^^^^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^^^^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^^^^^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^^^^^ source.ts meta.function.ts meta.decl.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts keyword.operator.ts + source.ts meta.function.ts meta.decl.block.ts storage.type.function.arrow.ts ^^^^^^^^^^^^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts keyword.operator.ts + source.ts meta.function.ts meta.decl.block.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.decl.block.ts ^^^^^ source.ts meta.function.ts meta.decl.block.ts constant.language.boolean.false.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.paren.ts + source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.curly.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts @@ -256,7 +256,7 @@ class Test { ^ source.ts meta.var.expr.ts ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -264,25 +264,25 @@ class Test { ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts >export const writeFile = thenify(fs.writeFile) ^^^^^^ source.ts storage.type.ts @@ -293,7 +293,7 @@ class Test { ^ source.ts meta.var.expr.ts ^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -301,13 +301,13 @@ class Test { ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.brace.angle.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^ @@ -319,15 +319,15 @@ class Test { ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.paren.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts > ^ source.ts diff --git a/tests/baselines/pr48_noSemiColon.txt b/tests/baselines/pr48_noSemiColon.txt index 085c5d5c..25c8969d 100644 --- a/tests/baselines/pr48_noSemiColon.txt +++ b/tests/baselines/pr48_noSemiColon.txt @@ -28,47 +28,47 @@ class Test { ^^^^^^^ [2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^^^^ - [2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + [2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts > private options: TemplateOptions = {} ^^^^^^^ [3, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^^^^^^^ - [3, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + [3, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts > private state = {} ^^^^^^^ [4, 2]: source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^^^^^ - [4, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.ts + [4, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts >} > >export type Stats = fs.Stats ^^^^^^ [7, 1]: source.ts storage.type.ts ^^^^ - [7, 8]: source.ts meta.type.declaration.ts keyword.other.ts + [7, 8]: source.ts meta.type.declaration.ts storage.type.type.ts ^^^^^ - [7, 13]: source.ts meta.type.declaration.ts entity.name.class.ts + [7, 13]: source.ts meta.type.declaration.ts entity.name.type.ts >export const touch = thenify(tch) ^^^^^^ [8, 1]: source.ts storage.type.ts ^^^^^ [8, 8]: source.ts meta.var.expr.ts storage.type.ts ^^^^^ - [8, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + [8, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts > >/** > * Verify comments > */ >export function isFile(path: string): Promise { ^^^^^^ - [13, 1]: source.ts meta.function.ts storage.type.ts + [13, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^ [13, 8]: source.ts meta.function.ts storage.type.function.ts ^^^^^^^ [13, 39]: source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts > return stat(path).then(stat => stat.isFile(), () => false) ^^^^^^ - [14, 2]: source.ts meta.function.ts meta.decl.block.ts keyword.control.ts + [14, 2]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts >} > > @@ -78,13 +78,13 @@ class Test { ^^^^^ [18, 8]: source.ts meta.var.expr.ts storage.type.ts ^^^^^^ - [18, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [18, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts >export const writeFile = thenify(fs.writeFile) ^^^^^^ [19, 1]: source.ts storage.type.ts ^^^^^ [19, 8]: source.ts meta.var.expr.ts storage.type.ts ^^^^^^ - [19, 34]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.ts + [19, 34]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts > > \ No newline at end of file diff --git a/tests/baselines/regexp.baseline.txt b/tests/baselines/regexp.baseline.txt index 4a5f3d29..e04418b9 100644 --- a/tests/baselines/regexp.baseline.txt +++ b/tests/baselines/regexp.baseline.txt @@ -10,7 +10,7 @@ var x = /\s*\b(async\s+)?function\b/g; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -59,7 +59,7 @@ var x = /\s*\b(async\s+)?function\b/g; ^ source.ts meta.var.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ From 38cee99665f624cfda6bd8192b40bcf5f20a0cc2 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 16 Aug 2016 15:29:08 -0700 Subject: [PATCH 13/77] Workaround to distiguish attribute values from the string literals --- TypeScriptReact.YAML-tmLanguage | 26 +++++++++----- TypeScriptReact.tmLanguage | 47 ++++++++++++++++++++----- TypeScriptReact.tmTheme | 9 +++++ tests/baselines/TsxSamples.baseline.txt | 30 ++++++++-------- tests/baselines/TsxSamples.txt | 10 +++--- 5 files changed, 86 insertions(+), 36 deletions(-) diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 3cfd1d95..6880b6d4 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -894,26 +894,26 @@ repository: match: =(?=\s*(?:'|"|{|/\*|//|\n)) jsx-string-double-quoted: - name: string.quoted.double.tsx + name: string.jsxAttributeValue.quoted.double.tsx begin: '"' end: '"' beginCaptures: - '0': {name: punctuation.definition.string.begin.tsx} + '0': {name: punctuation.definition.string.jsxAttributeValue.begin.tsx} endCaptures: - '0': {name: punctuation.definition.string.end.tsx} + '0': {name: punctuation.definition.string.jsxAttributeValue.end.tsx} patterns: - - include: '#jsx-entities' + - include: '#jsx-attributeValue-entities' jsx-string-single-quoted: - name: string.quoted.single.tsx + name: string.jsxAttributeValue.quoted.single.tsx begin: "'" end: "'" beginCaptures: - '0': {name: punctuation.definition.string.begin.tsx} + '0': {name: punctuation.definition.string.jsxAttributeValue.begin.tsx} endCaptures: - '0': {name: punctuation.definition.string.end.tsx} + '0': {name: punctuation.definition.string.jsxAttributeValue.end.tsx} patterns: - - include: '#jsx-entities' + - include: '#jsx-attributeValue-entities' jsx-entities: patterns: @@ -925,6 +925,16 @@ repository: - name: invalid.illegal.bad-ampersand.tsx match: '&' + jsx-attributeValue-entities: + patterns: + - name: constant.character.entity.jsxAttributeValue.tsx + match: (&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;) + captures: + '1': {name: punctuation.definition.entity.jsxAttributeValue.tsx} + '3': {name: punctuation.definition.entity.jsxAttributeValue.tsx} + - name: invalid.illegal.bad-ampersand.jsxAttributeValue.tsx + match: '&' + jsx-evaluated-code: name: meta.brace.curly.tsx begin: '{' diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 5850a4fd..f9475683 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -940,6 +940,37 @@ + jsx-attributeValue-entities + + patterns + + + captures + + 1 + + name + punctuation.definition.entity.jsxAttributeValue.tsx + + 3 + + name + punctuation.definition.entity.jsxAttributeValue.tsx + + + match + (&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;) + name + constant.character.entity.jsxAttributeValue.tsx + + + match + & + name + invalid.illegal.bad-ampersand.jsxAttributeValue.tsx + + + jsx-children patterns @@ -1042,7 +1073,7 @@ 0 name - punctuation.definition.string.begin.tsx + punctuation.definition.string.jsxAttributeValue.begin.tsx end @@ -1052,16 +1083,16 @@ 0 name - punctuation.definition.string.end.tsx + punctuation.definition.string.jsxAttributeValue.end.tsx name - string.quoted.double.tsx + string.jsxAttributeValue.quoted.double.tsx patterns include - #jsx-entities + #jsx-attributeValue-entities @@ -1074,7 +1105,7 @@ 0 name - punctuation.definition.string.begin.tsx + punctuation.definition.string.jsxAttributeValue.begin.tsx end @@ -1084,16 +1115,16 @@ 0 name - punctuation.definition.string.end.tsx + punctuation.definition.string.jsxAttributeValue.end.tsx name - string.quoted.single.tsx + string.jsxAttributeValue.quoted.single.tsx patterns include - #jsx-entities + #jsx-attributeValue-entities diff --git a/TypeScriptReact.tmTheme b/TypeScriptReact.tmTheme index 78b59912..20fbeef7 100644 --- a/TypeScriptReact.tmTheme +++ b/TypeScriptReact.tmTheme @@ -150,6 +150,15 @@ xml literal - attribute value --> + + scope + string.jsxAttributeValue, punctuation.definition.string.jsxAttributeValue, constant.character.entity.jsxAttributeValue.tsx, punctuation.definition.entity.jsxAttributeValue.tsx, invalid.illegal.bad-ampersand.jsxAttributeValue.tsx + settings + + vsclassificationtype + xml literal - attribute value + + scope diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index 551f5c91..03440558 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -208,11 +208,11 @@ var e =
^ source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ - source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.double.tsx punctuation.definition.string.jsxAttributeValue.begin.tsx ^ - source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.double.tsx ^ - source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.double.tsx punctuation.definition.string.jsxAttributeValue.end.tsx ^ source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx ^^ @@ -231,11 +231,11 @@ var e =
^ source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ - source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.double.tsx punctuation.definition.string.jsxAttributeValue.begin.tsx ^ - source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.double.tsx ^ - source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.double.tsx punctuation.definition.string.jsxAttributeValue.end.tsx ^ source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx ^^ @@ -306,11 +306,11 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.single.tsx punctuation.definition.string.jsxAttributeValue.begin.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.single.tsx punctuation.definition.string.jsxAttributeValue.end.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx ^^ @@ -329,11 +329,11 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.single.tsx punctuation.definition.string.jsxAttributeValue.begin.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.single.tsx punctuation.definition.string.jsxAttributeValue.end.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx ^^ @@ -824,11 +824,11 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.double.tsx punctuation.definition.string.jsxAttributeValue.begin.tsx ^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx string.quoted.double.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.double.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.double.tsx punctuation.definition.string.jsxAttributeValue.end.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx ^^ diff --git a/tests/baselines/TsxSamples.txt b/tests/baselines/TsxSamples.txt index 0fd9340c..64b44736 100644 --- a/tests/baselines/TsxSamples.txt +++ b/tests/baselines/TsxSamples.txt @@ -94,7 +94,7 @@ var e =
^^^^ [14, 24]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - [14, 30]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx + [14, 30]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.double.tsx > ^ [15, 13]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx @@ -103,7 +103,7 @@ var e =
^^^^ [15, 24]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - [15, 30]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.double.tsx + [15, 30]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.double.tsx > ^^ [16, 9]: source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx @@ -134,7 +134,7 @@ var e =
^^^^ [22, 24]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - [22, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx + [22, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.single.tsx > ^ [23, 13]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx @@ -143,7 +143,7 @@ var e =
^^^^ [23, 24]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - [23, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.quoted.single.tsx + [23, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.single.tsx > ^^ [24, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx @@ -224,5 +224,5 @@ var e =
[51, 48]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx >var e =
^^^ - [52, 37]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx string.quoted.double.tsx + [52, 37]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.double.tsx > \ No newline at end of file From b7a6c22be93d95a8f3d2e14be7ab7f645f545ecb Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 17 Aug 2016 11:09:38 -0700 Subject: [PATCH 14/77] Few simplifications for type-name and primitive types --- TypeScript.YAML-tmLanguage | 8 +- TypeScript.tmLanguage | 20 +-- TypeScriptReact.YAML-tmLanguage | 8 +- TypeScriptReact.tmLanguage | 20 +-- tests/baselines/Abstracts.baseline.txt | 6 +- ...owFunctionInsideTypeAssertion.baseline.txt | 26 ++-- .../ArrowFunctionInsideTypeAssertion.txt | 16 +- tests/baselines/Comments.baseline.txt | 140 +++++++++--------- .../FunctionMethodOverloads.baseline.txt | 68 ++++----- .../FunctionMethodParameters.baseline.txt | 68 ++++----- .../FunctionMethodReturnTypes.baseline.txt | 80 +++++----- tests/baselines/Issue149.baseline.txt | 20 +-- tests/baselines/Issue149.txt | 6 +- tests/baselines/Issue156.baseline.txt | 4 +- tests/baselines/Issue156.txt | 4 +- tests/baselines/Issue191.baseline.txt | 16 +- tests/baselines/Issue191.txt | 16 +- tests/baselines/Issue208.baseline.txt | 24 +-- tests/baselines/Issue208.txt | 24 +-- tests/baselines/Issue32.baseline.txt | 8 +- tests/baselines/Issue32.txt | 4 +- tests/baselines/Issue37.baseline.txt | 10 +- tests/baselines/Issue37.txt | 2 +- tests/baselines/Issue44.baseline.txt | 4 +- tests/baselines/Issue44.txt | 4 +- tests/baselines/Issue63.baseline.txt | 60 ++++---- tests/baselines/Issue63.txt | 14 +- tests/baselines/Issue82.baseline.txt | 4 +- tests/baselines/Issue82.txt | 2 +- .../ParameterProperties.baseline.txt | 6 +- tests/baselines/TsxSamples.baseline.txt | 4 +- tests/baselines/docComments.baseline.txt | 4 +- .../multipleVariableDeclaration.baseline.txt | 8 +- tests/baselines/pr48_noSemiColon.baseline.txt | 20 +-- tests/baselines/pr48_noSemiColon.txt | 4 +- 35 files changed, 346 insertions(+), 386 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 9aae2db8..4bdaed88 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -354,10 +354,8 @@ repository: - include: '#variable-initializer' type-primitive: - name: meta.type.primitive.ts + name: support.type.primitive.ts match: '\b(string|number|boolean|symbol|any|void|never)\b' - captures: - '1': { name: support.type.primitive.ts } # Parenthesis can contain either types and function parameters # (number | string) or (param: number, param2: string) @@ -407,10 +405,8 @@ repository: - include: '#comment' type-name: - name: meta.type.name.ts + name: entity.name.type.ts match: '[a-zA-Z_$][.\w$]*' - captures: - '1': { name: entity.name.type.ts } type-parameters: name: meta.type.parameters.ts diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index f810655f..93e54eb1 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -2298,18 +2298,10 @@ type-name - captures - - 1 - - name - entity.name.type.ts - - match [a-zA-Z_$][.\w$]* name - meta.type.name.ts + entity.name.type.ts type-object @@ -2460,18 +2452,10 @@ type-primitive - captures - - 1 - - name - support.type.primitive.ts - - match \b(string|number|boolean|symbol|any|void|never)\b name - meta.type.primitive.ts + support.type.primitive.ts type-tuple diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 6880b6d4..4243d84b 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -357,10 +357,8 @@ repository: - include: '#variable-initializer' type-primitive: - name: meta.type.primitive.tsx + name: support.type.primitive.tsx match: '\b(string|number|boolean|symbol|any|void|never)\b' - captures: - '1': { name: support.type.primitive.tsx } # Parenthesis can contain either types and function parameters # (number | string) or (param: number, param2: string) @@ -410,10 +408,8 @@ repository: - include: '#comment' type-name: - name: meta.type.name.tsx + name: entity.name.type.tsx match: '[a-zA-Z_$][.\w$]*' - captures: - '1': { name: entity.name.type.tsx } type-parameters: name: meta.type.parameters.tsx diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index f9475683..30485db7 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -2695,18 +2695,10 @@ type-name - captures - - 1 - - name - entity.name.type.tsx - - match [a-zA-Z_$][.\w$]* name - meta.type.name.tsx + entity.name.type.tsx type-object @@ -2857,18 +2849,10 @@ type-primitive - captures - - 1 - - name - support.type.primitive.tsx - - match \b(string|number|boolean|symbol|any|void|never)\b name - meta.type.primitive.tsx + support.type.primitive.tsx type-tuple diff --git a/tests/baselines/Abstracts.baseline.txt b/tests/baselines/Abstracts.baseline.txt index ba5dbc4b..21ded459 100644 --- a/tests/baselines/Abstracts.baseline.txt +++ b/tests/baselines/Abstracts.baseline.txt @@ -45,7 +45,7 @@ cow.makeSound(); ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > public yearsLeft() { return 20 - this.age; } @@ -103,7 +103,7 @@ cow.makeSound(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} @@ -236,7 +236,7 @@ cow.makeSound(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts entity.name.type.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index af7e71e9..417deeab 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -57,19 +57,19 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts ^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts ^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -79,7 +79,7 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts ^^^^ @@ -98,7 +98,7 @@ function f(x: string | ((value: string) => number)) { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.brace.round.ts ^ @@ -169,7 +169,7 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -181,11 +181,11 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -195,7 +195,7 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -276,11 +276,11 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -290,7 +290,7 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.decl.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 ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts ^^ diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt index d41fb7b3..a8a08c02 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt @@ -33,17 +33,17 @@ function f(x: string | ((value: string) => number)) { ^ [4, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^^^ - [4, 21]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + [4, 21]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts ^^^^^^^^^^^ - [4, 30]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + [4, 30]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts ^^^^^^^^^^^^ - [4, 43]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + [4, 43]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts ^^^^^^ - [4, 57]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts + [4, 57]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts support.type.primitive.ts ^^ [4, 65]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts storage.type.function.arrow.ts ^^^^ - [4, 68]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + [4, 68]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts ^^^^ [4, 73]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts constant.language.null.ts > setDisplay: (domNode: HTMLElement, desiredValue: string) => { @@ -64,13 +64,13 @@ function f(x: string | ((value: string) => number)) { ^ [17, 18]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - [17, 19]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.name.ts + [17, 19]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts ^^^^^^ - [17, 22]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts + [17, 22]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts support.type.primitive.ts ^^ [17, 30]: source.ts meta.function.ts meta.decl.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 ^^^^^^ - [17, 33]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + [17, 33]: source.ts meta.function.ts meta.decl.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 ^ [17, 39]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts ^^ diff --git a/tests/baselines/Comments.baseline.txt b/tests/baselines/Comments.baseline.txt index bd4eb519..171ee2fb 100644 --- a/tests/baselines/Comments.baseline.txt +++ b/tests/baselines/Comments.baseline.txt @@ -116,7 +116,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -151,7 +151,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -186,7 +186,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -213,7 +213,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^ @@ -248,7 +248,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -283,7 +283,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -318,7 +318,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -362,7 +362,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -395,7 +395,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -428,7 +428,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -453,7 +453,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^ @@ -486,7 +486,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -519,7 +519,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -1411,11 +1411,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^ @@ -1429,7 +1429,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^ @@ -1437,7 +1437,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^ @@ -1451,7 +1451,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts entity.name.type.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1459,7 +1459,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1474,11 +1474,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^^ @@ -1494,7 +1494,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^ @@ -1502,7 +1502,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^ @@ -1516,7 +1516,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts entity.name.type.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1524,7 +1524,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1539,11 +1539,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^ @@ -1559,7 +1559,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^ @@ -1567,7 +1567,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^ @@ -1581,7 +1581,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts entity.name.type.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1589,7 +1589,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1604,11 +1604,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^ @@ -1626,7 +1626,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^ @@ -1634,7 +1634,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^ @@ -1648,7 +1648,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts entity.name.type.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1656,7 +1656,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1671,11 +1671,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^ @@ -1689,7 +1689,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^ @@ -1697,7 +1697,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts ^^ @@ -1713,7 +1713,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts entity.name.type.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1721,7 +1721,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.type.annotation.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ @@ -1743,11 +1743,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^^^^^^^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^^^^^^^ @@ -1755,7 +1755,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^^^^^^^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^ @@ -1770,7 +1770,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^^^^^^^ @@ -1778,7 +1778,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ @@ -1790,7 +1790,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -1798,7 +1798,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} @@ -1814,11 +1814,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^^^^^^^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -1828,7 +1828,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^^^^^^^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^ @@ -1843,7 +1843,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^^^^^^^ @@ -1851,7 +1851,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ @@ -1863,7 +1863,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -1871,7 +1871,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} @@ -1887,11 +1887,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^^^^^^^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^^^^^^^ @@ -1901,7 +1901,7 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.declaration.object.ts meta.type.parameters.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^ @@ -1916,7 +1916,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^^^^^^^ @@ -1924,7 +1924,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ @@ -1936,7 +1936,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -1944,7 +1944,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} @@ -1973,7 +1973,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts entity.name.type.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ @@ -2000,7 +2000,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts entity.name.type.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ @@ -2027,7 +2027,7 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts entity.name.type.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ @@ -2063,7 +2063,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts entity.name.type.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ @@ -2094,7 +2094,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts entity.name.type.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ @@ -2125,7 +2125,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts entity.name.type.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ diff --git a/tests/baselines/FunctionMethodOverloads.baseline.txt b/tests/baselines/FunctionMethodOverloads.baseline.txt index c6ff4e82..9777f218 100644 --- a/tests/baselines/FunctionMethodOverloads.baseline.txt +++ b/tests/baselines/FunctionMethodOverloads.baseline.txt @@ -79,7 +79,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -99,7 +99,7 @@ abstract class C { ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts >export function testFunctionOverload(p: string) ^^^^^^ source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts @@ -120,7 +120,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts >export function testFunctionOverload(p: string []) @@ -143,7 +143,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -219,7 +219,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -248,7 +248,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -268,7 +268,7 @@ abstract class C { ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -285,7 +285,7 @@ abstract class C { ^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + source.ts meta.function.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ @@ -320,7 +320,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -342,7 +342,7 @@ abstract class C { ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts ^^ source.ts >export function testFunctionOverloadWithSemicolon(p: string); @@ -365,7 +365,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ @@ -390,7 +390,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ @@ -470,7 +470,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ @@ -499,7 +499,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -521,7 +521,7 @@ abstract class C { ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -538,7 +538,7 @@ abstract class C { ^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + source.ts meta.function.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ @@ -594,7 +594,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -614,7 +614,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts > public testMethodOverload(p: string) ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -633,7 +633,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts > public testMethodOverload(p: string []) @@ -654,7 +654,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -726,7 +726,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -753,7 +753,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -773,7 +773,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -790,7 +790,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ @@ -825,7 +825,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -847,7 +847,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > public testMethodOverloadWithSemicolon(p: string); @@ -868,7 +868,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ @@ -891,7 +891,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ @@ -967,7 +967,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ @@ -994,7 +994,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -1016,7 +1016,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1033,7 +1033,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ @@ -1078,7 +1078,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts > bar(): string; ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -1093,7 +1093,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} diff --git a/tests/baselines/FunctionMethodParameters.baseline.txt b/tests/baselines/FunctionMethodParameters.baseline.txt index 835e0ec8..4276afba 100644 --- a/tests/baselines/FunctionMethodParameters.baseline.txt +++ b/tests/baselines/FunctionMethodParameters.baseline.txt @@ -59,7 +59,7 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^^^ source.ts meta.function.ts meta.function.type.parameter.ts > m2: {}, @@ -87,7 +87,7 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -143,7 +143,7 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts > m6: (x:(string), y:[number, string]) => number, @@ -158,29 +158,29 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts entity.name.type.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts entity.name.type.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts support.type.primitive.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts ^ @@ -192,7 +192,7 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts > m7: Array, @@ -209,7 +209,7 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts ^^ @@ -226,11 +226,11 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^ @@ -269,11 +269,11 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^ @@ -300,7 +300,7 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -310,7 +310,7 @@ class testClass { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ @@ -322,7 +322,7 @@ class testClass { ^ source.ts meta.function.ts meta.return.type.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -381,7 +381,7 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m2: {}, @@ -409,7 +409,7 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -465,7 +465,7 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m6: (x:(string), y:[number, string]) => number, @@ -480,29 +480,29 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts ^ @@ -514,7 +514,7 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m7: Array, @@ -531,7 +531,7 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts ^^ @@ -548,11 +548,11 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^ @@ -591,11 +591,11 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^ @@ -622,7 +622,7 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -632,7 +632,7 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ @@ -644,7 +644,7 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt index 43a1b25c..ed0667ae 100644 --- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -60,7 +60,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -233,11 +233,11 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts support.type.primitive.ts ^^ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ @@ -288,7 +288,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts ^ @@ -359,7 +359,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -375,7 +375,7 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + source.ts meta.function.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ @@ -420,7 +420,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -438,7 +438,7 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + source.ts meta.function.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ @@ -483,7 +483,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -507,7 +507,7 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + source.ts meta.function.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ @@ -552,7 +552,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -574,7 +574,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -592,7 +592,7 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts new.expr.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + source.ts meta.function.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts ^ @@ -716,7 +716,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -724,7 +724,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -761,7 +761,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -769,7 +769,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -810,11 +810,11 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts support.type.primitive.ts ^^ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ @@ -824,7 +824,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -894,7 +894,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1071,11 +1071,11 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ @@ -1124,7 +1124,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts ^ @@ -1193,7 +1193,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1209,7 +1209,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ @@ -1252,7 +1252,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -1270,7 +1270,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ @@ -1313,7 +1313,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -1337,7 +1337,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ @@ -1380,7 +1380,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -1402,7 +1402,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -1420,7 +1420,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ @@ -1550,7 +1550,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1558,7 +1558,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1593,7 +1593,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1601,7 +1601,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ @@ -1640,11 +1640,11 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ @@ -1654,7 +1654,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^ diff --git a/tests/baselines/Issue149.baseline.txt b/tests/baselines/Issue149.baseline.txt index f324d5e6..bd3d8510 100644 --- a/tests/baselines/Issue149.baseline.txt +++ b/tests/baselines/Issue149.baseline.txt @@ -35,7 +35,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -55,7 +55,7 @@ original file ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.name.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts entity.name.type.ts >export function fn(s: string) ^^^^^^ source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts @@ -76,7 +76,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts >export function fn(n: number) @@ -99,7 +99,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts >export function fn(s: any) { @@ -122,7 +122,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -168,7 +168,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -190,7 +190,7 @@ original file ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.name.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts entity.name.type.ts ^^ source.ts >export function fn(s: string); @@ -213,7 +213,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ @@ -238,7 +238,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ @@ -263,7 +263,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ diff --git a/tests/baselines/Issue149.txt b/tests/baselines/Issue149.txt index 756006ca..71f7ca84 100644 --- a/tests/baselines/Issue149.txt +++ b/tests/baselines/Issue149.txt @@ -21,11 +21,11 @@ original file ^^ [1, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [1, 23]: source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + [1, 23]: source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^^^ [1, 32]: source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts ^^^^ - [1, 41]: source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.name.ts + [1, 41]: source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts entity.name.type.ts >export function fn(s: string) ^^^^^^ [2, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts @@ -54,7 +54,7 @@ original file ^^^ [8, 32]: source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts ^^^^ - [8, 42]: source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.type.name.ts + [8, 42]: source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts entity.name.type.ts >export function fn(s: string); ^^^^^^ [9, 1]: source.ts meta.function.ts keyword.control.export.ts diff --git a/tests/baselines/Issue156.baseline.txt b/tests/baselines/Issue156.baseline.txt index 317b4ff3..3db3c166 100644 --- a/tests/baselines/Issue156.baseline.txt +++ b/tests/baselines/Issue156.baseline.txt @@ -33,7 +33,7 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -55,7 +55,7 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^^ diff --git a/tests/baselines/Issue156.txt b/tests/baselines/Issue156.txt index 46fa6551..4ae05fc0 100644 --- a/tests/baselines/Issue156.txt +++ b/tests/baselines/Issue156.txt @@ -15,13 +15,13 @@ class Test { ^^ [2, 6]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ - [2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + [2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ [2, 19]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ [2, 23]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ - [2, 27]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + [2, 27]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts > { > ^^^^^^^^^ diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index c241614e..4c1521b2 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -51,7 +51,7 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -74,7 +74,7 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^ @@ -99,7 +99,7 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ @@ -188,11 +188,11 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.type.parameters.ts ^ @@ -217,7 +217,7 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -240,7 +240,7 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^ @@ -265,7 +265,7 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue191.txt b/tests/baselines/Issue191.txt index 7210429c..24aa54db 100644 --- a/tests/baselines/Issue191.txt +++ b/tests/baselines/Issue191.txt @@ -31,19 +31,19 @@ class Thing<^^T, ^^U> { ^^^^^^^ [2, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ - [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts > var prop = Q.defer(); ^^^^ [3, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^^^^^^ - [3, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [3, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ [3, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts > this.store = new Data(); ^^^^ [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^ - [4, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + [4, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts > gaze(path.join(this.content, "**/*.json"), (err, watch) => { ^^^^^^^^^^^^ [5, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts @@ -64,9 +64,9 @@ class Thing<^^T, ^^U> { > >class Thing { ^ - [11, 13]: source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + [11, 13]: source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ - [11, 16]: source.ts meta.declaration.object.ts meta.type.parameters.ts meta.type.name.ts + [11, 16]: source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts > constructor(public content: string){ ^^^^^^^^^^^ [12, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts @@ -75,19 +75,19 @@ class Thing<^^T, ^^U> { ^^^^^^^ [12, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ - [12, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + [12, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts > var prop = Q.defer(); ^^^^ [13, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^^^^^^ - [13, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [13, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ [13, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts > this.store = new Data(); ^^^^ [14, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^ - [14, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts meta.type.name.ts + [14, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts > gaze(path.join(this.content, "**/*.json"), (err, watch) => { ^^^^^^^^^^^^ [15, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts diff --git a/tests/baselines/Issue208.baseline.txt b/tests/baselines/Issue208.baseline.txt index c464ce54..57bfabb8 100644 --- a/tests/baselines/Issue208.baseline.txt +++ b/tests/baselines/Issue208.baseline.txt @@ -32,11 +32,11 @@ class MyClass { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts ^ @@ -67,11 +67,11 @@ class MyClass { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^ @@ -124,11 +124,11 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts ^ @@ -163,11 +163,11 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts ^ @@ -205,11 +205,11 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts ^ @@ -240,11 +240,11 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts ^ diff --git a/tests/baselines/Issue208.txt b/tests/baselines/Issue208.txt index 17e0fbf4..80923825 100644 --- a/tests/baselines/Issue208.txt +++ b/tests/baselines/Issue208.txt @@ -18,9 +18,9 @@ class MyClass { ^^^^^ [1, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts ^^^^^^ - [1, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [1, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^^^^^^ - [1, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [1, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^^^^ [1, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ @@ -29,9 +29,9 @@ class MyClass { ^^^^^^^^^ [2, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts ^^^^^^ - [2, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [2, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^^^^^^ - [2, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [2, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^^^^ [2, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts ^ @@ -44,31 +44,31 @@ class MyClass { ^^^^^ [5, 27]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts ^^^^^^ - [5, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [5, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^^^^^^ - [5, 41]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [5, 41]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts > static someProp = makeThing('data'); ^^^^^^^^ [6, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^^^^ [6, 23]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.type.ts ^^^^^^ - [6, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [6, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts ^^^^^^ - [6, 41]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [6, 41]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts > > someProp = new Thing('data'); ^^^^^ [8, 20]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts entity.name.type.ts ^^^^^^ - [8, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [8, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^^^^^^ - [8, 34]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [8, 34]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts > someProp = makeThing('data'); ^^^^^^^^^ [9, 16]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.type.ts ^^^^^^ - [9, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [9, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts ^^^^^^ - [9, 34]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [9, 34]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts >} \ No newline at end of file diff --git a/tests/baselines/Issue32.baseline.txt b/tests/baselines/Issue32.baseline.txt index 7c3348c6..85e41d61 100644 --- a/tests/baselines/Issue32.baseline.txt +++ b/tests/baselines/Issue32.baseline.txt @@ -67,7 +67,7 @@ original file ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts >} @@ -121,7 +121,7 @@ original file ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -156,7 +156,7 @@ original file ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ @@ -168,7 +168,7 @@ original file ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ diff --git a/tests/baselines/Issue32.txt b/tests/baselines/Issue32.txt index 3c38e53f..6350fa70 100644 --- a/tests/baselines/Issue32.txt +++ b/tests/baselines/Issue32.txt @@ -60,11 +60,11 @@ original file ^ [16, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ - [16, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + [16, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ [16, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ - [16, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + [16, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts >} > ^ diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index a1c13b06..46cdf8f8 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -397,7 +397,7 @@ var j: I = {} ^ source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -438,7 +438,7 @@ var j: I = {} ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -466,7 +466,7 @@ var j: I = {} ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.name.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts entity.name.type.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ @@ -539,7 +539,7 @@ var j: I = {} ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -610,7 +610,7 @@ var j: I = {} ^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt index d546e481..c18b1e63 100644 --- a/tests/baselines/Issue37.txt +++ b/tests/baselines/Issue37.txt @@ -200,7 +200,7 @@ var j: I = {} ^^^^^^ [55, 21]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^ - [55, 29]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.name.ts + [55, 29]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts > this.parent = parent; ^^^^ [56, 13]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts diff --git a/tests/baselines/Issue44.baseline.txt b/tests/baselines/Issue44.baseline.txt index 07f9eca7..8758a8ae 100644 --- a/tests/baselines/Issue44.baseline.txt +++ b/tests/baselines/Issue44.baseline.txt @@ -34,7 +34,7 @@ original file ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > testfunc(): string; @@ -51,7 +51,7 @@ original file ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} diff --git a/tests/baselines/Issue44.txt b/tests/baselines/Issue44.txt index eafea979..98743732 100644 --- a/tests/baselines/Issue44.txt +++ b/tests/baselines/Issue44.txt @@ -22,12 +22,12 @@ original file ^^^^^^^ [3, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^ - [3, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.primitive.ts support.type.primitive.ts + [3, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts support.type.primitive.ts > testfunc(): string; ^^^^^^^^ [4, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [4, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + [4, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts >} ^ [5, 1]: source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts diff --git a/tests/baselines/Issue63.baseline.txt b/tests/baselines/Issue63.baseline.txt index db5612bc..b6197648 100644 --- a/tests/baselines/Issue63.baseline.txt +++ b/tests/baselines/Issue63.baseline.txt @@ -28,7 +28,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts ^ @@ -38,19 +38,19 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts ^^^^^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts ^^^^^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts ^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -60,7 +60,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.function.return.ts ^^^ - source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.type.declaration.ts meta.type.function.return.ts support.type.primitive.ts > ^ source.ts @@ -74,7 +74,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts ^ @@ -86,19 +86,19 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts ^^^^^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts ^^^^^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts ^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -108,7 +108,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.function.return.ts ^^^ - source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.type.declaration.ts meta.type.function.return.ts support.type.primitive.ts > ^ source.ts @@ -126,19 +126,19 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts ^^^^^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts ^^^^^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts ^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -148,7 +148,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.function.return.ts ^^^ - source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.type.declaration.ts meta.type.function.return.ts support.type.primitive.ts > ^ source.ts @@ -162,7 +162,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts ^ @@ -172,19 +172,19 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts ^^^^^^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts support.type.primitive.ts ^^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts ^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts ^^^^^^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts support.type.primitive.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -194,7 +194,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts ^^^^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts ^ @@ -204,19 +204,19 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts ^^^^^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts ^^^^^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts ^ - source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.paren.cover.ts entity.name.type.ts ^ source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^ @@ -226,7 +226,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.function.return.ts ^^^ - source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.type.declaration.ts meta.type.function.return.ts support.type.primitive.ts > ^ source.ts @@ -244,7 +244,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ source.ts meta.type.declaration.ts meta.type.parameters.ts ^ @@ -275,7 +275,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^^ source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts ^^^^^^ - source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts support.type.primitive.ts > ^ source.ts meta.type.declaration.ts meta.object.type.ts diff --git a/tests/baselines/Issue63.txt b/tests/baselines/Issue63.txt index e1e70280..ec1ffc65 100644 --- a/tests/baselines/Issue63.txt +++ b/tests/baselines/Issue63.txt @@ -22,7 +22,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^^^^^^^^ [1, 6]: source.ts meta.type.declaration.ts entity.name.type.ts ^ - [1, 16]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts + [1, 16]: source.ts meta.type.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ [1, 21]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts > @@ -36,13 +36,13 @@ type Callback = ^^(error: Error, value: T) => ^^any ^^ [3, 46]: source.ts meta.type.declaration.ts meta.type.function.return.ts storage.type.function.arrow.ts ^^^ - [3, 49]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + [3, 49]: source.ts meta.type.declaration.ts meta.type.function.return.ts support.type.primitive.ts > >type Callback = (error: Error, value: T) => any ^ [5, 17]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^ - [5, 45]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + [5, 45]: source.ts meta.type.declaration.ts meta.type.function.return.ts support.type.primitive.ts > >type Callback void> = (error: Error, value: T) => any ^^^^ @@ -56,11 +56,11 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ [7, 24]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^ - [7, 50]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + [7, 50]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts support.type.primitive.ts ^ [7, 58]: source.ts meta.type.declaration.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^ - [7, 86]: source.ts meta.type.declaration.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + [7, 86]: source.ts meta.type.declaration.ts meta.type.function.return.ts support.type.primitive.ts > > type Foo = { ^ @@ -68,7 +68,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^^^ [9, 7]: source.ts meta.type.declaration.ts entity.name.type.ts ^ - [9, 12]: source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.name.ts + [9, 12]: source.ts meta.type.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ [9, 18]: source.ts meta.type.declaration.ts meta.object.type.ts punctuation.definition.block.ts > @@ -81,7 +81,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^^^ [12, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^ - [12, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.primitive.ts support.type.primitive.ts + [12, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts support.type.primitive.ts > >} ^ diff --git a/tests/baselines/Issue82.baseline.txt b/tests/baselines/Issue82.baseline.txt index 62c92129..efdcee1a 100644 --- a/tests/baselines/Issue82.baseline.txt +++ b/tests/baselines/Issue82.baseline.txt @@ -38,7 +38,7 @@ class Foo { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^ @@ -65,7 +65,7 @@ class Foo { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts ^^ diff --git a/tests/baselines/Issue82.txt b/tests/baselines/Issue82.txt index 1a692d43..b5b95560 100644 --- a/tests/baselines/Issue82.txt +++ b/tests/baselines/Issue82.txt @@ -16,7 +16,7 @@ class Foo { ^^^^ [3, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts ^^^^^^ - [3, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + [3, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^^^^^^^^^ [3, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts > exitEditModeCallback: () => void // Used to re-enable View updates. diff --git a/tests/baselines/ParameterProperties.baseline.txt b/tests/baselines/ParameterProperties.baseline.txt index 9f17d003..0461c39b 100644 --- a/tests/baselines/ParameterProperties.baseline.txt +++ b/tests/baselines/ParameterProperties.baseline.txt @@ -38,7 +38,7 @@ class A { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ @@ -54,7 +54,7 @@ class A { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ @@ -70,7 +70,7 @@ class A { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index 03440558..f3cab48f 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -77,11 +77,11 @@ var e =
^ source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx punctuation.definition.typeparameters.begin.tsx ^^^^^ - source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx meta.type.name.tsx + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx entity.name.type.tsx ^^ source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx ^^^^^ - source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx meta.type.name.tsx + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx entity.name.type.tsx ^ source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx ^ diff --git a/tests/baselines/docComments.baseline.txt b/tests/baselines/docComments.baseline.txt index ec5279d1..c7811445 100644 --- a/tests/baselines/docComments.baseline.txt +++ b/tests/baselines/docComments.baseline.txt @@ -78,7 +78,7 @@ function foo(param1: string, param2: number) { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts ^ @@ -90,7 +90,7 @@ function foo(param1: string, param2: number) { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index 875ba179..93c7a6e3 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -96,7 +96,7 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -128,7 +128,7 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.function.return.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -172,7 +172,7 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ @@ -180,7 +180,7 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts support.type.primitive.ts ^^ source.ts >var obj = { diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index c1b585a0..99f2679c 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -119,7 +119,7 @@ class Test { ^^ source.ts meta.type.declaration.ts keyword.operator.assignment.ts ^^^^^^^^ - source.ts meta.type.declaration.ts meta.type.name.ts + source.ts meta.type.declaration.ts entity.name.type.ts >export const touch = thenify(tch) ^^^^^^ source.ts storage.type.ts @@ -175,7 +175,7 @@ class Test { ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ @@ -187,7 +187,7 @@ class Test { ^ source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^ - source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts ^ @@ -266,15 +266,15 @@ class Test { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^ @@ -303,11 +303,11 @@ class Test { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^ @@ -315,11 +315,11 @@ class Test { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.name.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^ diff --git a/tests/baselines/pr48_noSemiColon.txt b/tests/baselines/pr48_noSemiColon.txt index 25c8969d..c26f1d28 100644 --- a/tests/baselines/pr48_noSemiColon.txt +++ b/tests/baselines/pr48_noSemiColon.txt @@ -78,13 +78,13 @@ class Test { ^^^^^ [18, 8]: source.ts meta.var.expr.ts storage.type.ts ^^^^^^ - [18, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [18, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts >export const writeFile = thenify(fs.writeFile) ^^^^^^ [19, 1]: source.ts storage.type.ts ^^^^^ [19, 8]: source.ts meta.var.expr.ts storage.type.ts ^^^^^^ - [19, 34]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts meta.type.primitive.ts support.type.primitive.ts + [19, 34]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts > > \ No newline at end of file From 66a6ebaa3d02d58a16cb10c4168d465583657b16 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 17 Aug 2016 15:00:09 -0700 Subject: [PATCH 15/77] Fix the method return type, handle return type that is object type and object type's field declaration's type annotation --- TypeScript.YAML-tmLanguage | 19 +- TypeScript.tmLanguage | 53 +- TypeScriptReact.YAML-tmLanguage | 19 +- TypeScriptReact.tmLanguage | 53 +- tests/baselines/Abstracts.baseline.txt | 14 +- ...owFunctionInsideTypeAssertion.baseline.txt | 2 +- tests/baselines/Comments.baseline.txt | 24 +- .../FunctionMethodOverloads.baseline.txt | 204 ++-- .../FunctionMethodParameters.baseline.txt | 152 +-- tests/baselines/FunctionMethodParameters.txt | 40 +- .../FunctionMethodReturnTypes.baseline.txt | 514 +++++---- tests/baselines/FunctionMethodReturnTypes.txt | 6 +- tests/baselines/Issue149.baseline.txt | 16 +- tests/baselines/Issue153.baseline.txt | 986 ++++++++++++++++++ tests/baselines/Issue156.baseline.txt | 6 +- tests/baselines/Issue156.txt | 4 +- tests/baselines/Issue191.baseline.txt | 12 +- tests/baselines/Issue191.txt | 8 +- tests/baselines/Issue32.baseline.txt | 26 +- tests/baselines/Issue32.txt | 4 +- tests/baselines/Issue37.baseline.txt | 12 +- tests/baselines/Issue37.txt | 6 +- tests/baselines/Issue44.baseline.txt | 14 +- tests/baselines/Issue44.txt | 4 +- tests/baselines/Issue63.baseline.txt | 16 +- tests/baselines/Issue63.txt | 6 +- tests/baselines/Issue82.baseline.txt | 8 +- tests/baselines/Issue82.txt | 4 +- .../ParameterProperties.baseline.txt | 22 +- tests/baselines/ParameterProperties.txt | 6 +- tests/baselines/docComments.baseline.txt | 6 +- .../multipleVariableDeclaration.baseline.txt | 2 +- tests/baselines/pr48_noSemiColon.baseline.txt | 26 +- tests/cases/Issue153.ts | 57 + 34 files changed, 1833 insertions(+), 518 deletions(-) create mode 100644 tests/baselines/Issue153.baseline.txt create mode 100644 tests/cases/Issue153.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 4bdaed88..6365f860 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -183,6 +183,10 @@ repository: endCaptures: '0': { name: punctuation.definition.block.ts } patterns: + - include: '#type-object-members' + + type-object-members: + patterns: - include: '#comment' - include: '#field-declaration' - include: '#method-declaration' @@ -197,6 +201,8 @@ repository: '2': { name: keyword.operator.optional.ts } end: '(?=\}|;|,|$)|(?<=\})' patterns: + - include: '#ternary-expression' + - include: '#type-annotation' - include: '#expression' method-declaration: @@ -216,7 +222,7 @@ repository: - include: '#comment' - include: '#type-parameters' - include: '#function-type-parameters' - - include: '#type-annotation' + - include: '#return-type' - include: '#method-overload-declaration' - include: '#decl-block' @@ -302,7 +308,6 @@ repository: - include: '#expression' parameter-name: - name: parameter.name.ts match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??)' captures: '1': { name: storage.modifier.ts } @@ -315,6 +320,16 @@ repository: begin: '(?<=\))\s*:' end: (?=$)|(?=\{|;|//) patterns: + # Handle returning of object type specifically here so as to not confuse it with the start of function block + - name: meta.object.type.ts + begin: (?<=:)\s*(\{) + beginCaptures: + '1': { name: punctuation.definition.block.ts } + end: \} + endCaptures: + '0': { name: punctuation.definition.block.ts } + patterns: + - include: '#type-object-members' - include: '#type' type-annotation: diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 93e54eb1..1d5ea269 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -664,6 +664,14 @@ meta.field.declaration.ts patterns + + include + #ternary-expression + + + include + #type-annotation + include #expression @@ -1040,7 +1048,7 @@ include - #type-annotation + #return-type include @@ -1545,8 +1553,6 @@ match (?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??) - name - parameter.name.ts paren-expression @@ -1927,6 +1933,37 @@ meta.return.type.ts patterns + + begin + (?<=:)\s*(\{) + beginCaptures + + 1 + + name + punctuation.definition.block.ts + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.block.ts + + + name + meta.object.type.ts + patterns + + + include + #type-object-members + + + include #type @@ -2327,6 +2364,16 @@ name meta.object.type.ts + patterns + + + include + #type-object-members + + + + type-object-members + patterns diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 4243d84b..1d9663d5 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -186,6 +186,10 @@ repository: endCaptures: '0': { name: punctuation.definition.block.tsx } patterns: + - include: '#type-object-members' + + type-object-members: + patterns: - include: '#comment' - include: '#field-declaration' - include: '#method-declaration' @@ -200,6 +204,8 @@ repository: '2': { name: keyword.operator.optional.tsx } end: '(?=\}|;|,|$)|(?<=\})' patterns: + - include: '#ternary-expression' + - include: '#type-annotation' - include: '#expression' method-declaration: @@ -219,7 +225,7 @@ repository: - include: '#comment' - include: '#type-parameters' - include: '#function-type-parameters' - - include: '#type-annotation' + - include: '#return-type' - include: '#method-overload-declaration' - include: '#decl-block' @@ -305,7 +311,6 @@ repository: - include: '#expression' parameter-name: - name: parameter.name.tsx match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??)' captures: '1': { name: storage.modifier.tsx } @@ -318,6 +323,16 @@ repository: begin: '(?<=\))\s*:' end: (?=$)|(?=\{|;|//) patterns: + # Handle returning of object type specifically here so as to not confuse it with the start of function block + - name: meta.object.type.tsx + begin: (?<=:)\s*(\{) + beginCaptures: + '1': { name: punctuation.definition.block.tsx } + end: \} + endCaptures: + '0': { name: punctuation.definition.block.tsx } + patterns: + - include: '#type-object-members' - include: '#type' type-annotation: diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 30485db7..02b90df2 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -632,6 +632,14 @@ meta.field.declaration.tsx patterns + + include + #ternary-expression + + + include + #type-annotation + include #expression @@ -1437,7 +1445,7 @@ include - #type-annotation + #return-type include @@ -1942,8 +1950,6 @@ match (?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??) - name - parameter.name.tsx paren-expression @@ -2324,6 +2330,37 @@ meta.return.type.tsx patterns + + begin + (?<=:)\s*(\{) + beginCaptures + + 1 + + name + punctuation.definition.block.tsx + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.block.tsx + + + name + meta.object.type.tsx + patterns + + + include + #type-object-members + + + include #type @@ -2724,6 +2761,16 @@ name meta.object.type.tsx + patterns + + + include + #type-object-members + + + + type-object-members + patterns diff --git a/tests/baselines/Abstracts.baseline.txt b/tests/baselines/Abstracts.baseline.txt index 21ded459..b9725248 100644 --- a/tests/baselines/Abstracts.baseline.txt +++ b/tests/baselines/Abstracts.baseline.txt @@ -42,10 +42,12 @@ cow.makeSound(); source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts - ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > public yearsLeft() { return 20 - this.age; } @@ -99,11 +101,11 @@ cow.makeSound(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index 417deeab..1dc92f71 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -163,7 +163,7 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ diff --git a/tests/baselines/Comments.baseline.txt b/tests/baselines/Comments.baseline.txt index 171ee2fb..7e23f3c6 100644 --- a/tests/baselines/Comments.baseline.txt +++ b/tests/baselines/Comments.baseline.txt @@ -1784,7 +1784,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -1794,11 +1794,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} @@ -1857,7 +1857,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -1867,11 +1867,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} @@ -1930,7 +1930,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -1940,11 +1940,11 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} diff --git a/tests/baselines/FunctionMethodOverloads.baseline.txt b/tests/baselines/FunctionMethodOverloads.baseline.txt index 9777f218..8df5d40b 100644 --- a/tests/baselines/FunctionMethodOverloads.baseline.txt +++ b/tests/baselines/FunctionMethodOverloads.baseline.txt @@ -73,7 +73,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -114,7 +114,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -137,7 +137,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -166,7 +166,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -191,7 +191,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -200,16 +200,22 @@ abstract class C { source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ @@ -242,7 +248,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -314,7 +320,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -359,7 +365,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -384,7 +390,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -413,7 +419,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -440,7 +446,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -451,16 +457,26 @@ abstract class C { source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ @@ -493,7 +509,7 @@ abstract class C { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -588,7 +604,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -598,23 +614,23 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts > public testMethodOverload(p: string) ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -627,7 +643,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -648,7 +664,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -675,7 +691,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -698,7 +714,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -707,16 +723,22 @@ abstract class C { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ @@ -747,7 +769,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -757,25 +779,25 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > throw new Error("") @@ -819,7 +841,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -829,25 +851,25 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > public testMethodOverloadWithSemicolon(p: string); @@ -862,7 +884,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -885,7 +907,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -912,7 +934,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -937,7 +959,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -948,16 +970,26 @@ abstract class C { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ @@ -988,7 +1020,7 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -998,27 +1030,27 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > throw new Error("") @@ -1074,11 +1106,11 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts > bar(): string; ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -1089,11 +1121,11 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} diff --git a/tests/baselines/FunctionMethodParameters.baseline.txt b/tests/baselines/FunctionMethodParameters.baseline.txt index 4276afba..fcdd9dd6 100644 --- a/tests/baselines/FunctionMethodParameters.baseline.txt +++ b/tests/baselines/FunctionMethodParameters.baseline.txt @@ -51,9 +51,9 @@ class testClass { source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts > m1: string, ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.function.ts meta.function.type.parameter.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -64,9 +64,9 @@ class testClass { source.ts meta.function.ts meta.function.type.parameter.ts > m2: {}, ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.function.ts meta.function.type.parameter.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -79,9 +79,9 @@ class testClass { source.ts meta.function.ts meta.function.type.parameter.ts > m3: any [], ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.function.ts meta.function.type.parameter.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -98,9 +98,9 @@ class testClass { source.ts meta.function.ts meta.function.type.parameter.ts > m4: {a: A, b: B}, ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.function.ts meta.function.type.parameter.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -109,25 +109,33 @@ class testClass { source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ source.ts meta.function.ts meta.function.type.parameter.ts > m5: () => void, ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.function.ts meta.function.type.parameter.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -148,9 +156,9 @@ class testClass { source.ts meta.function.ts meta.function.type.parameter.ts > m6: (x:(string), y:[number, string]) => number, ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.function.ts meta.function.type.parameter.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -197,9 +205,9 @@ class testClass { source.ts meta.function.ts meta.function.type.parameter.ts > m7: Array, ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.function.ts meta.function.type.parameter.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -216,9 +224,9 @@ class testClass { source.ts meta.function.ts meta.function.type.parameter.ts > m8: [number, number], ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.function.ts meta.function.type.parameter.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -237,9 +245,9 @@ class testClass { source.ts meta.function.ts meta.function.type.parameter.ts > m9: {a: A, b: B} | [number, number], ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.function.ts meta.function.type.parameter.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -248,16 +256,24 @@ class testClass { source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ @@ -280,9 +296,9 @@ class testClass { source.ts meta.function.ts meta.function.type.parameter.ts > m10: (() => void) | string[]): number { ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.function.ts meta.function.type.parameter.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -373,9 +389,9 @@ class testClass { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts > m1: string, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -386,9 +402,9 @@ class testClass { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m2: {}, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -401,9 +417,9 @@ class testClass { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m3: any [], ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -420,9 +436,9 @@ class testClass { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m4: {a: A, b: B}, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -431,25 +447,33 @@ class testClass { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m5: () => void, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -470,9 +494,9 @@ class testClass { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m6: (x:(string), y:[number, string]) => number, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -519,9 +543,9 @@ class testClass { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m7: Array, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -538,9 +562,9 @@ class testClass { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m8: [number, number], ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -559,9 +583,9 @@ class testClass { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m9: {a: A, b: B} | [number, number], ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -570,16 +594,24 @@ class testClass { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ @@ -602,9 +634,9 @@ class testClass { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts > m10: (() => void) | string[]): number { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -640,13 +672,13 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > return m6.length; diff --git a/tests/baselines/FunctionMethodParameters.txt b/tests/baselines/FunctionMethodParameters.txt index 9e646974..70cb7a05 100644 --- a/tests/baselines/FunctionMethodParameters.txt +++ b/tests/baselines/FunctionMethodParameters.txt @@ -37,34 +37,34 @@ class testClass { >function testFunctionParamType( > m1: string, ^^ - [3, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [3, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts > m2: {}, ^^ - [4, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [4, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts > m3: any [], ^^ - [5, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [5, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts > m4: {a: A, b: B}, ^^ - [6, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [6, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts > m5: () => void, ^^ - [7, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [7, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts > m6: (x:(string), y:[number, string]) => number, ^^ - [8, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [8, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts > m7: Array, ^^ - [9, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [9, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts > m8: [number, number], ^^ - [10, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [10, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts > m9: {a: A, b: B} | [number, number], ^^ - [11, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [11, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts > m10: (() => void) | string[]): number { ^^^ - [12, 5]: source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [12, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts > return m6.length; ^^^^^^ [13, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts @@ -75,34 +75,34 @@ class testClass { > public testMethodParamType( > m1: string, ^^ - [19, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [19, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts > m2: {}, ^^ - [20, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [20, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts > m3: any [], ^^ - [21, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [21, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts > m4: {a: A, b: B}, ^^ - [22, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [22, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts > m5: () => void, ^^ - [23, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [23, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts > m6: (x:(string), y:[number, string]) => number, ^^ - [24, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [24, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts > m7: Array, ^^ - [25, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [25, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts > m8: [number, number], ^^ - [26, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [26, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts > m9: {a: A, b: B} | [number, number], ^^ - [27, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [27, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts > m10: (() => void) | string[]): number { ^^^ - [28, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [28, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts > return m6.length; ^^^^^^ [29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt index ed0667ae..ce5533db 100644 --- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -107,29 +107,29 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.return.type.ts + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts + source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >export function testFunctionReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -148,69 +148,87 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.return.type.ts + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts - ^^^^^^^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts + source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.block.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts ^^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >export function testFunctionReturnType4(): [number, number] { return [1, 1] } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -623,79 +641,97 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.return.type.ts + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts - ^^^^^^^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts + source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts + source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts ^^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^^^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >export function testFunctionReturnType11(): number | string { return 1 } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -890,19 +926,19 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ @@ -937,15 +973,15 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ @@ -976,27 +1012,35 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ @@ -1065,21 +1109,21 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts support.type.primitive.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ @@ -1116,19 +1160,19 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ @@ -1175,27 +1219,27 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ @@ -1236,27 +1280,27 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ @@ -1297,33 +1341,33 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ @@ -1364,49 +1408,49 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts keyword.operator.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ @@ -1447,33 +1491,41 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ @@ -1546,21 +1598,21 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts keyword.operator.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ @@ -1589,27 +1641,27 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts keyword.operator.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ @@ -1634,35 +1686,35 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts support.type.primitive.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts keyword.operator.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts keyword.operator.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ diff --git a/tests/baselines/FunctionMethodReturnTypes.txt b/tests/baselines/FunctionMethodReturnTypes.txt index 61ecba32..a533b777 100644 --- a/tests/baselines/FunctionMethodReturnTypes.txt +++ b/tests/baselines/FunctionMethodReturnTypes.txt @@ -47,14 +47,14 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ [3, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [3, 49]: source.ts meta.block.ts keyword.control.flow.ts + [3, 49]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts >export function testFunctionReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} } ^^^^^^ [4, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [4, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [4, 59]: source.ts meta.block.ts keyword.control.flow.ts + [4, 59]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts >export function testFunctionReturnType4(): [number, number] { return [1, 1] } ^^^^^^ [5, 1]: source.ts meta.function.ts keyword.control.export.ts @@ -103,7 +103,7 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^^ [11, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [11, 63]: source.ts meta.block.ts keyword.control.flow.ts + [11, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts >export function testFunctionReturnType11(): number | string { return 1 } ^^^^^^ [12, 1]: source.ts meta.function.ts keyword.control.export.ts diff --git a/tests/baselines/Issue149.baseline.txt b/tests/baselines/Issue149.baseline.txt index bd3d8510..4cc44879 100644 --- a/tests/baselines/Issue149.baseline.txt +++ b/tests/baselines/Issue149.baseline.txt @@ -29,7 +29,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -70,7 +70,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -93,7 +93,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -116,7 +116,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -162,7 +162,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -207,7 +207,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -232,7 +232,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -257,7 +257,7 @@ original file ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ diff --git a/tests/baselines/Issue153.baseline.txt b/tests/baselines/Issue153.baseline.txt new file mode 100644 index 00000000..1c85c53b --- /dev/null +++ b/tests/baselines/Issue153.baseline.txt @@ -0,0 +1,986 @@ +original file +----------------------------------- +import {Vector3, Vector} from 'vectors'; + +/** + * A simple 3x3 matrix structure. + * + * @export + * @class Matrix3x3 + */ +class Matrix { + public M11 : number; + public M12 : number; + public M13 : number; + public M21 : number; + public M22 : number; + public M23 : number; + public M31 : number; + public M32 : number; + public M33 : number; + + + /** + * Gets a column as a new vector. + * + * @param {number} index The index of the column (0 .. 2). + * @returns {Vector3} A vector representing the column. + */ + public getColumn_Breaks(index : number) : Vector3 { + if (index == 0) { + return new Vector3(this.M11, this.M21, this.M31); + } else if (index == 1) { + return new Vector3(this.M12, this.M22, this.M32); + } else if (index == 2) { + return new Vector3(this.M13, this.M23, this.M33); + } else { + throw new RangeError('Invalid matrix 3x3 column index: ' + index); + } + } + + /** + * Gets a column as a new vector. + * + * @param {number} index The index of the column (0 .. 2). + * @returns {Vector3} A vector representing the column. + */ + public getColumn_Works(index : number) : Vector { + if (index == 0) { + return new Vector(this.M11, this.M21, this.M31); + } else if (index == 1) { + return new Vector(this.M12, this.M22, this.M32); + } else if (index == 2) { + return new Vector(this.M13, this.M23, this.M33); + } else { + throw new RangeError('Invalid matrix 3x3 column index: ' + index); + } + } + +} +----------------------------------- + +>import {Vector3, Vector} from 'vectors'; + ^^^^^^ + source.ts keyword.control.import.ts + ^ + source.ts + ^ + source.ts meta.block.ts punctuation.definition.block.ts + ^^^^^^^^^^^^^^^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts + ^^^^ + source.ts keyword.control.from.ts + ^ + source.ts + ^ + source.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^^^ + source.ts string.quoted.single.ts + ^ + source.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^^^ + source.ts +> + ^^ + source.ts +>/** + ^^^ + source.ts comment.block.documentation.ts punctuation.definition.comment.ts + ^^ + source.ts comment.block.documentation.ts +> * A simple 3x3 matrix structure. + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.block.documentation.ts +> * + ^^^^^ + source.ts comment.block.documentation.ts +> * @export + ^^^ + source.ts comment.block.documentation.ts + ^^^^^^^ + source.ts comment.block.documentation.ts storage.type.class.jsdoc + ^^ + source.ts comment.block.documentation.ts +> * @class Matrix3x3 + ^^^ + source.ts comment.block.documentation.ts + ^^^^^^ + source.ts comment.block.documentation.ts storage.type.class.jsdoc + ^^^^^^^^^^^^ + source.ts comment.block.documentation.ts +> */ + ^ + source.ts comment.block.documentation.ts + ^^ + source.ts comment.block.documentation.ts punctuation.definition.comment.ts + ^^ + source.ts +>class Matrix { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public M11 : number; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public M12 : number; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public M13 : number; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public M21 : number; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public M22 : number; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public M23 : number; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public M31 : number; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public M32 : number; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public M33 : number; + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> /** + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts punctuation.definition.comment.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts +> * Gets a column as a new vector. + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts +> * + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts +> * @param {number} index The index of the column (0 .. 2). + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts storage.type.class.jsdoc + ^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc entity.name.type.instance.jsdoc + ^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc variable.other.jsdoc + ^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc other.description.jsdoc +> * @returns {Vector3} A vector representing the column. + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts storage.type.class.jsdoc + ^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc entity.name.type.instance.jsdoc + ^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc + ^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc variable.other.jsdoc + ^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc other.description.jsdoc +> */ + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts punctuation.definition.comment.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public getColumn_Breaks(index : number) : Vector3 { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> if (index == 0) { + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> return new Vector3(this.M11, this.M21, this.M31); + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> } else if (index == 1) { + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> return new Vector3(this.M12, this.M22, this.M32); + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> } else if (index == 2) { + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> return new Vector3(this.M13, this.M23, this.M33); + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> } else { + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> throw new RangeError('Invalid matrix 3x3 column index: ' + index); + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.trycatch.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + ^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.quoted.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.operator.arithmetic.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> } + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> /** + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts punctuation.definition.comment.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts +> * Gets a column as a new vector. + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts +> * + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts +> * @param {number} index The index of the column (0 .. 2). + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts storage.type.class.jsdoc + ^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc entity.name.type.instance.jsdoc + ^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc variable.other.jsdoc + ^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc other.description.jsdoc +> * @returns {Vector3} A vector representing the column. + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts storage.type.class.jsdoc + ^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc entity.name.type.instance.jsdoc + ^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc + ^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc variable.other.jsdoc + ^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts other.meta.jsdoc other.description.jsdoc +> */ + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts comment.block.documentation.ts punctuation.definition.comment.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public getColumn_Works(index : number) : Vector { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> if (index == 0) { + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> return new Vector(this.M11, this.M21, this.M31); + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> } else if (index == 1) { + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> return new Vector(this.M12, this.M22, this.M32); + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> } else if (index == 2) { + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> return new Vector(this.M13, this.M23, this.M33); + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> } else { + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> throw new RangeError('Invalid matrix 3x3 column index: ' + index); + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.trycatch.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + ^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.quoted.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.operator.arithmetic.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts +> } + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue156.baseline.txt b/tests/baselines/Issue156.baseline.txt index 3db3c166..e6e6798a 100644 --- a/tests/baselines/Issue156.baseline.txt +++ b/tests/baselines/Issue156.baseline.txt @@ -27,7 +27,7 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -47,9 +47,9 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ diff --git a/tests/baselines/Issue156.txt b/tests/baselines/Issue156.txt index 4ae05fc0..09be6158 100644 --- a/tests/baselines/Issue156.txt +++ b/tests/baselines/Issue156.txt @@ -13,13 +13,13 @@ class Test { ^^^ [2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^ - [2, 6]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [2, 6]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^^^^^^ [2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ [2, 19]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ - [2, 23]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [2, 23]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^^^^^^ [2, 27]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts > { diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index 4c1521b2..9e3b805e 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -41,11 +41,11 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -207,11 +207,11 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ diff --git a/tests/baselines/Issue191.txt b/tests/baselines/Issue191.txt index 24aa54db..ed9e0865 100644 --- a/tests/baselines/Issue191.txt +++ b/tests/baselines/Issue191.txt @@ -27,9 +27,9 @@ class Thing<^^T, ^^U> { ^^^^^^^^^^^ [2, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^^^^^^ - [2, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + [2, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts ^^^^^^^ - [2, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [2, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^^^^^^ [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts > var prop = Q.defer(); @@ -71,9 +71,9 @@ class Thing<^^T, ^^U> { ^^^^^^^^^^^ [12, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^^^^^^ - [12, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + [12, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts ^^^^^^^ - [12, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [12, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^^^^^^ [12, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts > var prop = Q.defer(); diff --git a/tests/baselines/Issue32.baseline.txt b/tests/baselines/Issue32.baseline.txt index 85e41d61..9461dd2b 100644 --- a/tests/baselines/Issue32.baseline.txt +++ b/tests/baselines/Issue32.baseline.txt @@ -49,8 +49,12 @@ original file source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts - ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > setVal(d: Data) @@ -61,7 +65,7 @@ original file ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -103,8 +107,12 @@ original file source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts - ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > setVal(d: Data){ @@ -115,7 +123,7 @@ original file ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -150,7 +158,7 @@ original file ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -160,9 +168,9 @@ original file ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ diff --git a/tests/baselines/Issue32.txt b/tests/baselines/Issue32.txt index 6350fa70..d7675c75 100644 --- a/tests/baselines/Issue32.txt +++ b/tests/baselines/Issue32.txt @@ -58,11 +58,11 @@ original file ^^^^^^^^^^^ [16, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - [16, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [16, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^^^^^^ [16, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ - [16, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [16, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^^^^^^ [16, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts >} diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index 46cdf8f8..ad3871f7 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -391,7 +391,7 @@ var j: I = {} ^ source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -589,8 +589,12 @@ var j: I = {} source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts - ^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^ + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts > @@ -604,7 +608,7 @@ var j: I = {} ^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt index c18b1e63..bf598abe 100644 --- a/tests/baselines/Issue37.txt +++ b/tests/baselines/Issue37.txt @@ -191,14 +191,14 @@ var j: I = {} [53, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^^^^^^ [53, 16]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts - ^^^^^^ - [53, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^ + [53, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts > > constructor(parent: Cell) { ^^^^^^^^^^^ [55, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^^^^^^ - [55, 21]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [55, 21]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^^^^ [55, 29]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts > this.parent = parent; diff --git a/tests/baselines/Issue44.baseline.txt b/tests/baselines/Issue44.baseline.txt index 8758a8ae..856e3ff6 100644 --- a/tests/baselines/Issue44.baseline.txt +++ b/tests/baselines/Issue44.baseline.txt @@ -31,10 +31,12 @@ original file source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts - ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > testfunc(): string; @@ -47,11 +49,11 @@ original file ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} diff --git a/tests/baselines/Issue44.txt b/tests/baselines/Issue44.txt index 98743732..af5d4ed1 100644 --- a/tests/baselines/Issue44.txt +++ b/tests/baselines/Issue44.txt @@ -22,12 +22,12 @@ original file ^^^^^^^ [3, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^ - [3, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts support.type.primitive.ts + [3, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts > testfunc(): string; ^^^^^^^^ [4, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [4, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.annotation.ts support.type.primitive.ts + [4, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts >} ^ [5, 1]: source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts diff --git a/tests/baselines/Issue63.baseline.txt b/tests/baselines/Issue63.baseline.txt index b6197648..d4b75b0a 100644 --- a/tests/baselines/Issue63.baseline.txt +++ b/tests/baselines/Issue63.baseline.txt @@ -263,8 +263,12 @@ type Callback = ^^(error: Error, value: T) => ^^any source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts ^^^ source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^^ source.ts meta.type.declaration.ts meta.object.type.ts > bar: number @@ -272,10 +276,12 @@ type Callback = ^^(error: Error, value: T) => ^^any source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts ^^^ source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^ - source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts support.type.primitive.ts + source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts > ^ source.ts meta.type.declaration.ts meta.object.type.ts diff --git a/tests/baselines/Issue63.txt b/tests/baselines/Issue63.txt index ec1ffc65..0b4569f0 100644 --- a/tests/baselines/Issue63.txt +++ b/tests/baselines/Issue63.txt @@ -75,13 +75,13 @@ type Callback = ^^(error: Error, value: T) => ^^any > foo: T, ^^^ [11, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts - ^^^ - [11, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts + ^ + [11, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts > bar: number ^^^ [12, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^ - [12, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts support.type.primitive.ts + [12, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts > >} ^ diff --git a/tests/baselines/Issue82.baseline.txt b/tests/baselines/Issue82.baseline.txt index efdcee1a..454ece23 100644 --- a/tests/baselines/Issue82.baseline.txt +++ b/tests/baselines/Issue82.baseline.txt @@ -30,9 +30,9 @@ class Foo { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts > test: number, // foo bar, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -47,9 +47,9 @@ class Foo { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts > exitEditModeCallback: () => void // Used to re-enable View updates. ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ diff --git a/tests/baselines/Issue82.txt b/tests/baselines/Issue82.txt index b5b95560..73536bd6 100644 --- a/tests/baselines/Issue82.txt +++ b/tests/baselines/Issue82.txt @@ -14,14 +14,14 @@ class Foo { > constructor( > test: number, // foo bar, ^^^^ - [3, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [3, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^^^^^^ [3, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^^^^^^^^^ [3, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts > exitEditModeCallback: () => void // Used to re-enable View updates. ^^^^^^^^^^^^^^^^^^^^ - [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ [4, 31]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/ParameterProperties.baseline.txt b/tests/baselines/ParameterProperties.baseline.txt index 0461c39b..b1d41c4a 100644 --- a/tests/baselines/ParameterProperties.baseline.txt +++ b/tests/baselines/ParameterProperties.baseline.txt @@ -28,11 +28,11 @@ class A { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -42,13 +42,13 @@ class A { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -58,13 +58,13 @@ class A { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ diff --git a/tests/baselines/ParameterProperties.txt b/tests/baselines/ParameterProperties.txt index 26a4c1ed..0294c84d 100644 --- a/tests/baselines/ParameterProperties.txt +++ b/tests/baselines/ParameterProperties.txt @@ -12,11 +12,11 @@ class A { >class A { > constructor(private a: string, protected b: string, public c: string) { ^^^^^^^ - [2, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + [2, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts ^^^^^^^^^ - [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts ^^^^^^ - [2, 54]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts parameter.name.ts storage.modifier.ts + [2, 54]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts > } > foo() { > return this.a + this.b + this.c; diff --git a/tests/baselines/docComments.baseline.txt b/tests/baselines/docComments.baseline.txt index c7811445..ee927bee 100644 --- a/tests/baselines/docComments.baseline.txt +++ b/tests/baselines/docComments.baseline.txt @@ -72,7 +72,7 @@ function foo(param1: string, param2: number) { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ @@ -82,9 +82,9 @@ function foo(param1: string, param2: number) { ^ source.ts meta.function.ts meta.function.type.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts + source.ts meta.function.ts meta.function.type.parameter.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index 93c7a6e3..45ecd966 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -51,7 +51,7 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index 99f2679c..40ee8fd0 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -43,14 +43,18 @@ class Test { source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts - ^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts ^ @@ -68,8 +72,14 @@ class Test { source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts - ^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts ^ @@ -169,7 +179,7 @@ class Test { ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts parameter.name.ts variable.parameter.ts + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ diff --git a/tests/cases/Issue153.ts b/tests/cases/Issue153.ts new file mode 100644 index 00000000..817c283b --- /dev/null +++ b/tests/cases/Issue153.ts @@ -0,0 +1,57 @@ +import {Vector3, Vector} from 'vectors'; + +/** + * A simple 3x3 matrix structure. + * + * @export + * @class Matrix3x3 + */ +class Matrix { + public M11 : number; + public M12 : number; + public M13 : number; + public M21 : number; + public M22 : number; + public M23 : number; + public M31 : number; + public M32 : number; + public M33 : number; + + + /** + * Gets a column as a new vector. + * + * @param {number} index The index of the column (0 .. 2). + * @returns {Vector3} A vector representing the column. + */ + public getColumn_Breaks(index : number) : Vector3 { + if (index == 0) { + return new Vector3(this.M11, this.M21, this.M31); + } else if (index == 1) { + return new Vector3(this.M12, this.M22, this.M32); + } else if (index == 2) { + return new Vector3(this.M13, this.M23, this.M33); + } else { + throw new RangeError('Invalid matrix 3x3 column index: ' + index); + } + } + + /** + * Gets a column as a new vector. + * + * @param {number} index The index of the column (0 .. 2). + * @returns {Vector3} A vector representing the column. + */ + public getColumn_Works(index : number) : Vector { + if (index == 0) { + return new Vector(this.M11, this.M21, this.M31); + } else if (index == 1) { + return new Vector(this.M12, this.M22, this.M32); + } else if (index == 2) { + return new Vector(this.M13, this.M23, this.M33); + } else { + throw new RangeError('Invalid matrix 3x3 column index: ' + index); + } + } + +} \ No newline at end of file From 543cc6a967a7957dbca1aab299b19f0f804a118d Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 17 Aug 2016 15:56:00 -0700 Subject: [PATCH 16/77] Fix the return type of function type when it is tuple or object type --- TypeScript.YAML-tmLanguage | 12 +- TypeScript.tmLanguage | 33 +- TypeScriptReact.YAML-tmLanguage | 12 +- TypeScriptReact.tmLanguage | 33 +- .../FunctionMethodOverloads.baseline.txt | 8 +- .../FunctionMethodReturnTypes.baseline.txt | 4 +- tests/baselines/Issue241.baseline.txt | 336 ++++++++++++++++++ .../multipleVariableDeclaration.baseline.txt | 2 +- tests/cases/Issue241.ts | 15 + 9 files changed, 444 insertions(+), 11 deletions(-) create mode 100644 tests/baselines/Issue241.baseline.txt create mode 100644 tests/cases/Issue241.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 6365f860..1ea8c4fe 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -403,8 +403,18 @@ repository: begin: '=>' beginCaptures: '0': { name: storage.type.function.arrow.ts } - end: (?=\s*[,\)\{=;>]|//|$) + end: (?=[,\]\)\{=;>]|//|$) patterns: + # Handle returning of object type specifically here so as to not confuse it with the start of function block + - name: meta.object.type.ts + begin: (?<==>)\s*(\{) + beginCaptures: + '1': { name: punctuation.definition.block.ts } + end: \} + endCaptures: + '0': { name: punctuation.definition.block.ts } + patterns: + - include: '#type-object-members' - include: '#type' type-tuple: diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 1d5ea269..5809caf6 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -2322,11 +2322,42 @@ end - (?=\s*[,\)\{=;>]|//|$) + (?=[,\]\)\{=;>]|//|$) name meta.type.function.return.ts patterns + + begin + (?<==>)\s*(\{) + beginCaptures + + 1 + + name + punctuation.definition.block.ts + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.block.ts + + + name + meta.object.type.ts + patterns + + + include + #type-object-members + + + include #type diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 1d9663d5..f92612fd 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -406,8 +406,18 @@ repository: begin: '=>' beginCaptures: '0': { name: storage.type.function.arrow.tsx } - end: (?=\s*[,\)\{=;>]|//|$) + end: (?=[,\]\)\{=;>]|//|$) patterns: + # Handle returning of object type specifically here so as to not confuse it with the start of function block + - name: meta.object.type.tsx + begin: (?<==>)\s*(\{) + beginCaptures: + '1': { name: punctuation.definition.block.tsx } + end: \} + endCaptures: + '0': { name: punctuation.definition.block.tsx } + patterns: + - include: '#type-object-members' - include: '#type' type-tuple: diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 02b90df2..00db8f9a 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -2719,11 +2719,42 @@ end - (?=\s*[,\)\{=;>]|//|$) + (?=[,\]\)\{=;>]|//|$) name meta.type.function.return.tsx patterns + + begin + (?<==>)\s*(\{) + beginCaptures + + 1 + + name + punctuation.definition.block.tsx + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.block.tsx + + + name + meta.object.type.tsx + patterns + + + include + #type-object-members + + + include #type diff --git a/tests/baselines/FunctionMethodOverloads.baseline.txt b/tests/baselines/FunctionMethodOverloads.baseline.txt index 8df5d40b..41f5a66e 100644 --- a/tests/baselines/FunctionMethodOverloads.baseline.txt +++ b/tests/baselines/FunctionMethodOverloads.baseline.txt @@ -276,7 +276,7 @@ abstract class C { ^^^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.return.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^ source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > throw new Error("") @@ -539,7 +539,7 @@ abstract class C { ^^^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.return.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^ source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > throw new Error("") @@ -797,7 +797,7 @@ abstract class C { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > throw new Error("") @@ -1050,7 +1050,7 @@ abstract class C { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > throw new Error("") diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt index ce5533db..64dd6cdb 100644 --- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -379,7 +379,7 @@ class TestClass { ^^^^^^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.return.type.ts + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^ source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ @@ -1239,7 +1239,7 @@ class TestClass { ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts ^ diff --git a/tests/baselines/Issue241.baseline.txt b/tests/baselines/Issue241.baseline.txt new file mode 100644 index 00000000..43a9f9e6 --- /dev/null +++ b/tests/baselines/Issue241.baseline.txt @@ -0,0 +1,336 @@ +original file +----------------------------------- +function f(): () => number { + const x = 0; +} +function foo(): [number, () => number] { + const x = 0; +} +function f(): () => number { + const x = 0; +} +function f2(): () => {x: number }{ + const x = 0; +} +function foo2(): [number, () => { x: number }] { + const x = 0; +} +----------------------------------- + +>function f(): () => number { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts + ^ + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts +> const x = 0; + ^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts meta.function.ts meta.decl.block.ts +>} + ^ + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + ^^ + source.ts +>function foo(): [number, () => number] { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts storage.type.function.arrow.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts +> const x = 0; + ^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts meta.function.ts meta.decl.block.ts +>} + ^ + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + ^^ + source.ts +>function f(): () => number { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts + ^ + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts +> const x = 0; + ^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts meta.function.ts meta.decl.block.ts +>} + ^ + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + ^^ + source.ts +>function f2(): () => {x: number }{ + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts storage.type.function.arrow.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.block.ts +> const x = 0; + ^^^^ + source.ts meta.block.ts meta.var.expr.ts + ^^^^^ + source.ts meta.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.block.ts meta.var.expr.ts + ^ + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^^ + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts meta.block.ts +>} + ^ + source.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +>function foo2(): [number, () => { x: number }] { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.paren.cover.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts + ^^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts storage.type.function.arrow.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts meta.object.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts +> const x = 0; + ^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + ^^^^^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts meta.function.ts meta.decl.block.ts +>} + ^ + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index 45ecd966..e2a69b52 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -130,7 +130,7 @@ var ^^obj = { ^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.function.return.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts ^ diff --git a/tests/cases/Issue241.ts b/tests/cases/Issue241.ts new file mode 100644 index 00000000..297e1bf5 --- /dev/null +++ b/tests/cases/Issue241.ts @@ -0,0 +1,15 @@ +function f(): () => number { + const x = 0; +} +function foo(): [number, () => number] { + const x = 0; +} +function f(): () => number { + const x = 0; +} +function f2(): () => {x: number }{ + const x = 0; +} +function foo2(): [number, () => { x: number }] { + const x = 0; +} \ No newline at end of file From 3fff5ced7b79f5bdc807c11b5f59f9ffb2c15657 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 17 Aug 2016 16:08:00 -0700 Subject: [PATCH 17/77] Fix the incorrect ternary operator colorizing in tsx file --- TypeScript.YAML-tmLanguage | 4 ++ TypeScript.tmLanguage | 16 +++++++ TypeScriptReact.YAML-tmLanguage | 5 ++ TypeScriptReact.tmLanguage | 20 ++++++++ tests/baselines/Issue124.baseline.txt | 20 ++++---- tests/baselines/Issue124.txt | 6 +-- tests/baselines/Issue239.baseline.txt | 66 +++++++++++++++++++++++++++ tests/cases/Issue239.tsx | 1 + 8 files changed, 125 insertions(+), 13 deletions(-) create mode 100644 tests/baselines/Issue239.baseline.txt create mode 100644 tests/cases/Issue239.tsx diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 1ea8c4fe..ea759a1f 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -41,7 +41,11 @@ repository: ternary-operator: begin: (\?) + beginCaptures: + '0': { name: keyword.operator.ternary.ts } end: (:) + endCaptures: + '0': { name: keyword.operator.ternary.ts } patterns: - include: '#expression-type' diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 5809caf6..cd05f0de 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -2185,8 +2185,24 @@ begin (\?) + beginCaptures + + 0 + + name + keyword.operator.ternary.ts + + end (:) + endCaptures + + 0 + + name + keyword.operator.ternary.ts + + patterns diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index f92612fd..f6a146fb 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -44,13 +44,18 @@ repository: ternary-operator: begin: (\?) + beginCaptures: + '0': { name: keyword.operator.ternary.tsx } end: (:) + endCaptures: + '0': { name: keyword.operator.ternary.tsx } patterns: - include: '#expression-type' expression-type: name: meta.expression.tsx patterns: + - include: '#jsx' - include: '#string' - include: '#regex' - include: '#template' diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 00db8f9a..fbd38b27 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -555,6 +555,10 @@ meta.expression.tsx patterns + + include + #jsx + include #string @@ -2582,8 +2586,24 @@ begin (\?) + beginCaptures + + 0 + + name + keyword.operator.ternary.tsx + + end (:) + endCaptures + + 0 + + name + keyword.operator.ternary.tsx + + patterns diff --git a/tests/baselines/Issue124.baseline.txt b/tests/baselines/Issue124.baseline.txt index cbd17fd8..95f67e7d 100644 --- a/tests/baselines/Issue124.baseline.txt +++ b/tests/baselines/Issue124.baseline.txt @@ -49,7 +49,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ @@ -57,7 +57,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ @@ -80,7 +80,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ @@ -88,7 +88,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -119,7 +119,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -131,7 +131,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -171,7 +171,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -193,7 +193,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ @@ -227,7 +227,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -239,7 +239,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ diff --git a/tests/baselines/Issue124.txt b/tests/baselines/Issue124.txt index 06792dcc..7f95fa5c 100644 --- a/tests/baselines/Issue124.txt +++ b/tests/baselines/Issue124.txt @@ -59,7 +59,7 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^^^ [10, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - [10, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + [10, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts ^ [10, 18]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^^^ @@ -75,11 +75,11 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; ^ [12, 24]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^ - [12, 30]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + [12, 30]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts ^ [12, 32]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^ - [12, 40]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + [12, 40]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts ^ [12, 42]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts > diff --git a/tests/baselines/Issue239.baseline.txt b/tests/baselines/Issue239.baseline.txt new file mode 100644 index 00000000..a765328a --- /dev/null +++ b/tests/baselines/Issue239.baseline.txt @@ -0,0 +1,66 @@ +original file +----------------------------------- + const test = (true) ?

Broken Color

:

Also Broken Color

+----------------------------------- + +> const test = (true) ?

Broken Color

:

Also Broken Color

+ ^ + source.tsx meta.var.expr.tsx + ^^^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.brace.round.tsx + ^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx constant.language.boolean.true.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.brace.round.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.ternary.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx + ^^^^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.ternary.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx + ^^^^^^^^^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx + ^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx \ No newline at end of file diff --git a/tests/cases/Issue239.tsx b/tests/cases/Issue239.tsx new file mode 100644 index 00000000..c45070ce --- /dev/null +++ b/tests/cases/Issue239.tsx @@ -0,0 +1 @@ + const test = (true) ?

Broken Color

:

Also Broken Color

\ No newline at end of file From eaeaa94d29faaae2678eccd96b2cab9e4f810be5 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 17 Aug 2016 16:17:57 -0700 Subject: [PATCH 18/77] Include comments in type declaration --- TypeScript.YAML-tmLanguage | 3 ++- TypeScript.tmLanguage | 6 ++++- TypeScriptReact.YAML-tmLanguage | 3 ++- TypeScriptReact.tmLanguage | 6 ++++- tests/baselines/Issue237.baseline.txt | 36 +++++++++++++++++++++++++++ tests/cases/Issue237.ts | 2 ++ 6 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 tests/baselines/Issue237.baseline.txt create mode 100644 tests/cases/Issue237.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index ea759a1f..d50ac9b9 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -99,8 +99,9 @@ repository: beginCaptures: '1': { name: storage.type.type.ts } '2': { name: entity.name.type.ts } - end: (?=$|[,);>]|var|type|function|class|interface) + end: (?=$|[,);>]|var|type|function|class|interface|namespace|enum|declare|export) patterns: + - include: '#comment' - include: '#type-parameters' - include: '#type' - name: keyword.operator.assignment.ts diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index cd05f0de..41c19a41 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -2304,11 +2304,15 @@ end - (?=$|[,);>]|var|type|function|class|interface) + (?=$|[,);>]|var|type|function|class|interface|namespace|enum|declare|export) name meta.type.declaration.ts patterns + + include + #comment + include #type-parameters diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index f6a146fb..0443d004 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -103,8 +103,9 @@ repository: beginCaptures: '1': { name: storage.type.type.tsx } '2': { name: entity.name.type.tsx } - end: (?=$|[,);>]|var|type|function|class|interface) + end: (?=$|[,);>]|var|type|function|class|interface|namespace|enum|declare|export) patterns: + - include: '#comment' - include: '#type-parameters' - include: '#type' - name: keyword.operator.assignment.tsx diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index fbd38b27..82f9550a 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -2705,11 +2705,15 @@ end - (?=$|[,);>]|var|type|function|class|interface) + (?=$|[,);>]|var|type|function|class|interface|namespace|enum|declare|export) name meta.type.declaration.tsx patterns + + include + #comment + include #type-parameters diff --git a/tests/baselines/Issue237.baseline.txt b/tests/baselines/Issue237.baseline.txt new file mode 100644 index 00000000..d7384efb --- /dev/null +++ b/tests/baselines/Issue237.baseline.txt @@ -0,0 +1,36 @@ +original file +----------------------------------- +export type Test = string // wrong comment color + // should be this +----------------------------------- + +>export type Test = string // wrong comment color + ^^^^^^ + source.ts storage.type.ts + ^ + source.ts + ^^^^ + source.ts meta.type.declaration.ts storage.type.type.ts + ^ + source.ts meta.type.declaration.ts + ^^^^ + source.ts meta.type.declaration.ts entity.name.type.ts + ^ + source.ts meta.type.declaration.ts + ^^ + source.ts meta.type.declaration.ts keyword.operator.assignment.ts + ^^^^^^ + source.ts meta.type.declaration.ts support.type.primitive.ts + ^ + source.ts meta.type.declaration.ts + ^^ + source.ts meta.type.declaration.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.type.declaration.ts comment.line.double-slash.ts +> // should be this + ^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.type.declaration.ts punctuation.whitespace.comment.leading.ts + ^^ + source.ts meta.type.declaration.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^^^^^^^^^^^ + source.ts meta.type.declaration.ts comment.line.double-slash.ts \ No newline at end of file diff --git a/tests/cases/Issue237.ts b/tests/cases/Issue237.ts new file mode 100644 index 00000000..ef15e2b1 --- /dev/null +++ b/tests/cases/Issue237.ts @@ -0,0 +1,2 @@ +export type Test = string // wrong comment color + // should be this \ No newline at end of file From b0b161da2573995f2e72d7e4d66c9c336bd61ba4 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 17 Aug 2016 16:29:15 -0700 Subject: [PATCH 19/77] Fix incorrect scope name for assignment --- TypeScript.YAML-tmLanguage | 2 +- TypeScript.tmLanguage | 2 +- TypeScriptReact.YAML-tmLanguage | 2 +- TypeScriptReact.tmLanguage | 2 +- ...owFunctionInsideTypeAssertion.baseline.txt | 2 +- tests/baselines/Comments.baseline.txt | 30 +++++++++---------- tests/baselines/Issue191.baseline.txt | 4 +-- tests/baselines/Issue200.baseline.txt | 2 +- tests/baselines/Issue208.baseline.txt | 8 ++--- tests/baselines/Issue262.baseline.txt | 4 +-- tests/baselines/Issue288.baseline.txt | 4 +-- tests/baselines/Issue32.baseline.txt | 2 +- tests/baselines/Issue335.baseline.txt | 8 ++--- tests/baselines/Issue37.baseline.txt | 8 ++--- tests/baselines/TsxSamples.baseline.txt | 4 +-- .../multipleVariableDeclaration.baseline.txt | 4 +-- tests/baselines/pr48_noSemiColon.baseline.txt | 6 ++-- 17 files changed, 47 insertions(+), 47 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index d50ac9b9..a36b82b1 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -614,7 +614,7 @@ repository: - name: keyword.operator.comparison.ts match: ===|!==|==|!= - name: keyword.operator.relational.ts - match: <=|>=|<>|=|<|> + match: <=|>=|<>|<|> - name: keyword.operator.logical.ts match: \!|&&|\|\| - name: keyword.operator.bitwise.ts diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 41c19a41..1cffea1d 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -1484,7 +1484,7 @@ match - <=|>=|<>|=|<|> + <=|>=|<>|<|> name keyword.operator.relational.ts diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 0443d004..2f2456c4 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -604,7 +604,7 @@ repository: - name: keyword.operator.comparison.tsx match: ===|!==|==|!= - name: keyword.operator.relational.tsx - match: <=|>=|<>|=|<|> + match: <=|>=|<>|<|> - name: keyword.operator.logical.tsx match: \!|&&|\|\| - name: keyword.operator.bitwise.tsx diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 82f9550a..0631ddd2 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -1885,7 +1885,7 @@ match - <=|>=|<>|=|<|> + <=|>=|<>|<|> name keyword.operator.relational.tsx diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index 1dc92f71..b58753dc 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -134,7 +134,7 @@ function f(x: string | ((value: string) => number)) { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts keyword.operator.assignment.ts ^^^^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts > } diff --git a/tests/baselines/Comments.baseline.txt b/tests/baselines/Comments.baseline.txt index 7e23f3c6..9494d038 100644 --- a/tests/baselines/Comments.baseline.txt +++ b/tests/baselines/Comments.baseline.txt @@ -120,7 +120,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -155,7 +155,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -190,7 +190,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -225,7 +225,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -252,7 +252,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -287,7 +287,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -322,7 +322,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -366,7 +366,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -399,7 +399,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -432,7 +432,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -465,7 +465,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -490,7 +490,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -523,7 +523,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -1967,7 +1967,7 @@ var x = new ^^/* comments */ String(); ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.operator.new.ts ^ @@ -2055,7 +2055,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index 9e3b805e..d938f7e2 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -91,7 +91,7 @@ class Thing<^^T, ^^U> { ^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ @@ -257,7 +257,7 @@ class Thing<^^T, ^^U> { ^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ diff --git a/tests/baselines/Issue200.baseline.txt b/tests/baselines/Issue200.baseline.txt index ec1627d4..2724b055 100644 --- a/tests/baselines/Issue200.baseline.txt +++ b/tests/baselines/Issue200.baseline.txt @@ -43,7 +43,7 @@ original file ^^^^^^^ source.ts meta.block.ts ^ - source.ts meta.block.ts keyword.operator.relational.ts + source.ts meta.block.ts keyword.operator.assignment.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.block.ts > export default alias; diff --git a/tests/baselines/Issue208.baseline.txt b/tests/baselines/Issue208.baseline.txt index 57bfabb8..61cddbbc 100644 --- a/tests/baselines/Issue208.baseline.txt +++ b/tests/baselines/Issue208.baseline.txt @@ -112,7 +112,7 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^ @@ -155,7 +155,7 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^^^ @@ -193,7 +193,7 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^ @@ -232,7 +232,7 @@ class MyClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^^^^ diff --git a/tests/baselines/Issue262.baseline.txt b/tests/baselines/Issue262.baseline.txt index d019695f..3a19abb2 100644 --- a/tests/baselines/Issue262.baseline.txt +++ b/tests/baselines/Issue262.baseline.txt @@ -19,7 +19,7 @@ for (^^let a = 1; a ^^< 10; a++) { ^^^ source.ts ^ - source.ts keyword.operator.relational.ts + source.ts keyword.operator.assignment.ts ^ source.ts ^ @@ -56,7 +56,7 @@ for (^^let a = 1; a ^^< 10; a++) { ^^^ source.ts meta.block.ts ^ - source.ts meta.block.ts keyword.operator.relational.ts + source.ts meta.block.ts keyword.operator.assignment.ts ^ source.ts meta.block.ts ^ diff --git a/tests/baselines/Issue288.baseline.txt b/tests/baselines/Issue288.baseline.txt index e374f7bd..ed88672b 100644 --- a/tests/baselines/Issue288.baseline.txt +++ b/tests/baselines/Issue288.baseline.txt @@ -146,7 +146,7 @@ return^^Name+=1; ^^^^^^^^^^^^ source.ts ^ - source.ts keyword.operator.relational.ts + source.ts keyword.operator.assignment.ts ^ source.ts constant.numeric.decimal.ts ^^ @@ -195,7 +195,7 @@ return^^Name+=1; ^^^^^^^^^^^ source.ts ^ - source.ts keyword.operator.relational.ts + source.ts keyword.operator.assignment.ts ^ source.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ diff --git a/tests/baselines/Issue32.baseline.txt b/tests/baselines/Issue32.baseline.txt index 9461dd2b..230b4d23 100644 --- a/tests/baselines/Issue32.baseline.txt +++ b/tests/baselines/Issue32.baseline.txt @@ -142,7 +142,7 @@ original file ^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > } diff --git a/tests/baselines/Issue335.baseline.txt b/tests/baselines/Issue335.baseline.txt index dcd9362c..8920af11 100644 --- a/tests/baselines/Issue335.baseline.txt +++ b/tests/baselines/Issue335.baseline.txt @@ -92,7 +92,7 @@ class A4 { ^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -178,7 +178,7 @@ class A4 { ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -260,7 +260,7 @@ class A4 { ^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -398,7 +398,7 @@ class A4 { ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index ad3871f7..ae3b97fc 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -225,7 +225,7 @@ var j: I = {} ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ @@ -442,7 +442,7 @@ var j: I = {} ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -543,7 +543,7 @@ var j: I = {} ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -629,7 +629,7 @@ var j: I = {} ^^^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.relational.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts ^^^^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > if (typeof parent === 'object' || parent instanceof Error) { diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index f3cab48f..6267d75e 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -473,14 +473,14 @@ var e =
^^^^^^^^^^ source.tsx ^ - source.tsx keyword.operator.relational.tsx + source.tsx keyword.operator.assignment.tsx ^^^^ source.tsx >props.bar = y; ^^^^^^^^^^ source.tsx ^ - source.tsx keyword.operator.relational.tsx + source.tsx keyword.operator.assignment.tsx ^^^^ source.tsx >var component = ; diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index e2a69b52..8179bd82 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -100,7 +100,7 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -132,7 +132,7 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.type.function.return.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.relational.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index 40ee8fd0..f56181b5 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -56,7 +56,7 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ @@ -81,7 +81,7 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ @@ -100,7 +100,7 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.relational.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ From 153f123525f2ee0e0a966760865afa535b985e7e Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 17 Aug 2016 17:51:40 -0700 Subject: [PATCH 20/77] Fix the fn return type annotation when it is used inside the object type --- TypeScript.YAML-tmLanguage | 4 +- TypeScript.tmLanguage | 4 +- TypeScriptReact.YAML-tmLanguage | 4 +- TypeScriptReact.tmLanguage | 4 +- tests/baselines/Issue77.baseline.txt | 198 +++++++++++++++++++++++++++ tests/cases/Issue77.ts | 13 ++ 6 files changed, 219 insertions(+), 8 deletions(-) create mode 100644 tests/baselines/Issue77.baseline.txt create mode 100644 tests/cases/Issue77.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index a36b82b1..0022cd08 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -323,7 +323,7 @@ repository: return-type: name: meta.return.type.ts begin: '(?<=\))\s*:' - end: (?=$)|(?=\{|;|//) + end: (?' beginCaptures: '0': { name: storage.type.function.arrow.ts } - end: (?=[,\]\)\{=;>]|//|$) + end: (?)(?=[,\]\)\{\}=;>]|//|$) patterns: # Handle returning of object type specifically here so as to not confuse it with the start of function block - name: meta.object.type.ts diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 1cffea1d..cdfd5444 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -1928,7 +1928,7 @@ begin (?<=\))\s*: end - (?=$)|(?=\{|;|//) + (?<!:)((?=$)|(?=\{|;|//)) name meta.return.type.ts patterns @@ -2342,7 +2342,7 @@ end - (?=[,\]\)\{=;>]|//|$) + (?<!=>)(?=[,\]\)\{\}=;>]|//|$) name meta.type.function.return.ts patterns diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 2f2456c4..89a0eea4 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -327,7 +327,7 @@ repository: return-type: name: meta.return.type.tsx begin: '(?<=\))\s*:' - end: (?=$)|(?=\{|;|//) + end: (?' beginCaptures: '0': { name: storage.type.function.arrow.tsx } - end: (?=[,\]\)\{=;>]|//|$) + end: (?)(?=[,\]\)\{\}=;>]|//|$) patterns: # Handle returning of object type specifically here so as to not confuse it with the start of function block - name: meta.object.type.tsx diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 0631ddd2..c8f7b94c 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -2329,7 +2329,7 @@ begin (?<=\))\s*: end - (?=$)|(?=\{|;|//) + (?<!:)((?=$)|(?=\{|;|//)) name meta.return.type.tsx patterns @@ -2743,7 +2743,7 @@ end - (?=[,\]\)\{=;>]|//|$) + (?<!=>)(?=[,\]\)\{\}=;>]|//|$) name meta.type.function.return.tsx patterns diff --git a/tests/baselines/Issue77.baseline.txt b/tests/baselines/Issue77.baseline.txt new file mode 100644 index 00000000..2f61d833 --- /dev/null +++ b/tests/baselines/Issue77.baseline.txt @@ -0,0 +1,198 @@ +original file +----------------------------------- +// trailing part of some real code... + +null, <{[key]: () => any}> null + +// no syntax highlighting from here down... + +function foo():{a: string} { } + +null, <{[key]: () =>{a: number}}> null + +// no syntax highlighting from here down... + +function foo() { } +----------------------------------- + +>// trailing part of some real code... + ^^ + source.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.line.double-slash.ts +> + ^^ + source.ts +>null, <{[key]: () => any}> null + ^^^^ + source.ts constant.language.null.ts + ^ + source.ts + ^ + source.ts cast.expr.ts + ^ + source.ts cast.expr.ts meta.brace.angle.ts + ^ + source.ts cast.expr.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.indexer.declaration.ts meta.brace.square.ts + ^^^ + source.ts cast.expr.ts meta.object.type.ts meta.indexer.declaration.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.indexer.declaration.ts meta.brace.square.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts + ^^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.function.return.ts + ^^^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts + ^ + source.ts cast.expr.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts cast.expr.ts meta.brace.angle.ts + ^ + source.ts + ^^^^ + source.ts constant.language.null.ts + ^^ + source.ts +> + ^^ + source.ts +>// no syntax highlighting from here down... + ^^ + source.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.line.double-slash.ts +> + ^^ + source.ts +>function foo():{a: string} { } + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>null, <{[key]: () =>{a: number}}> null + ^^^^ + source.ts constant.language.null.ts + ^ + source.ts + ^ + source.ts cast.expr.ts + ^ + source.ts cast.expr.ts meta.brace.angle.ts + ^ + source.ts cast.expr.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.indexer.declaration.ts meta.brace.square.ts + ^^^ + source.ts cast.expr.ts meta.object.type.ts meta.indexer.declaration.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.indexer.declaration.ts meta.brace.square.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.paren.cover.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts + ^^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.function.return.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts cast.expr.ts meta.object.type.ts meta.type.annotation.ts meta.type.function.return.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts cast.expr.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts cast.expr.ts meta.brace.angle.ts + ^ + source.ts + ^^^^ + source.ts constant.language.null.ts + ^^ + source.ts +> + ^^ + source.ts +>// no syntax highlighting from here down... + ^^ + source.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts comment.line.double-slash.ts +> + ^^ + source.ts +>function foo() { } + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts + ^ + source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/cases/Issue77.ts b/tests/cases/Issue77.ts new file mode 100644 index 00000000..794044ad --- /dev/null +++ b/tests/cases/Issue77.ts @@ -0,0 +1,13 @@ +// trailing part of some real code... + +null, <{[key]: () => any}> null + +// no syntax highlighting from here down... + +function foo():{a: string} { } + +null, <{[key]: () =>{a: number}}> null + +// no syntax highlighting from here down... + +function foo() { } \ No newline at end of file From 731f7c09a796207e3ba51db65fe4136187cf6fef Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 19 Aug 2016 11:29:26 -0700 Subject: [PATCH 21/77] Rearrange the declarations, statements, expressions --- TypeScript.YAML-tmLanguage | 120 ++- TypeScript.tmLanguage | 639 ++++++------- TypeScriptReact.YAML-tmLanguage | 122 ++- TypeScriptReact.tmLanguage | 881 +++++++++--------- tests/baselines/Abstracts.baseline.txt | 4 +- ...owFunctionInsideTypeAssertion.baseline.txt | 82 +- .../ArrowFunctionInsideTypeAssertion.txt | 16 +- tests/baselines/Comments.baseline.txt | 12 +- tests/baselines/Issue110.baseline.txt | 68 +- tests/baselines/Issue124.baseline.txt | 20 +- tests/baselines/Issue153.baseline.txt | 310 +++--- tests/baselines/Issue191.baseline.txt | 4 +- tests/baselines/Issue200.baseline.txt | 20 +- tests/baselines/Issue208.baseline.txt | 8 +- tests/baselines/Issue239.baseline.txt | 4 +- tests/baselines/Issue241.baseline.txt | 42 +- tests/baselines/Issue262.baseline.txt | 38 +- tests/baselines/Issue28.baseline.txt | 24 +- tests/baselines/Issue288.baseline.txt | 16 +- tests/baselines/Issue335.baseline.txt | 16 +- tests/baselines/Issue335.txt | 4 +- tests/baselines/Issue37.baseline.txt | 276 +++--- tests/baselines/Issue37.txt | 52 +- tests/baselines/Issue5.baseline.txt | 22 +- tests/baselines/Issue90.baseline.txt | 12 +- tests/baselines/Issue96.baseline.txt | 14 +- tests/baselines/Issue96.txt | 4 +- tests/baselines/TsxSamples.baseline.txt | 58 +- tests/baselines/TsxSamples.txt | 2 +- tests/baselines/constants.baseline.txt | 28 +- .../multipleVariableDeclaration.baseline.txt | 80 +- .../baselines/multipleVariableDeclaration.txt | 6 +- .../baselines/namespaceAndModule.baseline.txt | 24 +- tests/baselines/numeric.baseline.txt | 44 +- tests/baselines/pr48_noSemiColon.baseline.txt | 12 +- tests/baselines/regexp.baseline.txt | 8 +- 36 files changed, 1620 insertions(+), 1472 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 0022cd08..c6f8bb43 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -6,12 +6,27 @@ fileTypes: [ts] uuid: ef98eb90-bf9b-11e4-bb52-0800200c9a66 patterns: -- include: '#expression' +- include: '#statements' repository: + statements: + patterns: + - include: '#for-in-simple' + - include: '#string' + - include: '#regex' + - include: '#template' + - include: '#comment' + - include: '#literal' + - include: '#declaration' + - include: '#switch-statement' + - include: '#decl-block' + - include: '#control-statement' + # add label + - include: '#expression' + var-expr: name: meta.var.expr.ts - begin: (? - - include: '#object-body' + - include: '#class-or-interface-body' - object-name: + class-or-interface-name: name: meta.object.name.ts match: '[a-zA-Z_$][\w$]*' captures: '0': { name: 'entity.name.class.ts' } - object-heritage: + class-or-interface-heritage: name: meta.object.heritage.ts begin: '(?:\b(extends|implements)\b)' beginCaptures: @@ -149,17 +174,17 @@ repository: '1': { name: punctuation.definition.block.ts } patterns: - include: '#comment' - - include: '#object-heritage' + - include: '#class-or-interface-heritage' - include: '#type-parameters' - - include: '#object-heritage-type' + - include: '#class-or-interface-heritage-type' - object-heritage-type: + class-or-interface-heritage-type: name: meta.object.heritage.parent.ts match: '(?:\b([a-zA-Z_$][\w$]*)\b)' captures: '1': { name: entity.other.inherited-class.ts } - object-body: + class-or-interface-body: name: meta.object.body.ts begin: \{ beginCaptures: @@ -256,7 +281,6 @@ repository: patterns: - include: '#type-annotation' - include: '#indexer-parameter' - - include: '#expression' indexer-parameter: name: meta.indexer.parameter.ts @@ -289,7 +313,7 @@ repository: '2': { name: storage.type.function.ts } '3': { name: entity.name.function.ts } - block: + object-literal: name: meta.block.ts begin: \{ beginCaptures: @@ -299,7 +323,6 @@ repository: '0': { name: punctuation.definition.block.ts } patterns: - include: '#object-member' - - include: '#expression' decl-block: name: meta.decl.block.ts @@ -310,7 +333,7 @@ repository: endCaptures: '0': { name: punctuation.definition.block.ts } patterns: - - include: '#expression' + - include: '#statements' parameter-name: match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??)' @@ -454,39 +477,13 @@ repository: - include: '#type' variable-initializer: - begin: (=) + begin: (? include - #expression + #statements repository @@ -63,7 +63,81 @@ name storage.modifier.await.ts - block + boolean-literal + + patterns + + + match + \btrue\b + name + constant.language.boolean.true.ts + + + match + \bfalse\b + name + constant.language.boolean.false.ts + + + + case-clause + + begin + (?<!\.)\b(case|default(?=:))\b + beginCaptures + + 1 + + name + keyword.control.switch.ts + + + end + : + name + case-clause.expr.ts + patterns + + + include + #expression + + + + cast + + begin + (?:(?<=return|throw|yield|await|[=(,:>]))\s*(<)(?!<?\=) + beginCaptures + + 1 + + name + meta.brace.angle.ts + + + end + > + endCaptures + + 0 + + name + meta.brace.angle.ts + + + name + cast.expr.ts + patterns + + + include + #type + + + + class-or-interface-body begin \{ @@ -86,93 +160,188 @@ name - meta.block.ts + meta.object.body.ts patterns include - #object-member + #string include - #expression + #comment - - - boolean-literal - - patterns - - match - \btrue\b - name - constant.language.boolean.true.ts + include + #field-declaration - match - \bfalse\b - name - constant.language.boolean.false.ts + include + #method-declaration + + + include + #indexer-declaration + + + include + #type-annotation + + + include + #variable-initializer + + + include + #access-modifier + + + include + #static-modifier + + + include + #property-accessor - case-clause + class-or-interface-declaration begin - (?<!\.)\b(case|default(?=:))\b + \b(?:(export)\s+)?\b(?:(abstract)\s+)?\b(?<!\.)(?:(class)|(interface))\b beginCaptures 1 name - keyword.control.switch.ts + keyword.control.export.ts + + 2 + + name + storage.modifier.ts + + 3 + + name + storage.type.class.ts + + 4 + + name + storage.type.interface.ts end - : + (?<=\}) + endCaptures + + 1 + + name + punctuation.definition.block.ts + + name - case-clause.expr.ts + meta.declaration.object.ts patterns include - #expression-type + #comment + + + include + #class-or-interface-heritage + + + include + #class-or-interface-name + + + include + #type-parameters + + + include + #class-or-interface-body - cast + class-or-interface-heritage begin - (?:(?<=return|throw|yield|await|[=(,:>]))\s*(<)(?!<?\=) + (?:\b(extends|implements)\b) beginCaptures 1 name - meta.brace.angle.ts + storage.modifier.ts end - > + (?=\{) endCaptures - 0 + 1 name - meta.brace.angle.ts + punctuation.definition.block.ts name - cast.expr.ts + meta.object.heritage.ts patterns include - #type + #comment + + + include + #class-or-interface-heritage + + + include + #type-parameters + + + include + #class-or-interface-heritage-type + class-or-interface-heritage-type + + captures + + 1 + + name + entity.other.inherited-class.ts + + + match + (?:\b([a-zA-Z_$][\w$]*)\b) + name + meta.object.heritage.parent.ts + + class-or-interface-name + + captures + + 0 + + name + entity.name.class.ts + + + match + [a-zA-Z_$][\w$]* + name + meta.object.name.ts + comment patterns @@ -333,7 +502,7 @@ include - #expression + #statements @@ -343,13 +512,17 @@ meta.declaration.ts patterns + + include + #var-expr + include #function-declaration include - #object-declaration + #class-or-interface-declaration include @@ -359,6 +532,14 @@ include #enum-declaration + + include + #import-operator + + + include + #storage-keyword + docblock @@ -431,10 +612,6 @@ meta.expression.ts patterns - - include - #for-in-simple - include #string @@ -457,15 +634,15 @@ include - #paren-expression + #function-declaration include - #var-expr + #paren-expression include - #declaration + #ternary-expression include @@ -477,15 +654,7 @@ include - #switch-statement - - - include - #block - - - include - #import-operator + #object-literal include @@ -499,26 +668,10 @@ include #operators - - include - #storage-keyword - - - include - #type-primitive - include #function-call - - include - #case-clause - - - include - #control-statement - expression-operator @@ -581,66 +734,6 @@ - expression-type - - name - meta.expression.ts - patterns - - - include - #string - - - include - #regex - - - include - #template - - - include - #comment - - - include - #literal - - - include - #paren-expression - - - include - #ternary-expression - - - include - #import-operator - - - include - #expression-operator - - - include - #imply-operator - - - include - #operators - - - include - #type-primitive - - - include - #function-call - - - field-declaration begin @@ -918,11 +1011,7 @@ include - #indexer-parameter - - - include - #expression + #indexer-parameter @@ -1239,7 +1328,7 @@ - object-body + object-literal begin \{ @@ -1262,173 +1351,15 @@ name - meta.object.body.ts - patterns - - - include - #string - - - include - #comment - - - include - #field-declaration - - - include - #method-declaration - - - include - #indexer-declaration - - - include - #type-annotation - - - include - #variable-initializer - - - include - #access-modifier - - - include - #static-modifier - - - include - #property-accessor - - - - object-declaration - - begin - \b(?:(export)\s+)?\b(?:(abstract)\s+)?\b(?<!\.)(?:(class)|(interface))\b - beginCaptures - - 1 - - name - keyword.control.export.ts - - 2 - - name - storage.modifier.ts - - 3 - - name - storage.type.class.ts - - 4 - - name - storage.type.interface.ts - - - end - (?<=\}) - endCaptures - - 1 - - name - punctuation.definition.block.ts - - - name - meta.declaration.object.ts - patterns - - - include - #comment - - - include - #object-heritage - - - include - #object-name - - - include - #type-parameters - - - include - #object-body - - - - object-heritage - - begin - (?:\b(extends|implements)\b) - beginCaptures - - 1 - - name - storage.modifier.ts - - - end - (?=\{) - endCaptures - - 1 - - name - punctuation.definition.block.ts - - - name - meta.object.heritage.ts + meta.block.ts patterns include - #comment - - - include - #object-heritage - - - include - #type-parameters - - - include - #object-heritage-type + #object-member - object-heritage-type - - captures - - 1 - - name - entity.other.inherited-class.ts - - - match - (?:\b([a-zA-Z_$][\w$]*)\b) - name - meta.object.heritage.parent.ts - object-member begin @@ -1445,21 +1376,6 @@ - object-name - - captures - - 0 - - name - entity.name.class.ts - - - match - [a-zA-Z_$][\w$]* - name - meta.object.name.ts - operators patterns @@ -1970,6 +1886,56 @@ + statements + + patterns + + + include + #for-in-simple + + + include + #string + + + include + #regex + + + include + #template + + + include + #comment + + + include + #literal + + + include + #declaration + + + include + #switch-statement + + + include + #decl-block + + + include + #control-statement + + + include + #expression + + + static-modifier match @@ -1980,7 +1946,7 @@ storage-keyword match - \b(var|let|function|const|module|namespace|void|export)\b + \b(var|let|function|const|module|namespace)\b name storage.type.ts @@ -2034,7 +2000,11 @@ include - #expression + #case-clause + + + include + #statements @@ -2168,7 +2138,7 @@ begin (?=\?) end - (?=$|[;,]) + (?=$|[;,}]) patterns @@ -2177,7 +2147,7 @@ include - #expression-type + #expression @@ -2207,7 +2177,7 @@ include - #expression-type + #expression @@ -2601,7 +2571,7 @@ var-expr begin - (?<!\()\s*\b(var|let|const(?!\s+enum))\b + (?<!\()\s*\b(var|let|const(?!\s+enum\b))\b beginCaptures 1 @@ -2629,7 +2599,7 @@ var-single-variable begin - \b([a-zA-Z_$][\w$]*)\s*(=?) + \b([a-zA-Z_$][\w$]*)\b beginCaptures 1 @@ -2646,30 +2616,35 @@ include - #ternary-expression - - - include - #type-annotation - - - include - #string - - - include - #comment + #variable-initializer - include - #expression + begin + \G + end + (?!\G)(?=$|[;,=]) + patterns + + + include + #type-annotation + + + include + #string + + + include + #comment + + variable-initializer begin - (=) + (?<!=|!)(=)(?!=) beginCaptures 1 @@ -2679,7 +2654,7 @@ end - (?=$|[,);=]) + (?=$|[,);]) patterns diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 89a0eea4..5ac31756 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -9,12 +9,28 @@ fileTypes: [tsx] uuid: 805375ec-d614-41f5-8993-5843fe63ea82 patterns: -- include: '#expression' +- include: '#statements' repository: + statements: + patterns: + - include: '#jsx' + - include: '#for-in-simple' + - include: '#string' + - include: '#regex' + - include: '#template' + - include: '#comment' + - include: '#literal' + - include: '#declaration' + - include: '#switch-statement' + - include: '#decl-block' + - include: '#control-statement' + # add label + - include: '#expression' + var-expr: name: meta.var.expr.tsx - begin: (? - - include: '#object-body' + - include: '#class-or-interface-body' - object-name: + class-or-interface-name: name: meta.object.name.tsx match: '[a-zA-Z_$][\w$]*' captures: '0': { name: 'entity.name.class.tsx' } - object-heritage: + class-or-interface-heritage: name: meta.object.heritage.tsx begin: '(?:\b(extends|implements)\b)' beginCaptures: @@ -153,17 +178,17 @@ repository: '1': { name: punctuation.definition.block.tsx } patterns: - include: '#comment' - - include: '#object-heritage' + - include: '#class-or-interface-heritage' - include: '#type-parameters' - - include: '#object-heritage-type' + - include: '#class-or-interface-heritage-type' - object-heritage-type: + class-or-interface-heritage-type: name: meta.object.heritage.parent.tsx match: '(?:\b([a-zA-Z_$][\w$]*)\b)' captures: '1': { name: entity.other.inherited-class.tsx } - object-body: + class-or-interface-body: name: meta.object.body.tsx begin: \{ beginCaptures: @@ -260,7 +285,6 @@ repository: patterns: - include: '#type-annotation' - include: '#indexer-parameter' - - include: '#expression' indexer-parameter: name: meta.indexer.parameter.tsx @@ -293,7 +317,7 @@ repository: '2': { name: storage.type.function.tsx } '3': { name: entity.name.function.tsx } - block: + object-literal: name: meta.block.tsx begin: \{ beginCaptures: @@ -303,7 +327,6 @@ repository: '0': { name: punctuation.definition.block.tsx } patterns: - include: '#object-member' - - include: '#expression' decl-block: name: meta.decl.block.tsx @@ -314,7 +337,7 @@ repository: endCaptures: '0': { name: punctuation.definition.block.tsx } patterns: - - include: '#expression' + - include: '#statements' parameter-name: match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??)' @@ -458,39 +481,13 @@ repository: - include: '#type' variable-initializer: - begin: (=) + begin: (? include - #expression + #statements repository @@ -63,7 +63,49 @@ name storage.modifier.await.tsx - block + boolean-literal + + patterns + + + match + \btrue\b + name + constant.language.boolean.true.tsx + + + match + \bfalse\b + name + constant.language.boolean.false.tsx + + + + case-clause + + begin + (?<!\.)\b(case|default(?=:))\b + beginCaptures + + 1 + + name + keyword.control.switch.tsx + + + end + : + name + case-clause.expr.tsx + patterns + + + include + #expression + + + + class-or-interface-body begin \{ @@ -86,61 +128,188 @@ name - meta.block.tsx + meta.object.body.tsx patterns include - #object-member + #string include - #expression + #comment + + + include + #field-declaration + + + include + #method-declaration + + + include + #indexer-declaration + + + include + #type-annotation + + + include + #variable-initializer + + + include + #access-modifier + + + include + #static-modifier + + + include + #property-accessor - boolean-literal + class-or-interface-declaration - patterns - + begin + \b(?:(export)\s+)?\b(?:(abstract)\s+)?\b(?<!\.)(?:(class)|(interface))\b + beginCaptures + + 1 - match - \btrue\b name - constant.language.boolean.true.tsx + keyword.control.export.tsx + 2 - match - \bfalse\b name - constant.language.boolean.false.tsx + storage.modifier.tsx + + 3 + + name + storage.type.class.tsx + + 4 + + name + storage.type.interface.tsx + + + end + (?<=\}) + endCaptures + + 1 + + name + punctuation.definition.block.tsx + + + name + meta.declaration.object.tsx + patterns + + + include + #comment + + + include + #class-or-interface-heritage + + + include + #class-or-interface-name + + + include + #type-parameters + + + include + #class-or-interface-body - case-clause + class-or-interface-heritage begin - (?<!\.)\b(case|default(?=:))\b + (?:\b(extends|implements)\b) beginCaptures 1 name - keyword.control.switch.tsx + storage.modifier.tsx end - : + (?=\{) + endCaptures + + 1 + + name + punctuation.definition.block.tsx + + name - case-clause.expr.tsx + meta.object.heritage.tsx patterns include - #expression-type + #comment + + + include + #class-or-interface-heritage + + + include + #type-parameters + + + include + #class-or-interface-heritage-type + class-or-interface-heritage-type + + captures + + 1 + + name + entity.other.inherited-class.tsx + + + match + (?:\b([a-zA-Z_$][\w$]*)\b) + name + meta.object.heritage.parent.tsx + + class-or-interface-name + + captures + + 0 + + name + entity.name.class.tsx + + + match + [a-zA-Z_$][\w$]* + name + meta.object.name.tsx + comment patterns @@ -301,7 +470,7 @@ include - #expression + #statements @@ -311,13 +480,17 @@ meta.declaration.tsx patterns + + include + #var-expr + include #function-declaration include - #object-declaration + #class-or-interface-declaration include @@ -327,6 +500,14 @@ include #enum-declaration + + include + #import-operator + + + include + #storage-keyword + docblock @@ -385,7 +566,7 @@ 3 name - entity.name.type.class.tsx + entity.name.type.enum.tsx match @@ -403,10 +584,6 @@ include #jsx - - include - #for-in-simple - include #string @@ -429,15 +606,15 @@ include - #paren-expression + #function-declaration include - #var-expr + #paren-expression include - #declaration + #ternary-expression include @@ -445,15 +622,7 @@ include - #switch-statement - - - include - #block - - - include - #import-operator + #object-literal include @@ -467,26 +636,10 @@ include #operators - - include - #storage-keyword - - - include - #type-primitive - include #function-call - - include - #case-clause - - - include - #control-statement - expression-operator @@ -519,97 +672,33 @@ match - \bnew\b - name - keyword.operator.new.tsx - - - match - \btypeof\b - name - keyword.operator.typeof.tsx - - - match - \bvoid\b - name - keyword.operator.void.tsx - - - match - \bas\b - name - keyword.control.as.tsx - - - match - \bis\b - name - keyword.operator.is.tsx - - - - expression-type - - name - meta.expression.tsx - patterns - - - include - #jsx - - - include - #string - - - include - #regex - - - include - #template - - - include - #comment - - - include - #literal - - - include - #paren-expression - - - include - #ternary-expression - - - include - #import-operator - - - include - #expression-operator + \bnew\b + name + keyword.operator.new.tsx - include - #imply-operator + match + \btypeof\b + name + keyword.operator.typeof.tsx - include - #operators + match + \bvoid\b + name + keyword.operator.void.tsx - include - #type-primitive + match + \bas\b + name + keyword.control.as.tsx - include - #function-call + match + \bis\b + name + keyword.operator.is.tsx @@ -892,10 +981,6 @@ include #indexer-parameter - - include - #expression - indexer-parameter @@ -1511,325 +1596,167 @@ name meta.method.overload.declaration.tsx - new-expr - - begin - \b(new)\b - beginCaptures - - 1 - - name - keyword.operator.new.tsx - - - end - (?=[(;]|$) - name - new.expr.tsx - patterns - - - include - #type - - - include - #comment - - - - null-literal - - match - \bnull\b - name - constant.language.null.tsx - - numeric-literal - - patterns - - - match - \b(?<!\$)0(x|X)[0-9a-fA-F]+\b(?!\$) - name - constant.numeric.hex.tsx - - - match - \b(?<!\$)0(b|B)[01]+\b(?!\$) - name - constant.numeric.binary.tsx - - - match - \b(?<!\$)0(o|O)?[0-7]+\b(?!\$) - name - constant.numeric.octal.tsx - - - captures - - 0 - - name - constant.numeric.decimal.tsx - - 1 - - name - meta.delimiter.decimal.period.tsx - - 2 - - name - meta.delimiter.decimal.period.tsx - - 3 - - name - meta.delimiter.decimal.period.tsx - - 4 - - name - meta.delimiter.decimal.period.tsx - - 5 - - name - meta.delimiter.decimal.period.tsx - - 6 - - name - meta.delimiter.decimal.period.tsx - - - match - (?x) -(?<!\$)(?: - (?:\b[0-9]+(\.)[0-9]+[eE][+-]?[0-9]+\b)| # 1.1E+3 - (?:\b[0-9]+(\.)[eE][+-]?[0-9]+\b)| # 1.E+3 - (?:\B(\.)[0-9]+[eE][+-]?[0-9]+\b)| # .1E+3 - (?:\b[0-9]+[eE][+-]?[0-9]+\b)| # 1E+3 - (?:\b[0-9]+(\.)[0-9]+\b)| # 1.1 - (?:\b[0-9]+(\.)\B)| # 1. - (?:\B(\.)[0-9]+\b)| # .1 - (?:\b[0-9]+\b(?!\.)) # 1 -)(?!\$) - - - - numericConstant-literal - - patterns - - - match - \bNaN\b - name - constant.language.nan.tsx - - - match - \bInfinity\b - name - constant.language.infinity.tsx - - - - object-body - - begin - \{ - beginCaptures - - 0 - - name - punctuation.definition.block.tsx - - - end - \} - endCaptures - - 0 - - name - punctuation.definition.block.tsx - - - name - meta.object.body.tsx - patterns - - - include - #string - - - include - #comment - - - include - #field-declaration - - - include - #method-declaration - - - include - #indexer-declaration - - - include - #type-annotation - - - include - #variable-initializer - - - include - #access-modifier - - - include - #static-modifier - - - include - #property-accessor - - - - object-declaration - - begin - \b(?:(export)\s+)?\b(?:(abstract)\s+)?\b(?<!\.)(?:(class)|(interface))\b - beginCaptures - - 1 - - name - keyword.control.export.tsx - - 2 - - name - storage.modifier.tsx - - 3 - - name - storage.type.class.tsx - - 4 - - name - storage.type.interface.tsx - - - end - (?<=\}) - endCaptures + new-expr + + begin + \b(new)\b + beginCaptures 1 name - punctuation.definition.block.tsx + keyword.operator.new.tsx + end + (?=[(;]|$) name - meta.declaration.object.tsx + new.expr.tsx patterns include - #comment + #type include - #object-heritage + #comment + + + null-literal + + match + \bnull\b + name + constant.language.null.tsx + + numeric-literal + + patterns + - include - #object-name + match + \b(?<!\$)0(x|X)[0-9a-fA-F]+\b(?!\$) + name + constant.numeric.hex.tsx - include - #type-parameters + match + \b(?<!\$)0(b|B)[01]+\b(?!\$) + name + constant.numeric.binary.tsx - include - #object-body + match + \b(?<!\$)0(o|O)?[0-7]+\b(?!\$) + name + constant.numeric.octal.tsx + + + captures + + 0 + + name + constant.numeric.decimal.tsx + + 1 + + name + meta.delimiter.decimal.period.tsx + + 2 + + name + meta.delimiter.decimal.period.tsx + + 3 + + name + meta.delimiter.decimal.period.tsx + + 4 + + name + meta.delimiter.decimal.period.tsx + + 5 + + name + meta.delimiter.decimal.period.tsx + + 6 + + name + meta.delimiter.decimal.period.tsx + + + match + (?x) +(?<!\$)(?: + (?:\b[0-9]+(\.)[0-9]+[eE][+-]?[0-9]+\b)| # 1.1E+3 + (?:\b[0-9]+(\.)[eE][+-]?[0-9]+\b)| # 1.E+3 + (?:\B(\.)[0-9]+[eE][+-]?[0-9]+\b)| # .1E+3 + (?:\b[0-9]+[eE][+-]?[0-9]+\b)| # 1E+3 + (?:\b[0-9]+(\.)[0-9]+\b)| # 1.1 + (?:\b[0-9]+(\.)\B)| # 1. + (?:\B(\.)[0-9]+\b)| # .1 + (?:\b[0-9]+\b(?!\.)) # 1 +)(?!\$) + + + + numericConstant-literal + + patterns + + + match + \bNaN\b + name + constant.language.nan.tsx + + + match + \bInfinity\b + name + constant.language.infinity.tsx - object-heritage + object-literal begin - (?:\b(extends|implements)\b) + \{ beginCaptures - 1 + 0 name - storage.modifier.tsx + punctuation.definition.block.tsx end - (?=\{) + \} endCaptures - 1 + 0 name punctuation.definition.block.tsx name - meta.object.heritage.tsx + meta.block.tsx patterns include - #comment - - - include - #object-heritage - - - include - #type-parameters - - - include - #object-heritage-type + #object-member - object-heritage-type - - captures - - 1 - - name - entity.other.inherited-class.tsx - - - match - (?:\b([a-zA-Z_$][\w$]*)\b) - name - meta.object.heritage.parent.tsx - object-member begin @@ -1846,21 +1773,6 @@ - object-name - - captures - - 0 - - name - entity.name.class.tsx - - - match - [a-zA-Z_$][\w$]* - name - meta.object.name.tsx - operators patterns @@ -2371,6 +2283,60 @@ + statements + + patterns + + + include + #jsx + + + include + #for-in-simple + + + include + #string + + + include + #regex + + + include + #template + + + include + #comment + + + include + #literal + + + include + #declaration + + + include + #switch-statement + + + include + #decl-block + + + include + #control-statement + + + include + #expression + + + static-modifier match @@ -2381,7 +2347,7 @@ storage-keyword match - \b(var|let|function|const|module|namespace|void|export)\b + \b(var|let|function|const|module|namespace)\b name storage.type.tsx @@ -2435,7 +2401,11 @@ include - #expression + #case-clause + + + include + #statements @@ -2569,7 +2539,7 @@ begin (?=\?) end - (?=$|[;,]) + (?=$|[;,}]) patterns @@ -2578,7 +2548,7 @@ include - #expression-type + #expression @@ -2608,7 +2578,7 @@ include - #expression-type + #expression @@ -3002,7 +2972,7 @@ var-expr begin - (?<!\()\s*\b(var|let|const(?!\s+enum))\b + (?<!\()\s*\b(var|let|const(?!\s+enum\b))\b beginCaptures 1 @@ -3030,7 +3000,7 @@ var-single-variable begin - \b([a-zA-Z_$][\w$]*)\s*(=?) + \b([a-zA-Z_$][\w$]*)\b beginCaptures 1 @@ -3047,30 +3017,35 @@ include - #ternary-expression - - - include - #type-annotation - - - include - #string - - - include - #comment + #variable-initializer - include - #expression + begin + \G + end + (?!\G)(?=$|[;,=]) + patterns + + + include + #type-annotation + + + include + #string + + + include + #comment + + variable-initializer begin - (=) + (?<!=|!)(=)(?!=) beginCaptures 1 @@ -3080,7 +3055,7 @@ end - (?=$|[,);=]) + (?=$|[,);]) patterns diff --git a/tests/baselines/Abstracts.baseline.txt b/tests/baselines/Abstracts.baseline.txt index b9725248..57006fe8 100644 --- a/tests/baselines/Abstracts.baseline.txt +++ b/tests/baselines/Abstracts.baseline.txt @@ -229,8 +229,10 @@ cow.makeSound(); source.ts meta.var.expr.ts ^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index b58753dc..7f0954f9 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -39,8 +39,10 @@ function f(x: string | ((value: string) => number)) { source.ts meta.var.expr.ts ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -232,23 +234,23 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts > return +x ^^^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts keyword.operator.arithmetic.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts keyword.operator.arithmetic.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts > } ^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts > else { ^^^^ source.ts meta.function.ts meta.decl.block.ts @@ -257,66 +259,68 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts > let f = <(v: string) => number> x ^^^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts support.type.primitive.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts ^^ - source.ts meta.function.ts meta.decl.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 + source.ts meta.function.ts meta.decl.block.ts meta.decl.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 ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.decl.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 + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts > return f("hello world") ^^^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts string.quoted.double.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts string.quoted.double.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts > } ^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt index a8a08c02..81d40ba2 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt @@ -60,21 +60,21 @@ function f(x: string | ((value: string) => number)) { > else { > let f = <(v: string) => number> x ^ - [17, 17]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts + [17, 17]: source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts ^ - [17, 18]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts + [17, 18]: source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - [17, 19]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts + [17, 19]: source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts ^^^^^^ - [17, 22]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts support.type.primitive.ts + [17, 22]: source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts support.type.primitive.ts ^^ - [17, 30]: source.ts meta.function.ts meta.decl.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 + [17, 30]: source.ts meta.function.ts meta.decl.block.ts meta.decl.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 ^^^^^^ - [17, 33]: source.ts meta.function.ts meta.decl.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 + [17, 33]: source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts ^ - [17, 39]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts + [17, 39]: source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts ^^ - [17, 41]: source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + [17, 41]: source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts > return f("hello world") > } >} diff --git a/tests/baselines/Comments.baseline.txt b/tests/baselines/Comments.baseline.txt index 9494d038..d2cfb210 100644 --- a/tests/baselines/Comments.baseline.txt +++ b/tests/baselines/Comments.baseline.txt @@ -1988,7 +1988,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts ^^^^^^^^ @@ -2015,7 +2015,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ @@ -2077,8 +2077,10 @@ var x = new ^^/* comments */ String(); source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -2108,8 +2110,10 @@ var x = new ^^/* comments */ String(); source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ diff --git a/tests/baselines/Issue110.baseline.txt b/tests/baselines/Issue110.baseline.txt index 0ff03865..6aa7ce56 100644 --- a/tests/baselines/Issue110.baseline.txt +++ b/tests/baselines/Issue110.baseline.txt @@ -30,8 +30,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ @@ -45,8 +47,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ @@ -58,8 +62,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -81,8 +87,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -94,8 +102,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -111,8 +121,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -132,8 +144,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -149,8 +163,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ @@ -162,8 +178,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ @@ -175,8 +193,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ @@ -192,8 +212,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^ @@ -205,8 +227,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -226,8 +250,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -243,8 +269,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -260,8 +288,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -277,8 +307,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -287,8 +319,10 @@ let i = ^^1, j = ^^1e3 source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ diff --git a/tests/baselines/Issue124.baseline.txt b/tests/baselines/Issue124.baseline.txt index 95f67e7d..f3b97602 100644 --- a/tests/baselines/Issue124.baseline.txt +++ b/tests/baselines/Issue124.baseline.txt @@ -40,8 +40,10 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ @@ -71,8 +73,10 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ @@ -110,8 +114,10 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ @@ -166,8 +172,10 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; source.ts meta.var.expr.ts ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -210,8 +218,10 @@ var ^^debArch = ^^arch ^^=== ^^'x64' ^^? ^^'amd64' ^^: ^^'i386'; source.ts meta.var.expr.ts ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ diff --git a/tests/baselines/Issue153.baseline.txt b/tests/baselines/Issue153.baseline.txt index 1c85c53b..bc8334b0 100644 --- a/tests/baselines/Issue153.baseline.txt +++ b/tests/baselines/Issue153.baseline.txt @@ -65,11 +65,11 @@ class Matrix { ^ source.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^^^^^^^^^^^^^^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts ^^^^ @@ -420,45 +420,45 @@ class Matrix { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > return new Vector3(this.M11, this.M21, this.M31); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > } else if (index == 1) { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ @@ -484,45 +484,45 @@ class Matrix { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > return new Vector3(this.M12, this.M22, this.M32); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > } else if (index == 2) { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ @@ -548,45 +548,45 @@ class Matrix { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > return new Vector3(this.M13, this.M23, this.M33); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > } else { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ @@ -594,45 +594,45 @@ class Matrix { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > throw new RangeError('Invalid matrix 3x3 column index: ' + index); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.trycatch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.trycatch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.quoted.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.quoted.single.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.operator.arithmetic.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.operator.arithmetic.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > } ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > } @@ -756,45 +756,45 @@ class Matrix { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > return new Vector(this.M11, this.M21, this.M31); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > } else if (index == 1) { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ @@ -820,45 +820,45 @@ class Matrix { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > return new Vector(this.M12, this.M22, this.M32); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > } else if (index == 2) { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ @@ -884,45 +884,45 @@ class Matrix { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > return new Vector(this.M13, this.M23, this.M33); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > } else { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ @@ -930,45 +930,45 @@ class Matrix { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > throw new RangeError('Invalid matrix 3x3 column index: ' + index); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.control.trycatch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.trycatch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.quoted.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.quoted.single.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts keyword.operator.arithmetic.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.operator.arithmetic.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > } ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > } diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index d938f7e2..b7e5ad00 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -65,8 +65,10 @@ class Thing<^^T, ^^U> { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ diff --git a/tests/baselines/Issue200.baseline.txt b/tests/baselines/Issue200.baseline.txt index 2724b055..365c3249 100644 --- a/tests/baselines/Issue200.baseline.txt +++ b/tests/baselines/Issue200.baseline.txt @@ -32,20 +32,20 @@ original file ^ source.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts > import alias = lool.clutz.goog.i18n.NumberFormatSymbols_en_TT; ^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^^^^^^ - source.ts meta.block.ts keyword.control.import.ts + source.ts meta.decl.block.ts keyword.control.import.ts ^^^^^^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^ - source.ts meta.block.ts keyword.operator.assignment.ts + source.ts meta.decl.block.ts keyword.operator.assignment.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts > export default alias; ^^ source.ts meta.block.ts @@ -54,9 +54,9 @@ original file ^ source.ts meta.block.ts ^^^^^^^ - source.ts meta.block.ts keyword.control.switch.ts + source.ts meta.decl.block.ts keyword.control.switch.ts ^^^^^^^^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts >} ^ - source.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file + source.ts meta.decl.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue208.baseline.txt b/tests/baselines/Issue208.baseline.txt index 61cddbbc..40e713c3 100644 --- a/tests/baselines/Issue208.baseline.txt +++ b/tests/baselines/Issue208.baseline.txt @@ -19,8 +19,10 @@ class MyClass { source.ts meta.var.expr.ts ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ @@ -58,8 +60,10 @@ class MyClass { source.ts meta.var.expr.ts ^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^^^ diff --git a/tests/baselines/Issue239.baseline.txt b/tests/baselines/Issue239.baseline.txt index a765328a..d1827cd7 100644 --- a/tests/baselines/Issue239.baseline.txt +++ b/tests/baselines/Issue239.baseline.txt @@ -12,8 +12,10 @@ original file source.tsx meta.var.expr.tsx ^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx - ^^ + ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ diff --git a/tests/baselines/Issue241.baseline.txt b/tests/baselines/Issue241.baseline.txt index 43a9f9e6..36d818f2 100644 --- a/tests/baselines/Issue241.baseline.txt +++ b/tests/baselines/Issue241.baseline.txt @@ -59,8 +59,10 @@ function foo2(): [number, () => { x: number }] { source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -124,8 +126,10 @@ function foo2(): [number, () => { x: number }] { source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -179,8 +183,10 @@ function foo2(): [number, () => { x: number }] { source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -232,29 +238,31 @@ function foo2(): [number, () => { x: number }] { ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts > const x = 0; ^^^^ - source.ts meta.block.ts meta.var.expr.ts + source.ts meta.decl.block.ts meta.var.expr.ts ^^^^^ - source.ts meta.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.block.ts meta.var.expr.ts + source.ts meta.decl.block.ts meta.var.expr.ts ^ - source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ - source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts >} ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^^ source.ts >function foo2(): [number, () => { x: number }] { @@ -323,8 +331,10 @@ function foo2(): [number, () => { x: number }] { source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ diff --git a/tests/baselines/Issue262.baseline.txt b/tests/baselines/Issue262.baseline.txt index 3a19abb2..fbe5ed6b 100644 --- a/tests/baselines/Issue262.baseline.txt +++ b/tests/baselines/Issue262.baseline.txt @@ -41,48 +41,48 @@ for (^^let a = 1; a ^^< 10; a++) { ^ source.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts > for (let b = 1; b < a; b++) { ^^^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^^^ - source.ts meta.block.ts keyword.control.loop.ts + source.ts meta.decl.block.ts keyword.control.loop.ts ^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.brace.round.ts + source.ts meta.decl.block.ts meta.brace.round.ts ^^^ source.ts meta.block.ts storage.type.ts ^^^ source.ts meta.block.ts ^ - source.ts meta.block.ts keyword.operator.assignment.ts + source.ts meta.decl.block.ts keyword.operator.assignment.ts ^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^ - source.ts meta.block.ts constant.numeric.decimal.ts + source.ts meta.decl.block.ts constant.numeric.decimal.ts ^^^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^ - source.ts meta.block.ts keyword.operator.relational.ts + source.ts meta.decl.block.ts keyword.operator.relational.ts ^^^^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^^ - source.ts meta.block.ts keyword.operator.increment.ts + source.ts meta.decl.block.ts keyword.operator.increment.ts ^ - source.ts meta.block.ts meta.brace.round.ts + source.ts meta.decl.block.ts meta.brace.round.ts ^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts > ^^^^^^^^^ - source.ts meta.block.ts meta.block.ts + source.ts meta.decl.block.ts meta.decl.block.ts > } ^^^^ - source.ts meta.block.ts meta.block.ts + source.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file + source.ts meta.decl.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue28.baseline.txt b/tests/baselines/Issue28.baseline.txt index 38132aed..1600fd51 100644 --- a/tests/baselines/Issue28.baseline.txt +++ b/tests/baselines/Issue28.baseline.txt @@ -32,8 +32,10 @@ var w = ^^0O767; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ @@ -47,8 +49,10 @@ var w = ^^0O767; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ @@ -62,8 +66,10 @@ var w = ^^0O767; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^ @@ -77,8 +83,10 @@ var w = ^^0O767; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^ @@ -92,8 +100,10 @@ var w = ^^0O767; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^^ @@ -107,8 +117,10 @@ var w = ^^0O767; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ diff --git a/tests/baselines/Issue288.baseline.txt b/tests/baselines/Issue288.baseline.txt index ed88672b..0edfa82a 100644 --- a/tests/baselines/Issue288.baseline.txt +++ b/tests/baselines/Issue288.baseline.txt @@ -62,8 +62,10 @@ return^^Name+=1; source.ts meta.var.expr.ts ^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^^ @@ -111,8 +113,10 @@ return^^Name+=1; source.ts meta.var.expr.ts ^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^^ @@ -137,7 +141,7 @@ return^^Name+=1; ^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ @@ -166,7 +170,7 @@ return^^Name+=1; ^^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ @@ -182,7 +186,7 @@ return^^Name+=1; ^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ @@ -215,7 +219,7 @@ return^^Name+=1; ^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ diff --git a/tests/baselines/Issue335.baseline.txt b/tests/baselines/Issue335.baseline.txt index 8920af11..822d38d5 100644 --- a/tests/baselines/Issue335.baseline.txt +++ b/tests/baselines/Issue335.baseline.txt @@ -258,13 +258,13 @@ class A4 { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts > d.default = 1 ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts > switch (d.default) { ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts @@ -396,13 +396,13 @@ class A4 { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts > d.case = 1 ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts > switch (d.default) { ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts diff --git a/tests/baselines/Issue335.txt b/tests/baselines/Issue335.txt index 2abc21f0..92c52f66 100644 --- a/tests/baselines/Issue335.txt +++ b/tests/baselines/Issue335.txt @@ -90,7 +90,7 @@ class A4 { > let d > d.default = 1 ^^^^^^^^^^^^ - [24, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + [24, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > switch (d.default) { ^^^^^^^^^ [25, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts @@ -120,7 +120,7 @@ class A4 { > let d > d.case = 1 ^^^^^^^^^ - [40, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + [40, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > switch (d.default) { ^^^^^^^^^ [41, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index ae3b97fc..deb197ae 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -107,11 +107,11 @@ var j: I = {} ^ source.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^^^^^^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts ^^^^ @@ -151,10 +151,10 @@ var j: I = {} ^ source.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts @@ -250,107 +250,109 @@ var j: I = {} ^ source.ts meta.brace.round.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts > ^ - source.ts meta.block.ts + source.ts meta.decl.block.ts > var c = a + b; ^ - source.ts meta.block.ts meta.var.expr.ts + source.ts meta.decl.block.ts meta.var.expr.ts ^^^ - source.ts meta.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.block.ts meta.var.expr.ts + source.ts meta.decl.block.ts meta.var.expr.ts ^ - source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ - source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^^^ - source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts ^^ - source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts > ^ - source.ts meta.block.ts + source.ts meta.decl.block.ts > switch (someNum) { ^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^^^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts ^^ - source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts ^^^^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts ^ - source.ts meta.block.ts switch-statement.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts > case 1: break; ^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts ^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts > case 2: break; ^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts ^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts > default: break; ^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts ^^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts > } ^ - source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts ^ - source.ts meta.block.ts switch-statement.expr.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts switch-statement.expr.ts punctuation.definition.block.ts ^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts > ^ - source.ts meta.block.ts + source.ts meta.decl.block.ts >} ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts @@ -374,51 +376,51 @@ var j: I = {} ^^^ source.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts > export function myFun(x: number) { ^^^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^^^^^^ - source.ts meta.block.ts meta.function.ts keyword.control.export.ts + source.ts meta.decl.block.ts meta.function.ts keyword.control.export.ts ^ - source.ts meta.block.ts meta.function.ts + source.ts meta.decl.block.ts meta.function.ts ^^^^^^^^ - source.ts meta.block.ts meta.function.ts storage.type.function.ts + source.ts meta.decl.block.ts meta.function.ts storage.type.function.ts ^ - source.ts meta.block.ts meta.function.ts + source.ts meta.decl.block.ts meta.function.ts ^^^^^ - source.ts meta.block.ts meta.function.ts entity.name.function.ts + source.ts meta.decl.block.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.block.ts meta.function.ts + source.ts meta.decl.block.ts meta.function.ts ^ - source.ts meta.block.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts > return x; ^^^^^^^^ - source.ts meta.block.ts meta.function.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.block.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^^^^ - source.ts meta.block.ts meta.function.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts > } ^^^^ - source.ts meta.block.ts meta.function.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts @@ -457,8 +459,10 @@ var j: I = {} source.ts meta.var.expr.ts ^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ @@ -500,8 +504,10 @@ var j: I = {} source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^ @@ -562,136 +568,136 @@ var j: I = {} ^^^^^^ source.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts > export class Cell { ^^^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts keyword.control.export.ts + source.ts meta.decl.block.ts meta.declaration.object.ts keyword.control.export.ts ^ - source.ts meta.block.ts meta.declaration.object.ts + source.ts meta.decl.block.ts meta.declaration.object.ts ^^^^^ - source.ts meta.block.ts meta.declaration.object.ts storage.type.class.ts + source.ts meta.decl.block.ts meta.declaration.object.ts storage.type.class.ts ^ - source.ts meta.block.ts meta.declaration.object.ts + source.ts meta.decl.block.ts meta.declaration.object.ts ^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^ - source.ts meta.block.ts meta.declaration.object.ts + source.ts meta.decl.block.ts meta.declaration.object.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > public parent: Cell; ^^^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts ^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts > ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts > constructor(parent: Cell) { ^^^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > this.parent = parent; ^^^^^^^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts ^^^^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > if (typeof parent === 'object' || parent instanceof Error) { ^^^^^^^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.typeof.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.typeof.ts ^^^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.end.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.logical.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.logical.ts ^^^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.instanceof.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.instanceof.ts ^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts > ^^^^^^^^^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > } ^^^^^^^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts > } ^^^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > } ^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >} ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt index bf598abe..e375546c 100644 --- a/tests/baselines/Issue37.txt +++ b/tests/baselines/Issue37.txt @@ -124,22 +124,22 @@ var j: I = {} > > var c = a + b; ^^^ - [21, 2]: source.ts meta.block.ts meta.var.expr.ts storage.type.ts + [21, 2]: source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ - [21, 12]: source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts + [21, 12]: source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts > > switch (someNum) { ^^^^^^ - [23, 2]: source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts + [23, 2]: source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts > case 1: break; ^^^^ - [24, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + [24, 3]: source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > case 2: break; ^^^^ - [25, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + [25, 3]: source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > default: break; ^^^^^^^ - [26, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + [26, 3]: source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > } > >} @@ -153,7 +153,7 @@ var j: I = {} [35, 1]: source.ts storage.type.ts > export function myFun(x: number) { ^^^^^^ - [36, 5]: source.ts meta.block.ts meta.function.ts keyword.control.export.ts + [36, 5]: source.ts meta.decl.block.ts meta.function.ts keyword.control.export.ts > return x; > } >} @@ -181,49 +181,49 @@ var j: I = {} [51, 8]: source.ts > export class Cell { ^^^^^^ - [52, 5]: source.ts meta.block.ts meta.declaration.object.ts keyword.control.export.ts + [52, 5]: source.ts meta.decl.block.ts meta.declaration.object.ts keyword.control.export.ts ^^^^^ - [52, 12]: source.ts meta.block.ts meta.declaration.object.ts storage.type.class.ts + [52, 12]: source.ts meta.decl.block.ts meta.declaration.object.ts storage.type.class.ts ^^^^ - [52, 18]: source.ts meta.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + [52, 18]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts > public parent: Cell; ^^^^^^ - [53, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + [53, 9]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^^^^^^ - [53, 16]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + [53, 16]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^^^ - [53, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + [53, 24]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts > > constructor(parent: Cell) { ^^^^^^^^^^^ - [55, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + [55, 9]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^^^^^^ - [55, 21]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [55, 21]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^^^^ - [55, 29]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + [55, 29]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts > this.parent = parent; ^^^^ - [56, 13]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + [56, 13]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts ^^^^^^^^^ - [56, 27]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [56, 27]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > if (typeof parent === 'object' || parent instanceof Error) { ^^^^^^ - [57, 17]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.typeof.ts + [57, 17]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.typeof.ts ^^^^^^^^ - [57, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [57, 24]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ - [57, 31]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + [57, 31]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts ^ - [57, 35]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts + [57, 35]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^^^ - [57, 47]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [57, 47]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^^^^^ - [57, 54]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.instanceof.ts + [57, 54]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.instanceof.ts ^^^^^^ - [57, 65]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [57, 65]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts > ^^^^^^^^^^^^^^ - [58, 14]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + [58, 14]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > } > } > } diff --git a/tests/baselines/Issue5.baseline.txt b/tests/baselines/Issue5.baseline.txt index 13f66a12..654e53eb 100644 --- a/tests/baselines/Issue5.baseline.txt +++ b/tests/baselines/Issue5.baseline.txt @@ -44,8 +44,10 @@ let new_string = ^^"^^Changes End here^^" source.ts meta.var.expr.ts ^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -67,8 +69,10 @@ let new_string = ^^"^^Changes End here^^" source.ts meta.var.expr.ts ^^^^^^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -103,7 +107,7 @@ let new_string = ^^"^^Changes End here^^" ^^^^^^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -141,8 +145,10 @@ let new_string = ^^"^^Changes End here^^" source.ts meta.var.expr.ts ^^^^^^^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -211,8 +217,10 @@ let new_string = ^^"^^Changes End here^^" source.ts meta.var.expr.ts ^^^^^^^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -303,8 +311,10 @@ let new_string = ^^"^^Changes End here^^" source.ts meta.var.expr.ts ^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ diff --git a/tests/baselines/Issue90.baseline.txt b/tests/baselines/Issue90.baseline.txt index f0e6197a..9abb4bb2 100644 --- a/tests/baselines/Issue90.baseline.txt +++ b/tests/baselines/Issue90.baseline.txt @@ -16,8 +16,10 @@ original file source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -33,8 +35,10 @@ original file source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -50,8 +54,10 @@ original file source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ diff --git a/tests/baselines/Issue96.baseline.txt b/tests/baselines/Issue96.baseline.txt index 26d4d5d1..15c13f5e 100644 --- a/tests/baselines/Issue96.baseline.txt +++ b/tests/baselines/Issue96.baseline.txt @@ -51,8 +51,10 @@ const^^able^^ += " Royal, I say!"; source.ts meta.var.expr.ts ^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ @@ -84,11 +86,11 @@ const^^able^^ += " Royal, I say!"; ^ source.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts > ^ source.ts @@ -99,8 +101,10 @@ const^^able^^ += " Royal, I say!"; source.ts meta.var.expr.ts ^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ diff --git a/tests/baselines/Issue96.txt b/tests/baselines/Issue96.txt index b9fd0e57..c6d1a5c7 100644 --- a/tests/baselines/Issue96.txt +++ b/tests/baselines/Issue96.txt @@ -31,7 +31,7 @@ const^^able^^ += " Royal, I say!"; >var constenum = 10; ^^^^^^^^^ [7, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ [7, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts >constenum += 10; ^^^^^^^^^^ @@ -47,7 +47,7 @@ const^^able^^ += " Royal, I say!"; >var constable = "I am rrrrrroyal!"; ^^^^^^^^^ [11, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ [11, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts >constable += " Royal, I say!"; ^^^^^^^^^^ diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index 6267d75e..091c31e7 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -174,8 +174,10 @@ var e =
source.tsx meta.var.expr.tsx ^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx - ^^ + ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx >
^^^^ source.tsx @@ -268,8 +270,10 @@ var e =
source.tsx meta.var.expr.tsx ^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx - ^^ + ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ @@ -369,8 +373,10 @@ var e =
source.tsx meta.var.expr.tsx ^^^^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx - ^^ + ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ @@ -412,8 +418,16 @@ var e =
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.brace.curly.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.brace.curly.tsx keyword.operator.ternary.tsx + ^^^^^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.brace.curly.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.brace.curly.tsx keyword.operator.ternary.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.brace.curly.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^ @@ -459,8 +473,10 @@ var e =
source.tsx meta.var.expr.tsx ^^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx - ^^ + ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ @@ -490,8 +506,10 @@ var e =
source.tsx meta.var.expr.tsx ^^^^^^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx - ^^ + ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ @@ -522,8 +540,10 @@ var e =
source.tsx meta.var.expr.tsx ^^^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx - ^^ + ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ @@ -551,8 +571,10 @@ var e =
source.tsx meta.var.expr.tsx ^^^^^^^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx - ^^ + ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ @@ -607,8 +629,10 @@ var e =
source.tsx meta.var.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx - ^^ + ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ @@ -644,8 +668,10 @@ var e =
source.tsx meta.var.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx - ^^ + ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ @@ -701,8 +727,10 @@ var e =
source.tsx meta.var.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx - ^^ + ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ @@ -766,8 +794,10 @@ var e =
source.tsx meta.var.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx - ^^ + ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ @@ -809,8 +839,10 @@ var e =
source.tsx meta.var.expr.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx - ^^ + ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ diff --git a/tests/baselines/TsxSamples.txt b/tests/baselines/TsxSamples.txt index 64b44736..3c45546e 100644 --- a/tests/baselines/TsxSamples.txt +++ b/tests/baselines/TsxSamples.txt @@ -170,7 +170,7 @@ var e =
[31, 10]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx entity.name.tag.tsx ^^^^ [31, 17]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^^^ [31, 23]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.brace.curly.tsx > /> ^^ diff --git a/tests/baselines/constants.baseline.txt b/tests/baselines/constants.baseline.txt index 17aa32e3..c6a4ec70 100644 --- a/tests/baselines/constants.baseline.txt +++ b/tests/baselines/constants.baseline.txt @@ -16,8 +16,10 @@ var e = Infinity; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ @@ -31,8 +33,10 @@ var e = Infinity; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ @@ -46,8 +50,10 @@ var e = Infinity; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^^^ @@ -61,8 +67,10 @@ var e = Infinity; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ @@ -76,8 +84,10 @@ var e = Infinity; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -93,8 +103,10 @@ var e = Infinity; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -110,8 +122,10 @@ var e = Infinity; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^^ diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index 8179bd82..9e320d71 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -25,65 +25,71 @@ var ^^obj = { source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts >var a1 = 1, b1 = function (x) { return 1; }, c1 = "string" ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts storage.type.ts + source.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts + source.ts meta.var.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts + source.ts meta.var.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts storage.type.function.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts storage.type.function.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts constant.numeric.decimal.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts + source.ts meta.var.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts >var a2: string = "test", b2: () => void = () => { console.log("hello"); }, c2: string | number; ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -190,8 +196,10 @@ var ^^obj = { source.ts meta.var.expr.ts ^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -216,8 +224,10 @@ var ^^obj = { source.ts meta.var.expr.ts ^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ diff --git a/tests/baselines/multipleVariableDeclaration.txt b/tests/baselines/multipleVariableDeclaration.txt index 1b51c48a..8955ddb8 100644 --- a/tests/baselines/multipleVariableDeclaration.txt +++ b/tests/baselines/multipleVariableDeclaration.txt @@ -17,11 +17,11 @@ var ^^obj = { [1, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts >var a1 = 1, b1 = function (x) { return 1; }, c1 = "string" ^^ - [2, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + [2, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ - [2, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + [2, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ - [2, 46]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + [2, 46]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts >var a2: string = "test", b2: () => void = () => { console.log("hello"); }, c2: string | number; ^^ [3, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts diff --git a/tests/baselines/namespaceAndModule.baseline.txt b/tests/baselines/namespaceAndModule.baseline.txt index 4bf05606..9fc26ea5 100644 --- a/tests/baselines/namespaceAndModule.baseline.txt +++ b/tests/baselines/namespaceAndModule.baseline.txt @@ -13,11 +13,11 @@ declare ^^module "x" {} ^^^^ source.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^^ source.ts >module ts { } @@ -26,11 +26,11 @@ declare ^^module "x" {} ^^^^ source.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts + source.ts meta.decl.block.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^^ source.ts >declare namespace ts {} @@ -43,9 +43,9 @@ declare ^^module "x" {} ^^^^ source.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^^ source.ts >declare module ts {} @@ -58,9 +58,9 @@ declare ^^module "x" {} ^^^^ source.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^^ source.ts >declare module "x" {} @@ -81,6 +81,6 @@ declare ^^module "x" {} ^ source.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.decl.block.ts punctuation.definition.block.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file + source.ts meta.decl.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/numeric.baseline.txt b/tests/baselines/numeric.baseline.txt index aec781aa..3990c7c2 100644 --- a/tests/baselines/numeric.baseline.txt +++ b/tests/baselines/numeric.baseline.txt @@ -20,8 +20,10 @@ var k = 1; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ @@ -35,8 +37,10 @@ var k = 1; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ @@ -50,8 +54,10 @@ var k = 1; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^ @@ -65,8 +71,10 @@ var k = 1; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -84,8 +92,10 @@ var k = 1; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -103,8 +113,10 @@ var k = 1; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -120,8 +132,10 @@ var k = 1; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^ @@ -135,8 +149,10 @@ var k = 1; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -154,8 +170,10 @@ var k = 1; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -171,8 +189,10 @@ var k = 1; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -188,8 +208,10 @@ var k = 1; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index f56181b5..274d17d5 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -141,8 +141,10 @@ class Test { source.ts meta.var.expr.ts ^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ @@ -267,8 +269,10 @@ class Test { source.ts meta.var.expr.ts ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^ @@ -304,8 +308,10 @@ class Test { source.ts meta.var.expr.ts ^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^^^ diff --git a/tests/baselines/regexp.baseline.txt b/tests/baselines/regexp.baseline.txt index e04418b9..1e1289a4 100644 --- a/tests/baselines/regexp.baseline.txt +++ b/tests/baselines/regexp.baseline.txt @@ -11,8 +11,10 @@ var x = /\s*\b(async\s+)?function\b/g; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts ^ @@ -60,8 +62,10 @@ var x = /\s*\b(async\s+)?function\b/g; source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.regex.ts ^ From 80ad4f0612bd79d3627100f2a6ba2b925853fd83 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 19 Aug 2016 11:29:26 -0700 Subject: [PATCH 22/77] Export var, type and enums declarations --- TypeScript.YAML-tmLanguage | 21 ++++++++------- TypeScript.tmLanguage | 27 ++++++++++++++----- TypeScriptReact.YAML-tmLanguage | 21 ++++++++------- TypeScriptReact.tmLanguage | 27 ++++++++++++++----- tests/baselines/Issue237.baseline.txt | 4 +-- tests/baselines/Issue288.baseline.txt | 4 +-- tests/baselines/pr48_noSemiColon.baseline.txt | 10 +++---- tests/baselines/pr48_noSemiColon.txt | 8 +++--- 8 files changed, 79 insertions(+), 43 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index c6f8bb43..a3102d97 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -26,9 +26,10 @@ repository: var-expr: name: meta.var.expr.ts - begin: (?]|var|type|function|class|interface|namespace|enum|declare|export) patterns: - include: '#comment' @@ -134,11 +136,12 @@ repository: enum-declaration: name: meta.enum.declaration.ts - match: (?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) + match: (?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) captures: - '1': { name: storage.modifier.ts} - '2': { name: storage.type.enum.ts } - '3': { name: entity.name.type.enum.ts } + '1': { name: keyword.control.export.ts } + '2': { name: storage.modifier.ts} + '3': { name: storage.type.enum.ts } + '4': { name: entity.name.type.enum.ts } class-or-interface-declaration: name: meta.declaration.object.ts diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index a431fe3e..1bb2bb31 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -588,21 +588,26 @@ 1 name - storage.modifier.ts + keyword.control.export.ts 2 name - storage.type.enum.ts + storage.modifier.ts 3 + + name + storage.type.enum.ts + + 4 name entity.name.type.enum.ts match - (?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) + (?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) name meta.enum.declaration.ts @@ -2259,15 +2264,20 @@ type-declaration begin - \b(type)\b\s+([a-zA-Z_$][\w$]*)\s* + (?:(\bexport)\s+)?\b(type)\b\s+([a-zA-Z_$][\w$]*)\s* beginCaptures 1 name - storage.type.type.ts + keyword.control.export.ts 2 + + name + storage.type.type.ts + + 3 name entity.name.type.ts @@ -2571,10 +2581,15 @@ var-expr begin - (?<!\()\s*\b(var|let|const(?!\s+enum\b))\b + (?:(\bexport)\s+)?(?<!\()\s*\b(var|let|const(?!\s+enum\b))\b beginCaptures 1 + + name + keyword.control.export.ts + + 2 name storage.type.ts diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 5ac31756..0a5a3d6a 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -30,9 +30,10 @@ repository: var-expr: name: meta.var.expr.tsx - begin: (?]|var|type|function|class|interface|namespace|enum|declare|export) patterns: - include: '#comment' @@ -138,11 +140,12 @@ repository: enum-declaration: name: meta.enum.declaration.tsx - match: (?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) + match: (?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) captures: - '1': { name: storage.modifier.tsx} - '2': { name: storage.type.enum.tsx } - '3': { name: entity.name.type.enum.tsx } + '1': { name: keyword.control.export.tsx } + '2': { name: storage.modifier.tsx} + '3': { name: storage.type.enum.tsx } + '4': { name: entity.name.type.enum.tsx } class-or-interface-declaration: name: meta.declaration.object.tsx diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 0fac2ac8..4cbb774b 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -556,21 +556,26 @@ 1 name - storage.modifier.tsx + keyword.control.export.tsx 2 name - storage.type.enum.tsx + storage.modifier.tsx 3 + + name + storage.type.enum.tsx + + 4 name entity.name.type.enum.tsx match - (?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) + (?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) name meta.enum.declaration.tsx @@ -2660,15 +2665,20 @@ type-declaration begin - \b(type)\b\s+([a-zA-Z_$][\w$]*)\s* + (?:(\bexport)\s+)?\b(type)\b\s+([a-zA-Z_$][\w$]*)\s* beginCaptures 1 name - storage.type.type.tsx + keyword.control.export.tsx 2 + + name + storage.type.type.tsx + + 3 name entity.name.type.tsx @@ -2972,10 +2982,15 @@ var-expr begin - (?<!\()\s*\b(var|let|const(?!\s+enum\b))\b + (?:(\bexport)\s+)?(?<!\()\s*\b(var|let|const(?!\s+enum\b))\b beginCaptures 1 + + name + keyword.control.export.tsx + + 2 name storage.type.tsx diff --git a/tests/baselines/Issue237.baseline.txt b/tests/baselines/Issue237.baseline.txt index d7384efb..39eeb04c 100644 --- a/tests/baselines/Issue237.baseline.txt +++ b/tests/baselines/Issue237.baseline.txt @@ -6,9 +6,9 @@ export type Test = string // wrong comment color >export type Test = string // wrong comment color ^^^^^^ - source.ts storage.type.ts + source.ts meta.type.declaration.ts keyword.control.export.ts ^ - source.ts + source.ts meta.type.declaration.ts ^^^^ source.ts meta.type.declaration.ts storage.type.type.ts ^ diff --git a/tests/baselines/Issue288.baseline.txt b/tests/baselines/Issue288.baseline.txt index 0edfa82a..127a1fa2 100644 --- a/tests/baselines/Issue288.baseline.txt +++ b/tests/baselines/Issue288.baseline.txt @@ -104,7 +104,7 @@ return^^Name+=1; source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts >export var eAnotherName = function(){ ^^^^^^ - source.ts storage.type.ts + source.ts meta.var.expr.ts keyword.control.export.ts ^ source.ts meta.var.expr.ts ^^^ @@ -160,7 +160,7 @@ return^^Name+=1; source.ts >export var functionName2=1; ^^^^^^ - source.ts storage.type.ts + source.ts meta.var.expr.ts keyword.control.export.ts ^ source.ts meta.var.expr.ts ^^^ diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index 274d17d5..c85a86cd 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -115,9 +115,9 @@ class Test { source.ts >export type Stats = fs.Stats ^^^^^^ - source.ts storage.type.ts + source.ts meta.type.declaration.ts keyword.control.export.ts ^ - source.ts + source.ts meta.type.declaration.ts ^^^^ source.ts meta.type.declaration.ts storage.type.type.ts ^ @@ -132,7 +132,7 @@ class Test { source.ts meta.type.declaration.ts entity.name.type.ts >export const touch = thenify(tch) ^^^^^^ - source.ts storage.type.ts + source.ts meta.var.expr.ts keyword.control.export.ts ^ source.ts meta.var.expr.ts ^^^^^ @@ -260,7 +260,7 @@ class Test { source.ts >export const readFile = thenify(fs.readFile) ^^^^^^ - source.ts storage.type.ts + source.ts meta.var.expr.ts keyword.control.export.ts ^ source.ts meta.var.expr.ts ^^^^^ @@ -299,7 +299,7 @@ class Test { source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts >export const writeFile = thenify(fs.writeFile) ^^^^^^ - source.ts storage.type.ts + source.ts meta.var.expr.ts keyword.control.export.ts ^ source.ts meta.var.expr.ts ^^^^^ diff --git a/tests/baselines/pr48_noSemiColon.txt b/tests/baselines/pr48_noSemiColon.txt index c26f1d28..d48f63f8 100644 --- a/tests/baselines/pr48_noSemiColon.txt +++ b/tests/baselines/pr48_noSemiColon.txt @@ -43,14 +43,14 @@ class Test { > >export type Stats = fs.Stats ^^^^^^ - [7, 1]: source.ts storage.type.ts + [7, 1]: source.ts meta.type.declaration.ts keyword.control.export.ts ^^^^ [7, 8]: source.ts meta.type.declaration.ts storage.type.type.ts ^^^^^ [7, 13]: source.ts meta.type.declaration.ts entity.name.type.ts >export const touch = thenify(tch) ^^^^^^ - [8, 1]: source.ts storage.type.ts + [8, 1]: source.ts meta.var.expr.ts keyword.control.export.ts ^^^^^ [8, 8]: source.ts meta.var.expr.ts storage.type.ts ^^^^^ @@ -74,14 +74,14 @@ class Test { > >export const readFile = thenify(fs.readFile) ^^^^^^ - [18, 1]: source.ts storage.type.ts + [18, 1]: source.ts meta.var.expr.ts keyword.control.export.ts ^^^^^ [18, 8]: source.ts meta.var.expr.ts storage.type.ts ^^^^^^ [18, 33]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts >export const writeFile = thenify(fs.writeFile) ^^^^^^ - [19, 1]: source.ts storage.type.ts + [19, 1]: source.ts meta.var.expr.ts keyword.control.export.ts ^^^^^ [19, 8]: source.ts meta.var.expr.ts storage.type.ts ^^^^^^ From 7ec28838377369eb7b2b7a65108651905ed91106 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 19 Aug 2016 11:29:26 -0700 Subject: [PATCH 23/77] Detect { followed by => as body of the arrow function --- TypeScript.YAML-tmLanguage | 12 +++++ TypeScript.tmLanguage | 36 ++++++++++++++ TypeScriptReact.YAML-tmLanguage | 12 +++++ ...owFunctionInsideTypeAssertion.baseline.txt | 42 ++++++++-------- tests/baselines/Issue191.baseline.txt | 48 ++++++++++--------- tests/baselines/Issue191.txt | 12 ++--- .../multipleVariableDeclaration.baseline.txt | 20 ++++---- 7 files changed, 121 insertions(+), 61 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index a3102d97..e0cb553c 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -80,6 +80,7 @@ repository: - include: '#ternary-expression' - include: '#cast' - include: '#new-expr' + - include: '#arrow-body' - include: '#object-literal' - include: '#expression-operator' - include: '#imply-operator' @@ -338,6 +339,17 @@ repository: patterns: - include: '#statements' + arrow-body: + name: meta.decl.block.ts + begin: (?<==>)\s*(\{) + beginCaptures: + '1': { name: punctuation.definition.block.ts } + end: \} + endCaptures: + '0': { name: punctuation.definition.block.ts } + patterns: + - include: '#statements' + parameter-name: match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??)' captures: diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 1bb2bb31..cc066f1f 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -56,6 +56,38 @@ + arrow-body + + begin + (?<==>)\s*(\{) + beginCaptures + + 1 + + name + punctuation.definition.block.ts + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.block.ts + + + name + meta.decl.block.ts + patterns + + + include + #statements + + + await-modifier match @@ -657,6 +689,10 @@ include #new-expr + + include + #arrow-body + include #object-literal diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 0a5a3d6a..78c51f9a 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -84,6 +84,7 @@ repository: - include: '#paren-expression' - include: '#ternary-expression' - include: '#new-expr' + - include: '#arrow-body' - include: '#object-literal' - include: '#expression-operator' - include: '#imply-operator' @@ -342,6 +343,17 @@ repository: patterns: - include: '#statements' + arrow-body: + name: meta.decl.block.tsx + begin: (?<==>)\s*(\{) + beginCaptures: + '1': { name: punctuation.definition.block.tsx } + end: \} + endCaptures: + '0': { name: punctuation.definition.block.tsx } + patterns: + - include: '#statements' + parameter-name: match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??)' captures: diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index 7f0954f9..1eb3cc66 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -97,10 +97,8 @@ function f(x: string | ((value: string) => number)) { source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.brace.round.ts - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts - ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts support.type.primitive.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.brace.round.ts ^ @@ -108,47 +106,47 @@ function f(x: string | ((value: string) => number)) { ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts storage.type.function.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts punctuation.definition.block.ts > if (domNode.style.display !== desiredValue) { ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts keyword.control.conditional.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts keyword.control.conditional.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.brace.round.ts ^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts keyword.operator.comparison.ts ^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts > domNode.style.display = desiredValue; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts keyword.operator.assignment.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts keyword.operator.assignment.ts ^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts > } ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts > } ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index b7e5ad00..69a80a5b 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -142,29 +142,29 @@ class Thing<^^T, ^^U> { ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts punctuation.definition.string.template.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > }) ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts > }; @@ -233,8 +233,10 @@ class Thing<^^T, ^^U> { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts - ^^ + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ @@ -308,29 +310,29 @@ class Thing<^^T, ^^U> { ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts punctuation.definition.string.template.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts > }) ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts > }; diff --git a/tests/baselines/Issue191.txt b/tests/baselines/Issue191.txt index ed9e0865..bea8fad4 100644 --- a/tests/baselines/Issue191.txt +++ b/tests/baselines/Issue191.txt @@ -53,11 +53,11 @@ class Thing<^^T, ^^U> { [5, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - [6, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + [6, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - [6, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts + [6, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts ^ - [6, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + [6, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts > }) > }; >} @@ -97,11 +97,11 @@ class Thing<^^T, ^^U> { [15, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - [16, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + [16, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - [16, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts string.template.ts + [16, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts ^ - [16, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.brace.round.ts + [16, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts > }) > }; >} diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index 9e320d71..f05d912d 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -150,25 +150,25 @@ var ^^obj = { ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts storage.type.function.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts punctuation.definition.block.ts ^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts meta.brace.round.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts punctuation.definition.block.ts ^^ source.ts meta.var.expr.ts ^^ From 132088fb4187a5ca0f2ff665282bab0e663bee09 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 19 Aug 2016 11:29:26 -0700 Subject: [PATCH 24/77] Await is keyword.control and not modifier --- TypeScript.YAML-tmLanguage | 5 --- TypeScript.tmLanguage | 11 ------ TypeScriptReact.YAML-tmLanguage | 5 --- TypeScriptReact.tmLanguage | 41 +++++++++++++++++----- tests/baselines/awaitColoring.baseline.txt | 2 +- tests/baselines/awaitColoring.txt | 2 +- 6 files changed, 35 insertions(+), 31 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index e0cb553c..57928ebf 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -433,10 +433,6 @@ repository: - include: '#type' - include: '#function-type-parameters' - await-modifier: - name: storage.modifier.await.ts - match: '\bawait\b' - type-operator: name: keyword.operator.type.ts match: '[.|]' @@ -549,7 +545,6 @@ repository: function-call: name: functioncall.expr.ts patterns: - - include: '#await-modifier' - include: '#type-parameters' - include: '#paren-expression' diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index cc066f1f..54454813 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -88,13 +88,6 @@ - await-modifier - - match - \bawait\b - name - storage.modifier.await.ts - boolean-literal patterns @@ -848,10 +841,6 @@ functioncall.expr.ts patterns - - include - #await-modifier - include #type-parameters diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 78c51f9a..818aee7f 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -437,10 +437,6 @@ repository: - include: '#type' - include: '#function-type-parameters' - await-modifier: - name: storage.modifier.await.tsx - match: '\bawait\b' - type-operator: name: keyword.operator.type.tsx match: '[.|]' @@ -554,7 +550,6 @@ repository: function-call: name: functioncall.expr.tsx patterns: - - include: '#await-modifier' - include: '#type-parameters' - include: '#paren-expression' diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 4cbb774b..19498a4a 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -56,12 +56,37 @@ - await-modifier + arrow-body - match - \bawait\b + begin + (?<==>)\s*(\{) + beginCaptures + + 1 + + name + punctuation.definition.block.tsx + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.block.tsx + + name - storage.modifier.await.tsx + meta.decl.block.tsx + patterns + + + include + #statements + + boolean-literal @@ -625,6 +650,10 @@ include #new-expr + + include + #arrow-body + include #object-literal @@ -780,10 +809,6 @@ functioncall.expr.tsx patterns - - include - #await-modifier - include #type-parameters diff --git a/tests/baselines/awaitColoring.baseline.txt b/tests/baselines/awaitColoring.baseline.txt index d646f209..ed5ae69a 100644 --- a/tests/baselines/awaitColoring.baseline.txt +++ b/tests/baselines/awaitColoring.baseline.txt @@ -6,7 +6,7 @@ original file >await 1; ^^^^^ - source.ts storage.modifier.await.ts + source.ts keyword.control.flow.ts ^ source.ts ^ diff --git a/tests/baselines/awaitColoring.txt b/tests/baselines/awaitColoring.txt index a49cc21c..ab4c9f31 100644 --- a/tests/baselines/awaitColoring.txt +++ b/tests/baselines/awaitColoring.txt @@ -6,7 +6,7 @@ original file >await 1; ^^^^^ - [1, 1]: source.ts storage.modifier.await.ts + [1, 1]: source.ts keyword.control.flow.ts >awaiting 1; ^^^^^^^^^ [2, 1]: source.ts \ No newline at end of file From 87e32c64440dde117d9fa01838820c1300e10c76 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 19 Aug 2016 11:29:26 -0700 Subject: [PATCH 25/77] Fix for loop variable declarations --- TypeScript.YAML-tmLanguage | 22 ++++++- TypeScript.tmLanguage | 62 ++++++++++++++++++- TypeScriptReact.YAML-tmLanguage | 22 ++++++- TypeScriptReact.tmLanguage | 62 ++++++++++++++++++- ...owFunctionInsideTypeAssertion.baseline.txt | 2 +- tests/baselines/Issue191.baseline.txt | 4 +- tests/baselines/Issue239.baseline.txt | 2 +- tests/baselines/Issue241.baseline.txt | 10 +-- tests/baselines/Issue262.baseline.txt | 32 ++++++---- tests/baselines/Issue262.txt | 8 +-- tests/baselines/Issue335.baseline.txt | 20 +++--- tests/baselines/Issue37.baseline.txt | 8 ++- tests/baselines/Issue90.baseline.txt | 6 +- tests/baselines/Issue90.txt | 6 +- tests/baselines/javascript.baseline.txt | 6 +- 15 files changed, 216 insertions(+), 56 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 57928ebf..53cd478f 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -19,6 +19,7 @@ repository: - include: '#literal' - include: '#declaration' - include: '#switch-statement' + - include: '#for-loop' - include: '#decl-block' - include: '#control-statement' # add label @@ -26,7 +27,7 @@ repository: var-expr: name: meta.var.expr.ts - begin: (?:(\bexport)\s+)?(? match - (?<!\.)\b(break|continue|do|for|goto|while)\b + (?<!\.)\b(break|continue|do|goto|while)\b name keyword.control.loop.ts @@ -835,6 +835,45 @@ name forin.expr.ts + for-loop + + begin + (?<!\.)\b(for)\s*(\() + beginCaptures + + 1 + + name + keyword.control.loop.ts + + 2 + + name + meta.brace.round.ts + + + end + \) + endCaptures + + 0 + + name + meta.brace.round.ts + + + patterns + + + include + #var-expr + + + include + #expression + + + function-call name @@ -1952,6 +1991,10 @@ include #switch-statement + + include + #for-loop + include #decl-block @@ -2041,7 +2084,7 @@ switch-expression begin - \b(switch)\b\s*\( + \b(switch)\b\s*(\() beginCaptures 1 @@ -2049,9 +2092,22 @@ name keyword.control.switch.ts + 2 + + name + meta.brace.round.ts + end \) + endCaptures + + 0 + + name + meta.brace.round.ts + + name switch-expression.expr.ts patterns @@ -2606,7 +2662,7 @@ var-expr begin - (?:(\bexport)\s+)?(?<!\()\s*\b(var|let|const(?!\s+enum\b))\b + (?:(\bexport)\s+)?(?<!\.)\b(var|let|const(?!\s+enum\b))\b beginCaptures 1 diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 818aee7f..23855bfe 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -23,6 +23,7 @@ repository: - include: '#literal' - include: '#declaration' - include: '#switch-statement' + - include: '#for-loop' - include: '#decl-block' - include: '#control-statement' # add label @@ -30,7 +31,7 @@ repository: var-expr: name: meta.var.expr.tsx - begin: (?:(\bexport)\s+)?(? match - (?<!\.)\b(break|continue|do|for|goto|while)\b + (?<!\.)\b(break|continue|do|goto|while)\b name keyword.control.loop.tsx @@ -803,6 +803,45 @@ name forin.expr.tsx + for-loop + + begin + (?<!\.)\b(for)\s*(\() + beginCaptures + + 1 + + name + keyword.control.loop.tsx + + 2 + + name + meta.brace.round.tsx + + + end + \) + endCaptures + + 0 + + name + meta.brace.round.tsx + + + patterns + + + include + #var-expr + + + include + #expression + + + function-call name @@ -2353,6 +2392,10 @@ include #switch-statement + + include + #for-loop + include #decl-block @@ -2442,7 +2485,7 @@ switch-expression begin - \b(switch)\b\s*\( + \b(switch)\b\s*(\() beginCaptures 1 @@ -2450,9 +2493,22 @@ name keyword.control.switch.tsx + 2 + + name + meta.brace.round.tsx + end \) + endCaptures + + 0 + + name + meta.brace.round.tsx + + name switch-expression.expr.tsx patterns @@ -3007,7 +3063,7 @@ var-expr begin - (?:(\bexport)\s+)?(?<!\()\s*\b(var|let|const(?!\s+enum\b))\b + (?:(\bexport)\s+)?(?<!\.)\b(var|let|const(?!\s+enum\b))\b beginCaptures 1 diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index 1eb3cc66..a3c3698a 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -260,7 +260,7 @@ function f(x: string | ((value: string) => number)) { source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts > let f = <(v: string) => number> x ^^^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts ^^^ source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index 69a80a5b..403d3020 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -58,7 +58,7 @@ class Thing<^^T, ^^U> { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > var prop = Q.defer(); ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ @@ -226,7 +226,7 @@ class Thing<^^T, ^^U> { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > var prop = Q.defer(); ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ diff --git a/tests/baselines/Issue239.baseline.txt b/tests/baselines/Issue239.baseline.txt index d1827cd7..366a75bf 100644 --- a/tests/baselines/Issue239.baseline.txt +++ b/tests/baselines/Issue239.baseline.txt @@ -5,7 +5,7 @@ original file > const test = (true) ?

Broken Color

:

Also Broken Color

^ - source.tsx meta.var.expr.tsx + source.tsx ^^^^^ source.tsx meta.var.expr.tsx storage.type.tsx ^ diff --git a/tests/baselines/Issue241.baseline.txt b/tests/baselines/Issue241.baseline.txt index 36d818f2..2a50d334 100644 --- a/tests/baselines/Issue241.baseline.txt +++ b/tests/baselines/Issue241.baseline.txt @@ -52,7 +52,7 @@ function foo2(): [number, () => { x: number }] { source.ts meta.function.ts meta.decl.block.ts > const x = 0; ^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.function.ts meta.decl.block.ts ^^^^^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ @@ -119,7 +119,7 @@ function foo2(): [number, () => { x: number }] { source.ts meta.function.ts meta.decl.block.ts > const x = 0; ^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.function.ts meta.decl.block.ts ^^^^^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ @@ -176,7 +176,7 @@ function foo2(): [number, () => { x: number }] { source.ts meta.function.ts meta.decl.block.ts > const x = 0; ^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.function.ts meta.decl.block.ts ^^^^^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ @@ -243,7 +243,7 @@ function foo2(): [number, () => { x: number }] { source.ts meta.decl.block.ts > const x = 0; ^^^^ - source.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.decl.block.ts ^^^^^ source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ @@ -324,7 +324,7 @@ function foo2(): [number, () => { x: number }] { source.ts meta.function.ts meta.decl.block.ts > const x = 0; ^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.function.ts meta.decl.block.ts ^^^^^ source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ diff --git a/tests/baselines/Issue262.baseline.txt b/tests/baselines/Issue262.baseline.txt index fbe5ed6b..d85be8d5 100644 --- a/tests/baselines/Issue262.baseline.txt +++ b/tests/baselines/Issue262.baseline.txt @@ -15,15 +15,19 @@ for (^^let a = 1; a ^^< 10; a++) { ^ source.ts meta.brace.round.ts ^^^ - source.ts storage.type.ts - ^^^ - source.ts + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts keyword.operator.assignment.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts constant.numeric.decimal.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^^^ source.ts ^ @@ -52,15 +56,19 @@ for (^^let a = 1; a ^^< 10; a++) { ^ source.ts meta.decl.block.ts meta.brace.round.ts ^^^ - source.ts meta.block.ts storage.type.ts - ^^^ - source.ts meta.block.ts + source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.decl.block.ts meta.var.expr.ts + ^ + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.decl.block.ts keyword.operator.assignment.ts + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.decl.block.ts + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^^^ source.ts meta.decl.block.ts ^ diff --git a/tests/baselines/Issue262.txt b/tests/baselines/Issue262.txt index 3f158574..be75d6b8 100644 --- a/tests/baselines/Issue262.txt +++ b/tests/baselines/Issue262.txt @@ -9,16 +9,16 @@ for (^^let a = 1; a ^^< 10; a++) { >for (let a = 1; a < 10; a++) { ^^^ - [1, 6]: source.ts storage.type.ts + [1, 6]: source.ts meta.var.expr.ts storage.type.ts ^ [1, 19]: source.ts keyword.operator.relational.ts > for (let b = 1; b < a; b++) { ^^^ - [2, 5]: source.ts meta.block.ts keyword.control.loop.ts + [2, 5]: source.ts meta.decl.block.ts keyword.control.loop.ts ^^^ - [2, 10]: source.ts meta.block.ts storage.type.ts + [2, 10]: source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts > ^^^^^^^^^ - [3, 9]: source.ts meta.block.ts meta.block.ts + [3, 9]: source.ts meta.decl.block.ts meta.decl.block.ts > } >} \ No newline at end of file diff --git a/tests/baselines/Issue335.baseline.txt b/tests/baselines/Issue335.baseline.txt index 822d38d5..ffbaabfe 100644 --- a/tests/baselines/Issue335.baseline.txt +++ b/tests/baselines/Issue335.baseline.txt @@ -79,7 +79,7 @@ class A4 { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > let d; ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ @@ -165,7 +165,7 @@ class A4 { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > let d; ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ @@ -249,7 +249,7 @@ class A4 { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > let d ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ @@ -270,12 +270,14 @@ class A4 { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts - ^^ + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts ^ @@ -387,7 +389,7 @@ class A4 { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts > let d ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ @@ -408,12 +410,14 @@ class A4 { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts - ^^ + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts ^ diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index deb197ae..0851ed99 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -256,7 +256,7 @@ var j: I = {} source.ts meta.decl.block.ts > var c = a + b; ^ - source.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.decl.block.ts ^^^ source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts ^ @@ -283,12 +283,14 @@ var j: I = {} source.ts meta.decl.block.ts ^^^^^^ source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts - ^^ + ^ source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + ^ + source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts ^^^^^^^ source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts ^ source.ts meta.decl.block.ts switch-statement.expr.ts ^ diff --git a/tests/baselines/Issue90.baseline.txt b/tests/baselines/Issue90.baseline.txt index 9abb4bb2..929e305d 100644 --- a/tests/baselines/Issue90.baseline.txt +++ b/tests/baselines/Issue90.baseline.txt @@ -9,7 +9,7 @@ original file > var a = 0; ^ - source.ts meta.var.expr.ts + source.ts ^^^ source.ts meta.var.expr.ts storage.type.ts ^ @@ -28,7 +28,7 @@ original file source.ts > var b = 1; ^ - source.ts meta.var.expr.ts + source.ts ^^^ source.ts meta.var.expr.ts storage.type.ts ^ @@ -47,7 +47,7 @@ original file source.ts > var c = a ^ b; ^ - source.ts meta.var.expr.ts + source.ts ^^^ source.ts meta.var.expr.ts storage.type.ts ^ diff --git a/tests/baselines/Issue90.txt b/tests/baselines/Issue90.txt index 62673272..9f45ac0f 100644 --- a/tests/baselines/Issue90.txt +++ b/tests/baselines/Issue90.txt @@ -9,17 +9,17 @@ original file > var a = 0; ^ - [1, 1]: source.ts meta.var.expr.ts + [1, 1]: source.ts > var b = 1; ^ - [2, 1]: source.ts meta.var.expr.ts + [2, 1]: source.ts ^ [2, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ [2, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts > var c = a ^ b; ^ - [3, 1]: source.ts meta.var.expr.ts + [3, 1]: source.ts ^ [3, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^^ diff --git a/tests/baselines/javascript.baseline.txt b/tests/baselines/javascript.baseline.txt index 07d8734c..7ae7576a 100644 --- a/tests/baselines/javascript.baseline.txt +++ b/tests/baselines/javascript.baseline.txt @@ -13,12 +13,14 @@ x ^^instanceof y; >switch (x) { ^^^^^^ source.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts - ^^ + ^ source.ts switch-statement.expr.ts switch-expression.expr.ts + ^ + source.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts ^ source.ts switch-statement.expr.ts switch-expression.expr.ts ^ - source.ts switch-statement.expr.ts switch-expression.expr.ts + source.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts ^ source.ts switch-statement.expr.ts ^ From 8914364c2dedfd41355a9be36fcf2faf14211e63 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 19 Aug 2016 11:29:26 -0700 Subject: [PATCH 26/77] { after the operator is object literal and not the declaration block --- TypeScript.YAML-tmLanguage | 12 +++++++ TypeScript.tmLanguage | 36 +++++++++++++++++++ TypeScriptReact.YAML-tmLanguage | 12 +++++++ TypeScriptReact.tmLanguage | 36 +++++++++++++++++++ .../FunctionMethodReturnTypes.baseline.txt | 8 ++--- 5 files changed, 100 insertions(+), 4 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 53cd478f..11e0457b 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -20,6 +20,7 @@ repository: - include: '#declaration' - include: '#switch-statement' - include: '#for-loop' + - include: '#after-operator-block' - include: '#decl-block' - include: '#control-statement' # add label @@ -351,6 +352,17 @@ repository: patterns: - include: '#statements' + after-operator-block: + name: meta.block.ts + begin: (?<=[=(:,\[?+!]|^|await|return|yield|throw|in|of|typeof|&&|\|\|)\s*(\{) + beginCaptures: + '1': { name: punctuation.definition.block.ts } + end: \} + endCaptures: + '0': { name: punctuation.definition.block.ts } + patterns: + - include: '#object-member' + parameter-name: match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??)' captures: diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 7106264c..b0659944 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -24,6 +24,38 @@ name storage.modifier.ts + after-operator-block + + begin + (?<=[=(:,\[?+!]|^|await|return|yield|throw|in|of|typeof|&&|\|\|)\s*(\{) + beginCaptures + + 1 + + name + punctuation.definition.block.ts + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.block.ts + + + name + meta.block.ts + patterns + + + include + #object-member + + + array-literal begin @@ -1995,6 +2027,10 @@ include #for-loop + + include + #after-operator-block + include #decl-block diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 23855bfe..2c9b37de 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -24,6 +24,7 @@ repository: - include: '#declaration' - include: '#switch-statement' - include: '#for-loop' + - include: '#after-operator-block' - include: '#decl-block' - include: '#control-statement' # add label @@ -355,6 +356,17 @@ repository: patterns: - include: '#statements' + after-operator-block: + name: meta.block.tsx + begin: (?<=[=(:,\[?+!]|^|await|return|yield|throw|in|of|typeof|&&|\|\|)\s*(\{) + beginCaptures: + '1': { name: punctuation.definition.block.tsx } + end: \} + endCaptures: + '0': { name: punctuation.definition.block.tsx } + patterns: + - include: '#object-member' + parameter-name: match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??)' captures: diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index fbc4a799..4181bd73 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -24,6 +24,38 @@ name storage.modifier.tsx + after-operator-block + + begin + (?<=[=(:,\[?+!]|^|await|return|yield|throw|in|of|typeof|&&|\|\|)\s*(\{) + beginCaptures + + 1 + + name + punctuation.definition.block.tsx + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.block.tsx + + + name + meta.block.tsx + patterns + + + include + #object-member + + + array-literal begin @@ -2396,6 +2428,10 @@ include #for-loop + + include + #after-operator-block + include #decl-block diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt index 64dd6cdb..a95ce811 100644 --- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -121,7 +121,7 @@ class TestClass { ^^^^^^ source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts ^ @@ -182,7 +182,7 @@ class TestClass { ^^^^^^ source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.block.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts ^^ @@ -989,7 +989,7 @@ class TestClass { ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts ^ @@ -1048,7 +1048,7 @@ class TestClass { ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts ^^ From d5caa74e82ca52e42e469c4f9fadb7bbff7a4322 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 19 Aug 2016 11:29:26 -0700 Subject: [PATCH 27/77] rename meta.block to meta.object-literal --- TypeScript.YAML-tmLanguage | 4 +- TypeScript.tmLanguage | 4 +- TypeScriptReact.YAML-tmLanguage | 4 +- TypeScriptReact.tmLanguage | 4 +- ...owFunctionInsideTypeAssertion.baseline.txt | 98 ++++---- .../ArrowFunctionInsideTypeAssertion.txt | 18 +- .../FunctionMethodReturnTypes.baseline.txt | 216 +++++++++--------- tests/baselines/Issue37.baseline.txt | 14 +- tests/baselines/TsxSamples.baseline.txt | 36 +-- tests/baselines/TsxSamples.txt | 4 +- .../multipleVariableDeclaration.baseline.txt | 16 +- tests/baselines/pr48_noSemiColon.baseline.txt | 8 +- 12 files changed, 213 insertions(+), 213 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 11e0457b..d776d94a 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -320,7 +320,7 @@ repository: '3': { name: entity.name.function.ts } object-literal: - name: meta.block.ts + name: meta.object-literal.ts begin: \{ beginCaptures: '0': { name: punctuation.definition.block.ts } @@ -353,7 +353,7 @@ repository: - include: '#statements' after-operator-block: - name: meta.block.ts + name: meta.object-literal.ts begin: (?<=[=(:,\[?+!]|^|await|return|yield|throw|in|of|typeof|&&|\|\|)\s*(\{) beginCaptures: '1': { name: punctuation.definition.block.ts } diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index b0659944..ed38549c 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -47,7 +47,7 @@ name - meta.block.ts + meta.object-literal.ts patterns @@ -1452,7 +1452,7 @@ name - meta.block.ts + meta.object-literal.ts patterns diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 2c9b37de..ad849b41 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -324,7 +324,7 @@ repository: '3': { name: entity.name.function.tsx } object-literal: - name: meta.block.tsx + name: meta.object-literal.tsx begin: \{ beginCaptures: '0': { name: punctuation.definition.block.tsx } @@ -357,7 +357,7 @@ repository: - include: '#statements' after-operator-block: - name: meta.block.tsx + name: meta.object-literal.tsx begin: (?<=[=(:,\[?+!]|^|await|return|yield|throw|in|of|typeof|&&|\|\|)\s*(\{) beginCaptures: '1': { name: punctuation.definition.block.tsx } diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 4181bd73..45d6ae00 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -47,7 +47,7 @@ name - meta.block.tsx + meta.object-literal.tsx patterns @@ -1849,7 +1849,7 @@ name - meta.block.tsx + meta.object-literal.tsx patterns diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index a3c3698a..da7d027c 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -46,110 +46,110 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts > setTransform: <(domNode: HTMLElement, desiredValue: string) => void>null, ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts ^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts + 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 ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts + 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.paren.cover.ts meta.brace.round.ts ^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts + 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.paren.cover.ts entity.name.type.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts + 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.paren.cover.ts ^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts + 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.paren.cover.ts entity.name.type.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts + 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.paren.cover.ts ^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts + 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.paren.cover.ts entity.name.type.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts + 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.paren.cover.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts support.type.primitive.ts + 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.paren.cover.ts support.type.primitive.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts + 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.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts storage.type.function.arrow.ts + 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 ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts + 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 ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts + 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 ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts + 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 ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts constant.language.null.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts constant.language.null.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts > setDisplay: (domNode: HTMLElement, desiredValue: string) => { ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts ^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.brace.round.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts storage.type.function.arrow.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts storage.type.function.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts punctuation.definition.block.ts > if (domNode.style.display !== desiredValue) { ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts keyword.control.conditional.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.brace.round.ts ^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts keyword.operator.comparison.ts ^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts > domNode.style.display = desiredValue; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts keyword.operator.assignment.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts keyword.operator.assignment.ts ^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts > } ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts > } ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts > ^ source.ts diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt index 81d40ba2..b443bedd 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt @@ -29,23 +29,23 @@ function f(x: string | ((value: string) => number)) { >var object = { > setTransform: <(domNode: HTMLElement, desiredValue: string) => void>null, ^ - [4, 19]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts + [4, 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 ^ - [4, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts + [4, 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.paren.cover.ts meta.brace.round.ts ^^^^^^^ - [4, 21]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts + [4, 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.paren.cover.ts entity.name.type.ts ^^^^^^^^^^^ - [4, 30]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts + [4, 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.paren.cover.ts entity.name.type.ts ^^^^^^^^^^^^ - [4, 43]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts + [4, 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.paren.cover.ts entity.name.type.ts ^^^^^^ - [4, 57]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.paren.cover.ts support.type.primitive.ts + [4, 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.paren.cover.ts support.type.primitive.ts ^^ - [4, 65]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts storage.type.function.arrow.ts + [4, 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 ^^^^ - [4, 68]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts + [4, 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 ^^^^ - [4, 73]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts constant.language.null.ts + [4, 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 > setDisplay: (domNode: HTMLElement, desiredValue: string) => { > if (domNode.style.display !== desiredValue) { > domNode.style.display = desiredValue; diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt index a95ce811..5c1b960a 100644 --- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -121,11 +121,11 @@ class TestClass { ^^^^^^ source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ @@ -182,49 +182,49 @@ class TestClass { ^^^^^^ source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts ^ @@ -322,21 +322,21 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ @@ -685,47 +685,47 @@ class TestClass { ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^ source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ @@ -989,11 +989,11 @@ class TestClass { ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -1048,49 +1048,49 @@ class TestClass { ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts ^ @@ -1184,21 +1184,21 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ @@ -1537,47 +1537,47 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts ^ diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index 0851ed99..504eea34 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -229,11 +229,11 @@ var j: I = {} ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.object-literal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.object-literal.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts @@ -517,9 +517,9 @@ var j: I = {} ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts ^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts >interface I {} @@ -555,9 +555,9 @@ var j: I = {} ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts > ^ source.ts diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index 091c31e7..82c546f0 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -480,9 +480,9 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx punctuation.definition.block.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx punctuation.definition.block.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx punctuation.definition.block.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx punctuation.definition.block.tsx ^^ source.tsx >props.foo = x; @@ -547,23 +547,23 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx punctuation.definition.block.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx punctuation.definition.block.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx ^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx meta.object.member.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx meta.object.member.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx meta.object.member.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx meta.object.member.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx meta.object.member.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.block.tsx punctuation.definition.block.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx punctuation.definition.block.tsx >var component2 = ^^^ source.tsx meta.var.expr.tsx storage.type.tsx @@ -813,19 +813,19 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx punctuation.definition.block.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.object-literal.tsx punctuation.definition.block.tsx ^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.object-literal.tsx meta.object.member.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.object-literal.tsx meta.object.member.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.object-literal.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^^^^^^^^^^^^^^^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.object-literal.tsx meta.object.member.tsx string.quoted.single.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.object-literal.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx ^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx punctuation.definition.block.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.object-literal.tsx punctuation.definition.block.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx ^ diff --git a/tests/baselines/TsxSamples.txt b/tests/baselines/TsxSamples.txt index 3c45546e..31f8a0fe 100644 --- a/tests/baselines/TsxSamples.txt +++ b/tests/baselines/TsxSamples.txt @@ -219,9 +219,9 @@ var e =
[50, 26]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx >var d =
^^^^^^^ - [51, 40]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx + [51, 40]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.object-literal.tsx meta.object.member.tsx ^ - [51, 48]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.block.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + [51, 48]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx meta.object-literal.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx >var e =
^^^ [52, 37]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx string.jsxAttributeValue.quoted.double.tsx diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index f05d912d..91bef8e6 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -203,23 +203,23 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts > foo: "10" ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts string.quoted.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts >}, other = 10; ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts ^^ source.ts meta.var.expr.ts ^^^^^ diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index c85a86cd..a5b15d36 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -85,9 +85,9 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.object-literal.ts punctuation.definition.block.ts > private state = {} ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -104,9 +104,9 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.object-literal.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts From c8172856eb36547ea7ec372b1e4a86cd9325b115 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 19 Aug 2016 11:29:26 -0700 Subject: [PATCH 28/77] Rename meta.decl.block to meta.block --- TypeScript.YAML-tmLanguage | 4 +- TypeScript.tmLanguage | 4 +- TypeScriptReact.YAML-tmLanguage | 4 +- TypeScriptReact.tmLanguage | 4 +- tests/baselines/Abstracts.baseline.txt | 58 +- ...owFunctionInsideTypeAssertion.baseline.txt | 150 ++-- .../ArrowFunctionInsideTypeAssertion.txt | 16 +- .../FunctionMethodOverloads.baseline.txt | 100 +-- tests/baselines/FunctionMethodOverloads.txt | 8 +- .../FunctionMethodParameters.baseline.txt | 22 +- tests/baselines/FunctionMethodParameters.txt | 4 +- .../FunctionMethodReturnTypes.baseline.txt | 700 +++++++++--------- tests/baselines/FunctionMethodReturnTypes.txt | 52 +- tests/baselines/Issue149.baseline.txt | 32 +- tests/baselines/Issue149.txt | 4 +- tests/baselines/Issue153.baseline.txt | 478 ++++++------ tests/baselines/Issue156.baseline.txt | 8 +- tests/baselines/Issue156.txt | 2 +- tests/baselines/Issue191.baseline.txt | 224 +++--- tests/baselines/Issue191.txt | 44 +- tests/baselines/Issue200.baseline.txt | 16 +- tests/baselines/Issue241.baseline.txt | 120 +-- tests/baselines/Issue262.baseline.txt | 46 +- tests/baselines/Issue262.txt | 6 +- tests/baselines/Issue288.baseline.txt | 16 +- tests/baselines/Issue32.baseline.txt | 20 +- tests/baselines/Issue32.txt | 2 +- tests/baselines/Issue335.baseline.txt | 222 +++--- tests/baselines/Issue335.txt | 24 +- tests/baselines/Issue37.baseline.txt | 276 +++---- tests/baselines/Issue37.txt | 52 +- tests/baselines/Issue77.baseline.txt | 12 +- tests/baselines/Issue82.baseline.txt | 8 +- tests/baselines/Issue82.txt | 2 +- tests/baselines/Issue96.baseline.txt | 6 +- .../ParameterProperties.baseline.txt | 38 +- tests/baselines/TsxSamples.baseline.txt | 50 +- tests/baselines/TsxSamples.txt | 10 +- tests/baselines/docComments.baseline.txt | 6 +- .../multipleVariableDeclaration.baseline.txt | 34 +- .../baselines/namespaceAndModule.baseline.txt | 24 +- tests/baselines/pr48_noSemiColon.baseline.txt | 46 +- tests/baselines/pr48_noSemiColon.txt | 2 +- 43 files changed, 1478 insertions(+), 1478 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index d776d94a..71555690 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -331,7 +331,7 @@ repository: - include: '#object-member' decl-block: - name: meta.decl.block.ts + name: meta.block.ts begin: \{ beginCaptures: '0': { name: punctuation.definition.block.ts } @@ -342,7 +342,7 @@ repository: - include: '#statements' arrow-body: - name: meta.decl.block.ts + name: meta.block.ts begin: (?<==>)\s*(\{) beginCaptures: '1': { name: punctuation.definition.block.ts } diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index ed38549c..f655233c 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -111,7 +111,7 @@ name - meta.decl.block.ts + meta.block.ts patterns @@ -554,7 +554,7 @@ name - meta.decl.block.ts + meta.block.ts patterns diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index ad849b41..07d2b503 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -335,7 +335,7 @@ repository: - include: '#object-member' decl-block: - name: meta.decl.block.tsx + name: meta.block.tsx begin: \{ beginCaptures: '0': { name: punctuation.definition.block.tsx } @@ -346,7 +346,7 @@ repository: - include: '#statements' arrow-body: - name: meta.decl.block.tsx + name: meta.block.tsx begin: (?<==>)\s*(\{) beginCaptures: '1': { name: punctuation.definition.block.tsx } diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 45d6ae00..f5638237 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -111,7 +111,7 @@ name - meta.decl.block.tsx + meta.block.tsx patterns @@ -522,7 +522,7 @@ name - meta.decl.block.tsx + meta.block.tsx patterns diff --git a/tests/baselines/Abstracts.baseline.txt b/tests/baselines/Abstracts.baseline.txt index 57006fe8..44cd7802 100644 --- a/tests/baselines/Abstracts.baseline.txt +++ b/tests/baselines/Abstracts.baseline.txt @@ -66,27 +66,27 @@ cow.makeSound(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.arithmetic.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.arithmetic.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > abstract makeSound(): string; ^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -145,23 +145,23 @@ cow.makeSound(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts @@ -199,23 +199,23 @@ cow.makeSound(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index da7d027c..313b328a 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -106,47 +106,47 @@ function f(x: string | ((value: string) => number)) { ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts storage.type.function.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts > if (domNode.style.display !== desiredValue) { ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.brace.round.ts ^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts keyword.operator.comparison.ts ^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.block.ts punctuation.definition.block.ts > domNode.style.display = desiredValue; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts keyword.operator.assignment.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.block.ts keyword.operator.assignment.ts ^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.block.ts > } ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.block.ts punctuation.definition.block.ts > } ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts @@ -203,125 +203,125 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > if (typeof x === "string") { ^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.function.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.operator.typeof.ts + source.ts meta.function.ts meta.block.ts keyword.operator.typeof.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.function.ts meta.block.ts keyword.operator.comparison.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.block.ts punctuation.definition.block.ts > return +x ^^^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts keyword.operator.arithmetic.ts + source.ts meta.function.ts meta.block.ts meta.block.ts keyword.operator.arithmetic.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts meta.block.ts > } ^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.block.ts punctuation.definition.block.ts > else { ^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.function.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.block.ts punctuation.definition.block.ts > let f = <(v: string) => number> x ^^^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts meta.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + 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 ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts + source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts + 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 ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts + 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.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts + 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.paren.cover.ts entity.name.type.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts + 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.paren.cover.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts support.type.primitive.ts + 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.paren.cover.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts + 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.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts + source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.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 + 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 ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts + 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 ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts + 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 ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts + 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 ^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts > return f("hello world") ^^^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts meta.block.ts keyword.control.flow.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts string.quoted.double.ts + source.ts meta.function.ts meta.block.ts meta.block.ts string.quoted.double.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.block.ts meta.brace.round.ts > } ^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt index b443bedd..95e499ee 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.txt @@ -60,21 +60,21 @@ function f(x: string | ((value: string) => number)) { > else { > let f = <(v: string) => number> x ^ - [17, 17]: source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts + [17, 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 ^ - [17, 18]: source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts meta.brace.round.ts + [17, 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.paren.cover.ts meta.brace.round.ts ^ - [17, 19]: source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts entity.name.type.ts + [17, 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.paren.cover.ts entity.name.type.ts ^^^^^^ - [17, 22]: source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.paren.cover.ts support.type.primitive.ts + [17, 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.paren.cover.ts support.type.primitive.ts ^^ - [17, 30]: source.ts meta.function.ts meta.decl.block.ts meta.decl.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 + [17, 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 ^^^^^^ - [17, 33]: source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.type.function.return.ts support.type.primitive.ts + [17, 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 ^ - [17, 39]: source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts cast.expr.ts meta.brace.angle.ts + [17, 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 ^^ - [17, 41]: source.ts meta.function.ts meta.decl.block.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + [17, 41]: source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts > return f("hello world") > } >} diff --git a/tests/baselines/FunctionMethodOverloads.baseline.txt b/tests/baselines/FunctionMethodOverloads.baseline.txt index 41f5a66e..7a49939b 100644 --- a/tests/baselines/FunctionMethodOverloads.baseline.txt +++ b/tests/baselines/FunctionMethodOverloads.baseline.txt @@ -278,31 +278,31 @@ abstract class C { ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > throw new Error("") ^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts + source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.function.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts + source.ts meta.function.ts meta.block.ts new.expr.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.function.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts @@ -541,31 +541,31 @@ abstract class C { ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > throw new Error("") ^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts + source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.function.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts + source.ts meta.function.ts meta.block.ts new.expr.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.function.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts @@ -799,33 +799,33 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > throw new Error("") ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts > } ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1052,33 +1052,33 @@ abstract class C { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > throw new Error("") ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts > } ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts diff --git a/tests/baselines/FunctionMethodOverloads.txt b/tests/baselines/FunctionMethodOverloads.txt index f4a6e464..3e34c5a9 100644 --- a/tests/baselines/FunctionMethodOverloads.txt +++ b/tests/baselines/FunctionMethodOverloads.txt @@ -85,7 +85,7 @@ abstract class C { [7, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts > throw new Error("") ^^^^^ - [8, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts + [8, 5]: source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts >} > >export function testFunctionOverloadWithSemicolon(p: number): new () => any; @@ -120,7 +120,7 @@ abstract class C { [16, 17]: source.ts meta.function.ts entity.name.function.ts > throw new Error("") ^^^^^ - [17, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts + [17, 5]: source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts >} > > @@ -158,7 +158,7 @@ abstract class C { [28, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts > throw new Error("") ^^^^^ - [29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts + [29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts > } > > public testMethodOverloadWithSemicolon(p: number): new () => any; @@ -193,7 +193,7 @@ abstract class C { [37, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts > throw new Error("") ^^^^^ - [38, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts + [38, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts > } >} > diff --git a/tests/baselines/FunctionMethodParameters.baseline.txt b/tests/baselines/FunctionMethodParameters.baseline.txt index fcdd9dd6..bc6eae98 100644 --- a/tests/baselines/FunctionMethodParameters.baseline.txt +++ b/tests/baselines/FunctionMethodParameters.baseline.txt @@ -342,17 +342,17 @@ class testClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > return m6.length; ^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^^^^^^^^^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts @@ -680,19 +680,19 @@ class testClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > return m6.length; ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > } ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/FunctionMethodParameters.txt b/tests/baselines/FunctionMethodParameters.txt index 70cb7a05..bcfb6879 100644 --- a/tests/baselines/FunctionMethodParameters.txt +++ b/tests/baselines/FunctionMethodParameters.txt @@ -67,7 +67,7 @@ class testClass { [12, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts > return m6.length; ^^^^^^ - [13, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + [13, 5]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts >} > >class testClass { @@ -105,6 +105,6 @@ class testClass { [28, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts > return m6.length; ^^^^^^ - [29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + [29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts > } >} \ No newline at end of file diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt index 5c1b960a..c8692377 100644 --- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -70,25 +70,25 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType2(): {} { return {} } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -115,21 +115,21 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -176,59 +176,59 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType4(): [number, number] { return [1, 1] } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -261,27 +261,27 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.decimal.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts constant.numeric.decimal.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.decimal.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts constant.numeric.decimal.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType5(): Array { return [{ m: "" }] } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -312,37 +312,37 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType6(): new () => number { throw new Error(""); } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -381,31 +381,31 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts + source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.function.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts + source.ts meta.function.ts meta.block.ts new.expr.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.function.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType7(): (() => number) { throw new Error(""); } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -444,31 +444,31 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts + source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.function.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts + source.ts meta.function.ts meta.block.ts new.expr.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.function.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType8(): (() => number) [] { throw new Error(""); } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -513,31 +513,31 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts + source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.function.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts + source.ts meta.function.ts meta.block.ts new.expr.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.function.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType9(): (() => number) | (() => string) { throw new Error(""); } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -598,31 +598,31 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts + source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.function.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts + source.ts meta.function.ts meta.block.ts new.expr.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.function.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType10(): {a: A, b: B} [] { return [{a: {m: "" }, b: {m1: "" }}] } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -675,63 +675,63 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts ^^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType11(): number | string { return 1 } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -764,19 +764,19 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.function.ts meta.block.ts constant.numeric.decimal.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType12(): number | string [] { return } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -815,15 +815,15 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >export function testFunctionReturnType13(): [number, number] | string [] { return [""] } ^^^^^^ source.ts meta.function.ts keyword.control.export.ts @@ -870,25 +870,25 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts @@ -940,25 +940,25 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > public testMethodReturnType2(): {} { return {} } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -983,21 +983,21 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > public testMethodReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1042,59 +1042,59 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > public testMethodReturnType4(): [number, number] { return [1, 1] } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1125,27 +1125,27 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts constant.numeric.decimal.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts constant.numeric.decimal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > public testMethodReturnType5(): Array { return [{ m: "" }] } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1174,37 +1174,37 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > public testMethodReturnType6(): new () => number { throw new Error(""); } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1241,31 +1241,31 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.function.return.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > public testMethodReturnType7(): (() => number) { throw new Error(""); } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1302,31 +1302,31 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > public testMethodReturnType8(): (() => number) [] { throw new Error(""); } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1369,31 +1369,31 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > public testMethodReturnType9(): (() => number) | (() => string) { throw new Error(""); } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1452,31 +1452,31 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > public testMethodReturnType10(): {a: A, b: B} [] { return [{a: {m: "" }, b: {m1: "" }}] } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1527,63 +1527,63 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > public testMethodReturnType11(): number | string { return 1 } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1614,19 +1614,19 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > public testMethodReturnType12(): number | string [] { return } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1663,15 +1663,15 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > public testMethodReturnType13(): [number, number] | string [] { return [""] } ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -1716,25 +1716,25 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/FunctionMethodReturnTypes.txt b/tests/baselines/FunctionMethodReturnTypes.txt index a533b777..912e1599 100644 --- a/tests/baselines/FunctionMethodReturnTypes.txt +++ b/tests/baselines/FunctionMethodReturnTypes.txt @@ -40,91 +40,91 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ [2, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [2, 56]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + [2, 56]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts >export function testFunctionReturnType2(): {} { return {} } ^^^^^^ [3, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [3, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [3, 49]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + [3, 49]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts >export function testFunctionReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} } ^^^^^^ [4, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [4, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [4, 59]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + [4, 59]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts >export function testFunctionReturnType4(): [number, number] { return [1, 1] } ^^^^^^ [5, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [5, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [5, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + [5, 63]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts >export function testFunctionReturnType5(): Array { return [{ m: "" }] } ^^^^^^ [6, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [6, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [6, 55]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + [6, 55]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts >export function testFunctionReturnType6(): new () => number { throw new Error(""); } ^^^^^^ [7, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [7, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^ - [7, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts + [7, 63]: source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts >export function testFunctionReturnType7(): (() => number) { throw new Error(""); } ^^^^^^ [8, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [8, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^ - [8, 61]: source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts + [8, 61]: source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts >export function testFunctionReturnType8(): (() => number) [] { throw new Error(""); } ^^^^^^ [9, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [9, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^ - [9, 64]: source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts + [9, 64]: source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts >export function testFunctionReturnType9(): (() => number) | (() => string) { throw new Error(""); } ^^^^^^ [10, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^ [10, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^ - [10, 78]: source.ts meta.function.ts meta.decl.block.ts keyword.control.trycatch.ts + [10, 78]: source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts >export function testFunctionReturnType10(): {a: A, b: B} [] { return [{a: {m: "" }, b: {m1: "" }}] } ^^^^^^ [11, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^^ [11, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [11, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + [11, 63]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts >export function testFunctionReturnType11(): number | string { return 1 } ^^^^^^ [12, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^^ [12, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [12, 63]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + [12, 63]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts >export function testFunctionReturnType12(): number | string [] { return } ^^^^^^ [13, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^^ [13, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [13, 66]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + [13, 66]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts >export function testFunctionReturnType13(): [number, number] | string [] { return [""] } ^^^^^^ [14, 1]: source.ts meta.function.ts keyword.control.export.ts ^^^^^^^^^^^^^^^^^^^^^^^^ [14, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [14, 76]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + [14, 76]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts > >class TestClass { > /* method return type tests */ @@ -134,89 +134,89 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ [18, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [18, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + [18, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts > public testMethodReturnType2(): {} { return {} } ^^^^^^ [19, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [19, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [19, 42]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + [19, 42]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts > public testMethodReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} } ^^^^^^ [20, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [20, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [20, 52]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + [20, 52]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts > public testMethodReturnType4(): [number, number] { return [1, 1] } ^^^^^^ [21, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [21, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [21, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + [21, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts > public testMethodReturnType5(): Array { return [{ m: "" }] } ^^^^^^ [22, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [22, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [22, 48]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + [22, 48]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts > public testMethodReturnType6(): new () => number { throw new Error(""); } ^^^^^^ [23, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [23, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^ - [23, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts + [23, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts > public testMethodReturnType7(): (() => number) { throw new Error(""); } ^^^^^^ [24, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [24, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^ - [24, 54]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts + [24, 54]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts > public testMethodReturnType8(): (() => number) [] { throw new Error(""); } ^^^^^^ [25, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [25, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^ - [25, 57]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts + [25, 57]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts > public testMethodReturnType9(): (() => number) | (() => string) { throw new Error(""); } ^^^^^^ [26, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^ [26, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^ - [26, 71]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.trycatch.ts + [26, 71]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts > public testMethodReturnType10(): {a: A, b: B} [] { return [{a: {m: "" }, b: {m1: "" }}] } ^^^^^^ [27, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^^ [27, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [27, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + [27, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts > public testMethodReturnType11(): number | string { return 1 } ^^^^^^ [28, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^^ [28, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [28, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + [28, 56]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts > public testMethodReturnType12(): number | string [] { return } ^^^^^^ [29, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^^ [29, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [29, 59]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + [29, 59]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts > public testMethodReturnType13(): [number, number] | string [] { return [""] } ^^^^^^ [30, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts ^^^^^^^^^^^^^^^^^^^^^^ [30, 12]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^^^^^ - [30, 69]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + [30, 69]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts >} \ No newline at end of file diff --git a/tests/baselines/Issue149.baseline.txt b/tests/baselines/Issue149.baseline.txt index 4cc44879..8a73a6e2 100644 --- a/tests/baselines/Issue149.baseline.txt +++ b/tests/baselines/Issue149.baseline.txt @@ -128,23 +128,23 @@ original file ^ source.ts meta.function.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > return ""; ^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts @@ -269,20 +269,20 @@ original file ^ source.ts meta.function.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > return ""; ^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts meta.function.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.function.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts \ No newline at end of file + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue149.txt b/tests/baselines/Issue149.txt index 71f7ca84..9f58a7d8 100644 --- a/tests/baselines/Issue149.txt +++ b/tests/baselines/Issue149.txt @@ -43,7 +43,7 @@ original file [4, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts > return ""; ^^^^^^ - [5, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + [5, 5]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts >} > >export function fn(s: string): new () => View; @@ -72,5 +72,5 @@ original file [11, 17]: source.ts meta.function.ts entity.name.function.ts > return ""; ^^^^^^ - [12, 5]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + [12, 5]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts >} \ No newline at end of file diff --git a/tests/baselines/Issue153.baseline.txt b/tests/baselines/Issue153.baseline.txt index bc8334b0..28551950 100644 --- a/tests/baselines/Issue153.baseline.txt +++ b/tests/baselines/Issue153.baseline.txt @@ -65,11 +65,11 @@ class Matrix { ^ source.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^^^^^^^^^^^^^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ source.ts ^^^^ @@ -395,251 +395,251 @@ class Matrix { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > if (index == 0) { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > return new Vector3(this.M11, this.M21, this.M31); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > } else if (index == 1) { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > return new Vector3(this.M12, this.M22, this.M32); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > } else if (index == 2) { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > return new Vector3(this.M13, this.M23, this.M33); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > } else { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > throw new RangeError('Invalid matrix 3x3 column index: ' + index); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.trycatch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts keyword.control.trycatch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.quoted.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.quoted.single.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.operator.arithmetic.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts keyword.operator.arithmetic.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > } ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > } ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > @@ -731,251 +731,251 @@ class Matrix { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > if (index == 0) { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > return new Vector(this.M11, this.M21, this.M31); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > } else if (index == 1) { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > return new Vector(this.M12, this.M22, this.M32); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > } else if (index == 2) { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > return new Vector(this.M13, this.M23, this.M33); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > } else { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > throw new RangeError('Invalid matrix 3x3 column index: ' + index); ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.control.trycatch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts keyword.control.trycatch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.quoted.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.quoted.single.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts keyword.operator.arithmetic.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts keyword.operator.arithmetic.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > } ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > } ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > diff --git a/tests/baselines/Issue156.baseline.txt b/tests/baselines/Issue156.baseline.txt index e6e6798a..314efd58 100644 --- a/tests/baselines/Issue156.baseline.txt +++ b/tests/baselines/Issue156.baseline.txt @@ -64,15 +64,15 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > } ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue156.txt b/tests/baselines/Issue156.txt index 09be6158..6216fbb5 100644 --- a/tests/baselines/Issue156.txt +++ b/tests/baselines/Issue156.txt @@ -25,6 +25,6 @@ class Test { > { > ^^^^^^^^^ - [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > } >} \ No newline at end of file diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index 403d3020..49997d2b 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -55,123 +55,123 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > var prop = Q.defer(); ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > this.store = new Data(); ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > gaze(path.join(this.content, "**/*.json"), (err, watch) => { ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts punctuation.definition.string.template.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts punctuation.definition.string.template.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > }) ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts > }; ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} @@ -223,123 +223,123 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > var prop = Q.defer(); ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > this.store = new Data(); ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts keyword.operator.new.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > gaze(path.join(this.content, "**/*.json"), (err, watch) => { ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts punctuation.definition.string.template.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts punctuation.definition.string.template.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > }) ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts > }; ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts >} diff --git a/tests/baselines/Issue191.txt b/tests/baselines/Issue191.txt index bea8fad4..363dce92 100644 --- a/tests/baselines/Issue191.txt +++ b/tests/baselines/Issue191.txt @@ -34,30 +34,30 @@ class Thing<^^T, ^^U> { [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts > var prop = Q.defer(); ^^^^ - [3, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + [3, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^^^^^^ - [3, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts + [3, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ - [3, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + [3, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts > this.store = new Data(); ^^^^ - [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts ^^^^ - [4, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + [4, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts > gaze(path.join(this.content, "**/*.json"), (err, watch) => { ^^^^^^^^^^^^ - [5, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [5, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^^^^ - [5, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts + [5, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts ^ - [5, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + [5, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - [6, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + [6, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - [6, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts + [6, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts ^ - [6, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + [6, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts > }) > }; >} @@ -78,30 +78,30 @@ class Thing<^^T, ^^U> { [12, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts > var prop = Q.defer(); ^^^^ - [13, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + [13, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^^^^^^ - [13, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts + [13, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ - [13, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + [13, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts > this.store = new Data(); ^^^^ - [14, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + [14, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts ^^^^ - [14, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts + [14, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts > gaze(path.join(this.content, "**/*.json"), (err, watch) => { ^^^^^^^^^^^^ - [15, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [15, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^^^^ - [15, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts + [15, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts ^ - [15, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + [15, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - [16, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + [16, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - [16, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts + [16, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts ^ - [16, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts + [16, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts > }) > }; >} diff --git a/tests/baselines/Issue200.baseline.txt b/tests/baselines/Issue200.baseline.txt index 365c3249..4874a1e2 100644 --- a/tests/baselines/Issue200.baseline.txt +++ b/tests/baselines/Issue200.baseline.txt @@ -32,20 +32,20 @@ original file ^ source.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts > import alias = lool.clutz.goog.i18n.NumberFormatSymbols_en_TT; ^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^^^^^^ - source.ts meta.decl.block.ts keyword.control.import.ts + source.ts meta.block.ts keyword.control.import.ts ^^^^^^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^ - source.ts meta.decl.block.ts keyword.operator.assignment.ts + source.ts meta.block.ts keyword.operator.assignment.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts > export default alias; ^^ source.ts meta.block.ts @@ -59,4 +59,4 @@ original file source.ts meta.decl.block.ts >} ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts \ No newline at end of file + source.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue241.baseline.txt b/tests/baselines/Issue241.baseline.txt index 2a50d334..fee0b7b5 100644 --- a/tests/baselines/Issue241.baseline.txt +++ b/tests/baselines/Issue241.baseline.txt @@ -47,31 +47,31 @@ function foo2(): [number, () => { x: number }] { ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts > const x = 0; ^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts >function foo(): [number, () => number] { @@ -114,31 +114,31 @@ function foo2(): [number, () => { x: number }] { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts > const x = 0; ^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts >function f(): () => number { @@ -171,31 +171,31 @@ function foo2(): [number, () => { x: number }] { ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts > const x = 0; ^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts >function f2(): () => {x: number }{ @@ -238,31 +238,31 @@ function foo2(): [number, () => { x: number }] { ^ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts > const x = 0; ^^^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^^^^^ - source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.block.ts meta.var.expr.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts >} ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts >function foo2(): [number, () => { x: number }] { @@ -319,28 +319,28 @@ function foo2(): [number, () => { x: number }] { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts > const x = 0; ^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts \ No newline at end of file + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue262.baseline.txt b/tests/baselines/Issue262.baseline.txt index d85be8d5..966ed519 100644 --- a/tests/baselines/Issue262.baseline.txt +++ b/tests/baselines/Issue262.baseline.txt @@ -45,52 +45,52 @@ for (^^let a = 1; a ^^< 10; a++) { ^ source.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts > for (let b = 1; b < a; b++) { ^^^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^^^ - source.ts meta.decl.block.ts keyword.control.loop.ts + source.ts meta.block.ts keyword.control.loop.ts ^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^ - source.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.block.ts meta.brace.round.ts ^^^ - source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.block.ts meta.var.expr.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts ^^^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^ - source.ts meta.decl.block.ts keyword.operator.relational.ts + source.ts meta.block.ts keyword.operator.relational.ts ^^^^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^^ - source.ts meta.decl.block.ts keyword.operator.increment.ts + source.ts meta.block.ts keyword.operator.increment.ts ^ - source.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^ - source.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts > ^^^^^^^^^ - source.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.block.ts meta.block.ts > } ^^^^ - source.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.block.ts meta.block.ts ^ - source.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts \ No newline at end of file + source.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue262.txt b/tests/baselines/Issue262.txt index be75d6b8..3ecb412c 100644 --- a/tests/baselines/Issue262.txt +++ b/tests/baselines/Issue262.txt @@ -14,11 +14,11 @@ for (^^let a = 1; a ^^< 10; a++) { [1, 19]: source.ts keyword.operator.relational.ts > for (let b = 1; b < a; b++) { ^^^ - [2, 5]: source.ts meta.decl.block.ts keyword.control.loop.ts + [2, 5]: source.ts meta.block.ts keyword.control.loop.ts ^^^ - [2, 10]: source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + [2, 10]: source.ts meta.block.ts meta.var.expr.ts storage.type.ts > ^^^^^^^^^ - [3, 9]: source.ts meta.decl.block.ts meta.decl.block.ts + [3, 9]: source.ts meta.block.ts meta.block.ts > } >} \ No newline at end of file diff --git a/tests/baselines/Issue288.baseline.txt b/tests/baselines/Issue288.baseline.txt index 127a1fa2..0fc4c84f 100644 --- a/tests/baselines/Issue288.baseline.txt +++ b/tests/baselines/Issue288.baseline.txt @@ -51,10 +51,10 @@ return^^Name+=1; ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >var AnotherName = function(){ ^^^ source.ts meta.var.expr.ts storage.type.ts @@ -75,10 +75,10 @@ return^^Name+=1; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts @@ -98,10 +98,10 @@ return^^Name+=1; ^ source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >export var eAnotherName = function(){ ^^^^^^ source.ts meta.var.expr.ts keyword.control.export.ts @@ -126,10 +126,10 @@ return^^Name+=1; ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts diff --git a/tests/baselines/Issue32.baseline.txt b/tests/baselines/Issue32.baseline.txt index 230b4d23..0e629380 100644 --- a/tests/baselines/Issue32.baseline.txt +++ b/tests/baselines/Issue32.baseline.txt @@ -133,23 +133,23 @@ original file ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > this.currentData = d; ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts ^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > } ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > constructor(m: number, n: string){} ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -180,9 +180,9 @@ original file ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts diff --git a/tests/baselines/Issue32.txt b/tests/baselines/Issue32.txt index d7675c75..7f10a030 100644 --- a/tests/baselines/Issue32.txt +++ b/tests/baselines/Issue32.txt @@ -52,7 +52,7 @@ original file [13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts > this.currentData = d; ^^^^ - [14, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + [14, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts > } > constructor(m: number, n: string){} ^^^^^^^^^^^ diff --git a/tests/baselines/Issue335.baseline.txt b/tests/baselines/Issue335.baseline.txt index ffbaabfe..b5622590 100644 --- a/tests/baselines/Issue335.baseline.txt +++ b/tests/baselines/Issue335.baseline.txt @@ -76,34 +76,34 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > let d; ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > d.default = 1; ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > } ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -127,12 +127,12 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > } ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts @@ -162,32 +162,32 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > let d; ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > d.case = 1 ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts > } ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -211,12 +211,12 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > } ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts @@ -246,88 +246,88 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > let d ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts > d.default = 1 ^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts > switch (d.default) { ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts > case 1: ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts > case 2: ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts > default: ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts > break; ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts > } ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts punctuation.definition.block.ts > } ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -351,12 +351,12 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > } ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts @@ -386,88 +386,88 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > let d ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts > d.case = 1 ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts > switch (d.default) { ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts > case 1: ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts > case 2: ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts > default: ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts > break; ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts > } ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts punctuation.definition.block.ts > } ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -491,12 +491,12 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > } ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue335.txt b/tests/baselines/Issue335.txt index 92c52f66..52ab51e7 100644 --- a/tests/baselines/Issue335.txt +++ b/tests/baselines/Issue335.txt @@ -58,7 +58,7 @@ class A4 { > let d; > d.default = 1; ^^^^^^^^^^^^ - [4, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [4, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > } > > private static c() { @@ -74,7 +74,7 @@ class A4 { > let d; > d.case = 1 ^^^^^^^^^ - [14, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [14, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > } > > private static c() { @@ -90,19 +90,19 @@ class A4 { > let d > d.default = 1 ^^^^^^^^^^^^ - [24, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [24, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > switch (d.default) { ^^^^^^^^^ - [25, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + [25, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts > case 1: ^^^^ - [26, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + [26, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > case 2: ^^^^ - [27, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + [27, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > default: ^^^^^^^ - [28, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + [28, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > break; > } > } @@ -120,19 +120,19 @@ class A4 { > let d > d.case = 1 ^^^^^^^^^ - [40, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [40, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > switch (d.default) { ^^^^^^^^^ - [41, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + [41, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts > case 1: ^^^^ - [42, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + [42, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > case 2: ^^^^ - [43, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + [43, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > default: ^^^^^^^ - [44, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + [44, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > break; > } > } diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index 504eea34..2bb58581 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -107,11 +107,11 @@ var j: I = {} ^ source.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^^^^^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ source.ts ^^^^ @@ -151,10 +151,10 @@ var j: I = {} ^ source.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts @@ -183,15 +183,15 @@ var j: I = {} ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > } ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts @@ -250,111 +250,111 @@ var j: I = {} ^ source.ts meta.brace.round.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts > ^ - source.ts meta.decl.block.ts + source.ts meta.block.ts > var c = a + b; ^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^^^ - source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + source.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts + source.ts meta.block.ts meta.var.expr.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^^^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts ^^ - source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts > ^ - source.ts meta.decl.block.ts + source.ts meta.block.ts > switch (someNum) { ^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^^^^^^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts + source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts + source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts ^^^^^^^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts + source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts + source.ts meta.block.ts switch-statement.expr.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts > case 1: break; ^^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts ^^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts > case 2: break; ^^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts ^^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts > default: break; ^^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^^^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^^^^^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts ^^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts > } ^ - source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts + source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts ^ - source.ts meta.decl.block.ts switch-statement.expr.ts punctuation.definition.block.ts + source.ts meta.block.ts switch-statement.expr.ts punctuation.definition.block.ts ^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts > ^ - source.ts meta.decl.block.ts + source.ts meta.block.ts >} ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts @@ -378,51 +378,51 @@ var j: I = {} ^^^ source.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts > export function myFun(x: number) { ^^^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^^^^^^ - source.ts meta.decl.block.ts meta.function.ts keyword.control.export.ts + source.ts meta.block.ts meta.function.ts keyword.control.export.ts ^ - source.ts meta.decl.block.ts meta.function.ts + source.ts meta.block.ts meta.function.ts ^^^^^^^^ - source.ts meta.decl.block.ts meta.function.ts storage.type.function.ts + source.ts meta.block.ts meta.function.ts storage.type.function.ts ^ - source.ts meta.decl.block.ts meta.function.ts + source.ts meta.block.ts meta.function.ts ^^^^^ - source.ts meta.decl.block.ts meta.function.ts entity.name.function.ts + source.ts meta.block.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts ^ - source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.decl.block.ts meta.function.ts + source.ts meta.block.ts meta.function.ts ^ - source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > return x; ^^^^^^^^ - source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts + source.ts meta.block.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.block.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^^^^ - source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts + source.ts meta.block.ts meta.function.ts meta.block.ts > } ^^^^ - source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts + source.ts meta.block.ts meta.function.ts meta.block.ts ^ - source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >} ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts @@ -570,136 +570,136 @@ var j: I = {} ^^^^^^ source.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts > export class Cell { ^^^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts keyword.control.export.ts + source.ts meta.block.ts meta.declaration.object.ts keyword.control.export.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts + source.ts meta.block.ts meta.declaration.object.ts ^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts storage.type.class.ts + source.ts meta.block.ts meta.declaration.object.ts storage.type.class.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts + source.ts meta.block.ts meta.declaration.object.ts ^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts + source.ts meta.block.ts meta.declaration.object.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts > public parent: Cell; ^^^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts ^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts ^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts > ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts > constructor(parent: Cell) { ^^^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts ^^^^^^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts ^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > this.parent = parent; ^^^^^^^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts ^^^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts ^^^^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > if (typeof parent === 'object' || parent instanceof Error) { ^^^^^^^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.typeof.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.typeof.ts ^^^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.end.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.logical.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.logical.ts ^^^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.instanceof.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.instanceof.ts ^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts > ^^^^^^^^^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > } ^^^^^^^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts > } ^^^^^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > } ^^^^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts ^ - source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts >} ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt index e375546c..4bdd18d6 100644 --- a/tests/baselines/Issue37.txt +++ b/tests/baselines/Issue37.txt @@ -124,22 +124,22 @@ var j: I = {} > > var c = a + b; ^^^ - [21, 2]: source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts + [21, 2]: source.ts meta.block.ts meta.var.expr.ts storage.type.ts ^ - [21, 12]: source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts + [21, 12]: source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts > > switch (someNum) { ^^^^^^ - [23, 2]: source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts + [23, 2]: source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts > case 1: break; ^^^^ - [24, 3]: source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + [24, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > case 2: break; ^^^^ - [25, 3]: source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + [25, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > default: break; ^^^^^^^ - [26, 3]: source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts + [26, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts > } > >} @@ -153,7 +153,7 @@ var j: I = {} [35, 1]: source.ts storage.type.ts > export function myFun(x: number) { ^^^^^^ - [36, 5]: source.ts meta.decl.block.ts meta.function.ts keyword.control.export.ts + [36, 5]: source.ts meta.block.ts meta.function.ts keyword.control.export.ts > return x; > } >} @@ -181,49 +181,49 @@ var j: I = {} [51, 8]: source.ts > export class Cell { ^^^^^^ - [52, 5]: source.ts meta.decl.block.ts meta.declaration.object.ts keyword.control.export.ts + [52, 5]: source.ts meta.block.ts meta.declaration.object.ts keyword.control.export.ts ^^^^^ - [52, 12]: source.ts meta.decl.block.ts meta.declaration.object.ts storage.type.class.ts + [52, 12]: source.ts meta.block.ts meta.declaration.object.ts storage.type.class.ts ^^^^ - [52, 18]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + [52, 18]: source.ts meta.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts > public parent: Cell; ^^^^^^ - [53, 9]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + [53, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts ^^^^^^ - [53, 16]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + [53, 16]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts ^^^^ - [53, 24]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + [53, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts > > constructor(parent: Cell) { ^^^^^^^^^^^ - [55, 9]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + [55, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^^^^^^ - [55, 21]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [55, 21]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts ^^^^ - [55, 29]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + [55, 29]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts > this.parent = parent; ^^^^ - [56, 13]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + [56, 13]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts ^^^^^^^^^ - [56, 27]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [56, 27]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > if (typeof parent === 'object' || parent instanceof Error) { ^^^^^^ - [57, 17]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.typeof.ts + [57, 17]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.typeof.ts ^^^^^^^^ - [57, 24]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [57, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^ - [57, 31]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts + [57, 31]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts ^ - [57, 35]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts + [57, 35]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^^^ - [57, 47]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [57, 47]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^^^^^ - [57, 54]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.instanceof.ts + [57, 54]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.instanceof.ts ^^^^^^ - [57, 65]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [57, 65]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > ^^^^^^^^^^^^^^ - [58, 14]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts + [58, 14]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts > } > } > } diff --git a/tests/baselines/Issue77.baseline.txt b/tests/baselines/Issue77.baseline.txt index 2f61d833..daf7c28c 100644 --- a/tests/baselines/Issue77.baseline.txt +++ b/tests/baselines/Issue77.baseline.txt @@ -105,11 +105,11 @@ function foo() { } ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts > @@ -191,8 +191,8 @@ function foo() { } ^ source.ts meta.function.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts \ No newline at end of file + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue82.baseline.txt b/tests/baselines/Issue82.baseline.txt index 454ece23..83d22ad0 100644 --- a/tests/baselines/Issue82.baseline.txt +++ b/tests/baselines/Issue82.baseline.txt @@ -80,15 +80,15 @@ class Foo { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > } ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue82.txt b/tests/baselines/Issue82.txt index 73536bd6..8b59cd51 100644 --- a/tests/baselines/Issue82.txt +++ b/tests/baselines/Issue82.txt @@ -29,6 +29,6 @@ class Foo { > ) { > ^^^^^^^^^ - [6, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + [6, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > } >} \ No newline at end of file diff --git a/tests/baselines/Issue96.baseline.txt b/tests/baselines/Issue96.baseline.txt index 15c13f5e..fb0171e5 100644 --- a/tests/baselines/Issue96.baseline.txt +++ b/tests/baselines/Issue96.baseline.txt @@ -86,11 +86,11 @@ const^^able^^ += " Royal, I say!"; ^ source.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts diff --git a/tests/baselines/ParameterProperties.baseline.txt b/tests/baselines/ParameterProperties.baseline.txt index b1d41c4a..6f2d58e7 100644 --- a/tests/baselines/ParameterProperties.baseline.txt +++ b/tests/baselines/ParameterProperties.baseline.txt @@ -76,12 +76,12 @@ class A { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > } ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > foo() { ^ source.ts meta.declaration.object.ts meta.object.body.ts @@ -94,39 +94,39 @@ class A { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > return this.a + this.b + this.c; ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.arithmetic.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.arithmetic.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.arithmetic.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.arithmetic.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts > } ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index 82c546f0..cd4abad3 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -98,59 +98,59 @@ var e =
^ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx punctuation.definition.block.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx punctuation.definition.block.tsx > return
^^^^^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx ^^^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx keyword.control.flow.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx keyword.control.flow.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx entity.name.tag.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx entity.name.tag.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx ^^^^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx keyword.operator.assignment.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx keyword.operator.assignment.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx variable.language.this.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.brace.curly.tsx variable.language.this.tsx ^^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.brace.curly.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx > This is a test: {this.state.count} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.jsx.children.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx ^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx variable.language.this.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx variable.language.this.tsx ^^^^^^^^^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx >
^^^^^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.jsx.children.tsx ^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.close.tsx punctuation.definition.tag.begin.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.close.tsx punctuation.definition.tag.begin.tsx ^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.close.tsx entity.name.tag.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.close.tsx entity.name.tag.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx > } ^^^^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx punctuation.definition.block.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx punctuation.definition.block.tsx >} ^ source.tsx meta.declaration.object.tsx meta.object.body.tsx punctuation.definition.block.tsx diff --git a/tests/baselines/TsxSamples.txt b/tests/baselines/TsxSamples.txt index 31f8a0fe..aa9c139e 100644 --- a/tests/baselines/TsxSamples.txt +++ b/tests/baselines/TsxSamples.txt @@ -59,16 +59,16 @@ var e =
> render() { > return
^ - [3, 16]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx + [3, 16]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx ^^^ - [3, 17]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx entity.name.tag.tsx + [3, 17]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx entity.name.tag.tsx ^^^^^^^ - [3, 21]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx + [3, 21]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx ^^^^ - [3, 30]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx variable.language.this.tsx + [3, 30]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.brace.curly.tsx variable.language.this.tsx > This is a test: {this.state.count} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - [4, 13]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx + [4, 13]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.jsx.children.tsx >
> } >} diff --git a/tests/baselines/docComments.baseline.txt b/tests/baselines/docComments.baseline.txt index ee927bee..d0fe6af1 100644 --- a/tests/baselines/docComments.baseline.txt +++ b/tests/baselines/docComments.baseline.txt @@ -96,9 +96,9 @@ function foo(param1: string, param2: number) { ^ source.ts meta.function.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts \ No newline at end of file + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index 91bef8e6..5a1f33b5 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -61,19 +61,19 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts constant.numeric.decimal.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts constant.numeric.decimal.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.var.expr.ts ^^ @@ -150,25 +150,25 @@ var ^^obj = { ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts storage.type.function.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts ^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts string.quoted.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.var.expr.ts ^^ diff --git a/tests/baselines/namespaceAndModule.baseline.txt b/tests/baselines/namespaceAndModule.baseline.txt index 9fc26ea5..4bf05606 100644 --- a/tests/baselines/namespaceAndModule.baseline.txt +++ b/tests/baselines/namespaceAndModule.baseline.txt @@ -13,11 +13,11 @@ declare ^^module "x" {} ^^^^ source.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts >module ts { } @@ -26,11 +26,11 @@ declare ^^module "x" {} ^^^^ source.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.decl.block.ts + source.ts meta.block.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts >declare namespace ts {} @@ -43,9 +43,9 @@ declare ^^module "x" {} ^^^^ source.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts >declare module ts {} @@ -58,9 +58,9 @@ declare ^^module "x" {} ^^^^ source.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts >declare module "x" {} @@ -81,6 +81,6 @@ declare ^^module "x" {} ^ source.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.decl.block.ts punctuation.definition.block.ts \ No newline at end of file + source.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index a5b15d36..ed9fcb48 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -205,53 +205,53 @@ class Test { ^ source.ts meta.function.ts meta.return.type.ts ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > return stat(path).then(stat => stat.isFile(), () => false) ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^^ - source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts storage.type.function.arrow.ts + source.ts meta.function.ts meta.block.ts storage.type.function.arrow.ts ^^^^^^^^^^^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^ - source.ts meta.function.ts meta.decl.block.ts storage.type.function.arrow.ts + source.ts meta.function.ts meta.block.ts storage.type.function.arrow.ts ^ - source.ts meta.function.ts meta.decl.block.ts + source.ts meta.function.ts meta.block.ts ^^^^^ - source.ts meta.function.ts meta.decl.block.ts constant.language.boolean.false.ts + source.ts meta.function.ts meta.block.ts constant.language.boolean.false.ts ^ - source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.brace.round.ts >} ^ - source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts > ^ source.ts diff --git a/tests/baselines/pr48_noSemiColon.txt b/tests/baselines/pr48_noSemiColon.txt index d48f63f8..a1f0d7a2 100644 --- a/tests/baselines/pr48_noSemiColon.txt +++ b/tests/baselines/pr48_noSemiColon.txt @@ -68,7 +68,7 @@ class Test { [13, 39]: source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts > return stat(path).then(stat => stat.isFile(), () => false) ^^^^^^ - [14, 2]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts + [14, 2]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts >} > > From 4774bec181e0ec05c5d776de3f46f9b5ec5bfcfd Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 19 Aug 2016 11:29:26 -0700 Subject: [PATCH 29/77] Support Import equals and import declarations --- TypeScript.YAML-tmLanguage | 93 ++++++++- TypeScript.tmLanguage | 271 +++++++++++++++++++++++++- TypeScript.tmTheme | 24 ++- TypeScriptReact.YAML-tmLanguage | 93 ++++++++- TypeScriptReact.tmLanguage | 271 +++++++++++++++++++++++++- TypeScriptReact.tmTheme | 24 ++- tests/baselines/Issue135.baseline.txt | 32 +++ tests/baselines/Issue153.baseline.txt | 30 +-- tests/baselines/Issue200.baseline.txt | 36 +++- tests/baselines/Issue200.txt | 10 +- tests/baselines/Issue37.baseline.txt | 56 +++--- tests/baselines/Issue37.txt | 8 +- tests/cases/Issue135.ts | 1 + 13 files changed, 870 insertions(+), 79 deletions(-) create mode 100644 tests/baselines/Issue135.baseline.txt create mode 100644 tests/cases/Issue135.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 71555690..70dc67ac 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -117,8 +117,8 @@ repository: - include: '#class-or-interface-declaration' - include: '#type-declaration' - include: '#enum-declaration' - # Todo: to change this to import declaration - - include: '#import-operator' + - include: '#import-equals-declaration' + - include: '#import-declaration' # TODO: change this to actual declarations of export, import, namespace - include: '#storage-keyword' @@ -146,6 +146,88 @@ repository: '3': { name: storage.type.enum.ts } '4': { name: entity.name.type.enum.ts } + import-equals-declaration: + patterns: + - name: meta.import-equals.external.ts + begin: (?:(\bexport)\s+)?\b(? - import-operator: - patterns: - - name: keyword.control.import.ts - match: \bimport\b - - name: keyword.control.from.ts - match: \bfrom\b - operators: patterns: - name: keyword.operator.assignment.compound.ts diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index f655233c..04019cad 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -591,7 +591,11 @@ include - #import-operator + #import-equals-declaration + + + include + #import-declaration include @@ -1057,22 +1061,283 @@ name storage.type.function.arrow.ts - import-operator + import-block + begin + \{ + beginCaptures + + 0 + + name + punctuation.definition.block.ts + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.block.ts + + + name + meta.block.ts patterns + include + #import-clause + + + + import-clause + + patterns + + + include + #comment + + + captures + + 1 + + name + keyword.control.default.ts + + 2 + + name + constant.language.import-all.ts + + 3 + + name + variable.other.readwrite.ts + + 4 + + name + keyword.control.as.ts + + 5 + + name + invalid.illegal.ts + + 6 + + name + variable.other.readwrite.alias.ts + + + comment + (default|*|name) as alias match - \bimport\b + (?x) (?: \b(default)\b | (\*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) \s* (\b as \b) \s* (?: (\b default \b | \*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) + + + match + , + name + meta.delimiter.object.comma.ts + + + match + \* + name + constant.language.import-all.ts + + + match + \b(default)\b + name + keyword.control.default.ts + + + match + \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b + name + variable.other.readwrite.alias.ts + + + + import-declaration + + begin + (?:(\bexport)\s+)?(?<!\.)\b(import)(?!\s*:)\b + beginCaptures + + 1 + + name + keyword.control.export.ts + + 2 + name keyword.control.import.ts + + end + (?=;|$) + name + meta.import.ts + patterns + + + include + #comment + + + include + #string + + + include + #import-block + match \bfrom\b name keyword.control.from.ts + + include + #import-clause + + + + import-equals-declaration + + patterns + + + begin + (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([a-zA-Z_$][\w$]*)\s*(=)\s*(require)\s*(\() + beginCaptures + + 1 + + name + keyword.control.export.ts + + 2 + + name + keyword.control.import.ts + + 3 + + name + variable.other.readwrite.alias.ts + + 4 + + name + keyword.operator.assignment.ts + + 5 + + name + keyword.control.require.ts + + 6 + + name + meta.brace.round.ts + + + end + \) + endCaptures + + 0 + + name + meta.brace.round.ts + + + name + meta.import-equals.external.ts + patterns + + + include + #comment + + + include + #string + + + + + begin + (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([a-zA-Z_$][\w$]*)\s*(=)\s*(?!require\b) + beginCaptures + + 1 + + name + keyword.control.export.ts + + 2 + + name + keyword.control.import.ts + + 3 + + name + variable.other.readwrite.alias.ts + + 4 + + name + keyword.operator.assignment.ts + + + end + (?=;|$) + name + meta.import-equals.internal.ts + patterns + + + include + #comment + + + captures + + 1 + + name + entity.name.module.ts + + 2 + + name + punctuation.accessor.ts + + + match + \b([a-zA-Z_$][\w$]*)\s*(\.) + + + match + \b([a-zA-Z_$][\w$]*)\b + name + variable.other.readwrite.ts + + + indexer-declaration diff --git a/TypeScript.tmTheme b/TypeScript.tmTheme index 84bfabaa..827902dc 100644 --- a/TypeScript.tmTheme +++ b/TypeScript.tmTheme @@ -8,7 +8,7 @@ scope - storage.modifier, storage.type, keyword.control, keyword.others.ts, keyword.operator.new.ts, + storage.modifier, storage.type, keyword.control, keyword.others.ts, keyword.operator.new.ts settings vsclassificationtype @@ -66,7 +66,7 @@ scope - meta.brace.angle.ts, meta.brace.round.ts, meta.brace.square.ts, punctuation.definition + meta.brace.angle.ts, meta.brace.round.ts, meta.brace.square.ts, punctuation.definition, constant.language.import-all.ts, meta.delimiter.object.comma.ts, punctuation.accessor.ts settings vsclassificationtype @@ -120,6 +120,26 @@ class name + + + scope + entity.name.module.ts + settings + + vsclassificationtype + module name + + + + + scope + entity.name.type.enum.ts + settings + + vsclassificationtype + enum name + + scope diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 07d2b503..0509ada5 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -121,8 +121,8 @@ repository: - include: '#class-or-interface-declaration' - include: '#type-declaration' - include: '#enum-declaration' - # Todo: to change this to import declaration - - include: '#import-operator' + - include: '#import-equals-declaration' + - include: '#import-declaration' # TODO: change this to actual declarations of export, import, namespace - include: '#storage-keyword' @@ -150,6 +150,88 @@ repository: '3': { name: storage.type.enum.tsx } '4': { name: entity.name.type.enum.tsx } + import-equals-declaration: + patterns: + - name: meta.import-equals.external.tsx + begin: (?:(\bexport)\s+)?\b(? - import-operator: - patterns: - - name: keyword.control.import.tsx - match: \bimport\b - - name: keyword.control.from.tsx - match: \bfrom\b - operators: patterns: - name: keyword.operator.assignment.compound.tsx diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index f5638237..8b55ecf2 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -559,7 +559,11 @@ include - #import-operator + #import-equals-declaration + + + include + #import-declaration include @@ -1025,22 +1029,283 @@ name storage.type.function.arrow.tsx - import-operator + import-block + begin + \{ + beginCaptures + + 0 + + name + punctuation.definition.block.tsx + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.block.tsx + + + name + meta.block.tsx patterns + include + #import-clause + + + + import-clause + + patterns + + + include + #comment + + + captures + + 1 + + name + keyword.control.default.tsx + + 2 + + name + constant.language.import-all.tsx + + 3 + + name + variable.other.readwrite.tsx + + 4 + + name + keyword.control.as.tsx + + 5 + + name + invalid.illegal.tsx + + 6 + + name + variable.other.readwrite.alias.tsx + + + comment + (default|*|name) as alias match - \bimport\b + (?x) (?: \b(default)\b | (\*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) \s* (\b as \b) \s* (?: (\b default \b | \*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) + + + match + , + name + meta.delimiter.object.comma.tsx + + + match + \* + name + constant.language.import-all.tsx + + + match + \b(default)\b + name + keyword.control.default.tsx + + + match + \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b + name + variable.other.readwrite.alias.tsx + + + + import-declaration + + begin + (?:(\bexport)\s+)?(?<!\.)\b(import)(?!\s*:)\b + beginCaptures + + 1 + + name + keyword.control.export.tsx + + 2 + name keyword.control.import.tsx + + end + (?=;|$) + name + meta.import.tsx + patterns + + + include + #comment + + + include + #string + + + include + #import-block + match \bfrom\b name keyword.control.from.tsx + + include + #import-clause + + + + import-equals-declaration + + patterns + + + begin + (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([a-zA-Z_$][\w$]*)\s*(=)\s*(require)\s*(\() + beginCaptures + + 1 + + name + keyword.control.export.tsx + + 2 + + name + keyword.control.import.tsx + + 3 + + name + variable.other.readwrite.alias.tsx + + 4 + + name + keyword.operator.assignment.tsx + + 5 + + name + keyword.control.require.tsx + + 6 + + name + meta.brace.round.tsx + + + end + \) + endCaptures + + 0 + + name + meta.brace.round.tsx + + + name + meta.import-equals.external.tsx + patterns + + + include + #comment + + + include + #string + + + + + begin + (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([a-zA-Z_$][\w$]*)\s*(=)\s*(?!require\b) + beginCaptures + + 1 + + name + keyword.control.export.tsx + + 2 + + name + keyword.control.import.tsx + + 3 + + name + variable.other.readwrite.alias.tsx + + 4 + + name + keyword.operator.assignment.tsx + + + end + (?=;|$) + name + meta.import-equals.internal.tsx + patterns + + + include + #comment + + + captures + + 1 + + name + entity.name.module.tsx + + 2 + + name + punctuation.accessor.tsx + + + match + \b([a-zA-Z_$][\w$]*)\s*(\.) + + + match + \b([a-zA-Z_$][\w$]*)\b + name + variable.other.readwrite.tsx + + + indexer-declaration diff --git a/TypeScriptReact.tmTheme b/TypeScriptReact.tmTheme index 20fbeef7..a38f0615 100644 --- a/TypeScriptReact.tmTheme +++ b/TypeScriptReact.tmTheme @@ -8,7 +8,7 @@ scope - storage.modifier, storage.type, keyword.control, keyword.others.tsx, keyword.operator.new.tsx, + storage.modifier, storage.type, keyword.control, keyword.others.tsx, keyword.operator.new.tsx settings vsclassificationtype @@ -66,7 +66,7 @@ scope - meta.brace.angle.tsx, meta.brace.round.tsx, meta.brace.square.tsx, punctuation.definition + meta.brace.angle.tsx, meta.brace.round.tsx, meta.brace.square.tsx, punctuation.definition, constant.language.import-all.tsx, meta.delimiter.object.comma.tsx, punctuation.accessor.tsx settings vsclassificationtype @@ -121,6 +121,26 @@ + + scope + entity.name.module.tsx + settings + + vsclassificationtype + module name + + + + + scope + entity.name.type.enum.tsx + settings + + vsclassificationtype + enum name + + + scope entity.name.tag.tsx diff --git a/tests/baselines/Issue135.baseline.txt b/tests/baselines/Issue135.baseline.txt new file mode 100644 index 00000000..746cfbb7 --- /dev/null +++ b/tests/baselines/Issue135.baseline.txt @@ -0,0 +1,32 @@ +original file +----------------------------------- +import http = require('http'); +----------------------------------- + +>import http = require('http'); + ^^^^^^ + source.ts meta.import-equals.external.ts keyword.control.import.ts + ^ + source.ts meta.import-equals.external.ts + ^^^^ + source.ts meta.import-equals.external.ts variable.other.readwrite.alias.ts + ^ + source.ts meta.import-equals.external.ts + ^ + source.ts meta.import-equals.external.ts keyword.operator.assignment.ts + ^ + source.ts meta.import-equals.external.ts + ^^^^^^^ + source.ts meta.import-equals.external.ts keyword.control.require.ts + ^ + source.ts meta.import-equals.external.ts meta.brace.round.ts + ^ + source.ts meta.import-equals.external.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^ + source.ts meta.import-equals.external.ts string.quoted.single.ts + ^ + source.ts meta.import-equals.external.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^ + source.ts meta.import-equals.external.ts meta.brace.round.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/Issue153.baseline.txt b/tests/baselines/Issue153.baseline.txt index 28551950..65bd264d 100644 --- a/tests/baselines/Issue153.baseline.txt +++ b/tests/baselines/Issue153.baseline.txt @@ -61,27 +61,33 @@ class Matrix { >import {Vector3, Vector} from 'vectors'; ^^^^^^ - source.ts keyword.control.import.ts + source.ts meta.import.ts keyword.control.import.ts ^ - source.ts + source.ts meta.import.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts - ^^^^^^^^^^^^^^^ - source.ts meta.block.ts + source.ts meta.import.ts meta.block.ts punctuation.definition.block.ts + ^^^^^^^ + source.ts meta.import.ts meta.block.ts variable.other.readwrite.alias.ts + ^ + source.ts meta.import.ts meta.block.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.import.ts meta.block.ts + ^^^^^^ + source.ts meta.import.ts meta.block.ts variable.other.readwrite.alias.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.import.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts + source.ts meta.import.ts ^^^^ - source.ts keyword.control.from.ts + source.ts meta.import.ts keyword.control.from.ts ^ - source.ts + source.ts meta.import.ts ^ - source.ts string.quoted.single.ts punctuation.definition.string.begin.ts + source.ts meta.import.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^^ - source.ts string.quoted.single.ts + source.ts meta.import.ts string.quoted.single.ts ^ - source.ts string.quoted.single.ts punctuation.definition.string.end.ts + source.ts meta.import.ts string.quoted.single.ts punctuation.definition.string.end.ts ^^^ source.ts > diff --git a/tests/baselines/Issue200.baseline.txt b/tests/baselines/Issue200.baseline.txt index 4874a1e2..33c07839 100644 --- a/tests/baselines/Issue200.baseline.txt +++ b/tests/baselines/Issue200.baseline.txt @@ -39,13 +39,37 @@ original file ^^ source.ts meta.block.ts ^^^^^^ - source.ts meta.block.ts keyword.control.import.ts - ^^^^^^^ - source.ts meta.block.ts + source.ts meta.block.ts meta.import-equals.internal.ts keyword.control.import.ts + ^ + source.ts meta.block.ts meta.import-equals.internal.ts + ^^^^^ + source.ts meta.block.ts meta.import-equals.internal.ts variable.other.readwrite.alias.ts + ^ + source.ts meta.block.ts meta.import-equals.internal.ts ^ - source.ts meta.block.ts keyword.operator.assignment.ts - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.block.ts + source.ts meta.block.ts meta.import-equals.internal.ts keyword.operator.assignment.ts + ^ + source.ts meta.block.ts meta.import-equals.internal.ts + ^^^^ + source.ts meta.block.ts meta.import-equals.internal.ts entity.name.module.ts + ^ + source.ts meta.block.ts meta.import-equals.internal.ts punctuation.accessor.ts + ^^^^^ + source.ts meta.block.ts meta.import-equals.internal.ts entity.name.module.ts + ^ + source.ts meta.block.ts meta.import-equals.internal.ts punctuation.accessor.ts + ^^^^ + source.ts meta.block.ts meta.import-equals.internal.ts entity.name.module.ts + ^ + source.ts meta.block.ts meta.import-equals.internal.ts punctuation.accessor.ts + ^^^^ + source.ts meta.block.ts meta.import-equals.internal.ts entity.name.module.ts + ^ + source.ts meta.block.ts meta.import-equals.internal.ts punctuation.accessor.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.block.ts meta.import-equals.internal.ts variable.other.readwrite.ts + ^^^ + source.ts meta.block.ts > export default alias; ^^ source.ts meta.block.ts diff --git a/tests/baselines/Issue200.txt b/tests/baselines/Issue200.txt index 9431eb5a..94ad4fe1 100644 --- a/tests/baselines/Issue200.txt +++ b/tests/baselines/Issue200.txt @@ -21,11 +21,11 @@ original file [3, 16]: source.ts string.quoted.single.ts punctuation.definition.string.begin.ts > import alias = lool.clutz.goog.i18n.NumberFormatSymbols_en_TT; ^^^^^^ - [4, 3]: source.ts meta.block.ts keyword.control.import.ts - ^^^^^^^ - [4, 10]: source.ts meta.block.ts - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - [4, 18]: source.ts meta.block.ts + [4, 3]: source.ts meta.block.ts meta.import-equals.internal.ts keyword.control.import.ts + ^^^^^ + [4, 10]: source.ts meta.block.ts meta.import-equals.internal.ts variable.other.readwrite.alias.ts + ^^^^ + [4, 18]: source.ts meta.block.ts meta.import-equals.internal.ts entity.name.module.ts > export default alias; ^^^^^^ [5, 3]: source.ts meta.block.ts storage.type.ts diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index 2bb58581..df30de7c 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -80,50 +80,58 @@ var j: I = {} source.ts >import * as req from "./Required" ^^^^^^ - source.ts keyword.control.import.ts + source.ts meta.import.ts keyword.control.import.ts ^ - source.ts + source.ts meta.import.ts ^ - source.ts keyword.operator.arithmetic.ts + source.ts meta.import.ts constant.language.import-all.ts ^ - source.ts + source.ts meta.import.ts ^^ - source.ts keyword.control.as.ts - ^^^^^ - source.ts + source.ts meta.import.ts keyword.control.as.ts + ^ + source.ts meta.import.ts + ^^^ + source.ts meta.import.ts variable.other.readwrite.alias.ts + ^ + source.ts meta.import.ts ^^^^ - source.ts keyword.control.from.ts + source.ts meta.import.ts keyword.control.from.ts ^ - source.ts + source.ts meta.import.ts ^ - source.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.import.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^ - source.ts string.quoted.double.ts + source.ts meta.import.ts string.quoted.double.ts ^ - source.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.import.ts string.quoted.double.ts punctuation.definition.string.end.ts >import { Scale } from "./scale"; ^^^^^^ - source.ts keyword.control.import.ts + source.ts meta.import.ts keyword.control.import.ts ^ - source.ts + source.ts meta.import.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts - ^^^^^^^ - source.ts meta.block.ts + source.ts meta.import.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.import.ts meta.block.ts + ^^^^^ + source.ts meta.import.ts meta.block.ts variable.other.readwrite.alias.ts + ^ + source.ts meta.import.ts meta.block.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.import.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts + source.ts meta.import.ts ^^^^ - source.ts keyword.control.from.ts + source.ts meta.import.ts keyword.control.from.ts ^ - source.ts + source.ts meta.import.ts ^ - source.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.import.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^ - source.ts string.quoted.double.ts + source.ts meta.import.ts string.quoted.double.ts ^ - source.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.import.ts string.quoted.double.ts punctuation.definition.string.end.ts ^^ source.ts > diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt index 4bdd18d6..3b04ae06 100644 --- a/tests/baselines/Issue37.txt +++ b/tests/baselines/Issue37.txt @@ -74,13 +74,13 @@ var j: I = {} > >import * as req from "./Required" ^^^^^^ - [3, 1]: source.ts keyword.control.import.ts + [3, 1]: source.ts meta.import.ts keyword.control.import.ts ^ - [3, 8]: source.ts keyword.operator.arithmetic.ts + [3, 8]: source.ts meta.import.ts constant.language.import-all.ts ^^ - [3, 10]: source.ts keyword.control.as.ts + [3, 10]: source.ts meta.import.ts keyword.control.as.ts ^^^^ - [3, 17]: source.ts keyword.control.from.ts + [3, 17]: source.ts meta.import.ts keyword.control.from.ts >import { Scale } from "./scale"; > >if (object.instanceof(ClassNew)) { diff --git a/tests/cases/Issue135.ts b/tests/cases/Issue135.ts new file mode 100644 index 00000000..805b824d --- /dev/null +++ b/tests/cases/Issue135.ts @@ -0,0 +1 @@ +import http = require('http'); \ No newline at end of file From 8870cb4ceebfe3c4f79969881242f8e71b28b073 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 19 Aug 2016 11:29:26 -0700 Subject: [PATCH 30/77] Support for Export declarations --- TypeScript.YAML-tmLanguage | 53 ++- TypeScript.tmLanguage | 363 ++++++++++++------ TypeScript.tmTheme | 4 +- TypeScriptReact.YAML-tmLanguage | 53 ++- TypeScriptReact.tmLanguage | 363 ++++++++++++------ TypeScriptReact.tmTheme | 4 +- tests/baselines/Issue200.baseline.txt | 22 +- tests/baselines/Issue200.txt | 10 +- tests/baselines/Issue37.baseline.txt | 2 +- tests/baselines/Issue37.txt | 2 +- .../baselines/exportDeclarations.baseline.txt | 102 +++++ tests/cases/exportDeclarations.ts | 3 + 12 files changed, 683 insertions(+), 298 deletions(-) create mode 100644 tests/baselines/exportDeclarations.baseline.txt create mode 100644 tests/cases/exportDeclarations.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 70dc67ac..8d25f044 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -78,6 +78,7 @@ repository: - include: '#comment' - include: '#literal' - include: '#function-declaration' + - include: '#class-or-interface-declaration' - include: '#paren-expression' - include: '#ternary-expression' - include: '#cast' @@ -119,6 +120,7 @@ repository: - include: '#enum-declaration' - include: '#import-equals-declaration' - include: '#import-declaration' + - include: '#export-declaration' # TODO: change this to actual declarations of export, import, namespace - include: '#storage-keyword' @@ -129,7 +131,7 @@ repository: '1': { name: keyword.control.export.ts } '2': { name: storage.type.type.ts } '3': { name: entity.name.type.ts } - end: (?=$|[,);>]|var|type|function|class|interface|namespace|enum|declare|export) + end: (?=$|[,);>]|\bvar\b|\blet\b|\bconst\b|\btype\b|\bfunction\b|\bclass\b|\binterface\b|\bnamespace\b|\bmodule\b|\bimport\b|\benum\b|\bdeclare\b|\bexport\b|\babstract\b|\basync\b) patterns: - include: '#comment' - include: '#type-parameters' @@ -175,27 +177,56 @@ repository: - include: '#comment' - match: \b([a-zA-Z_$][\w$]*)\s*(\.) captures: - '1': { name: entity.name.module.ts } + '1': { name: entity.name.type.module.ts } '2': { name: punctuation.accessor.ts } - name: variable.other.readwrite.ts match: \b([a-zA-Z_$][\w$]*)\b import-declaration: name: meta.import.ts - begin: (?:(\bexport)\s+)?(?include #import-declaration + + include + #export-declaration + include #storage-keyword @@ -672,6 +676,95 @@ name meta.enum.declaration.ts + export-declaration + + patterns + + + captures + + 1 + + name + keyword.control.export.ts + + 2 + + name + keyword.control.as.ts + + 3 + + name + storage.type.namespace.ts + + 4 + + name + entity.name.type.module.ts + + + match + \b(?<!\.)(export)\s+(as)\s+(namespace)\s+([a-zA-Z_$][\w$]*) + + + begin + \b(?<!\.)(export)(?:(?:\s*(=))|(?:\s+(default)\s+)) + beginCaptures + + 1 + + name + keyword.control.export.ts + + 2 + + name + keyword.operator.assignment.ts + + 3 + + name + keyword.control.default.ts + + + end + (?=;|\bexport\b|\bfunction\b|\bclass\b|\binterface\b|\blet\b|\bvar\b|\bconst\b|\bimport\b|\benum\b|\bnamespace\b|\bmodule\b|\btype\b|\babstract\b|\bdeclare\b|\basync\b|$) + name + meta.export.default.ts + patterns + + + include + #expression + + + + + begin + \b(?<!\.)(export)(?!\s*:)\b + beginCaptures + + 0 + + name + keyword.control.export.ts + + + end + (?=;|\bexport\b|\bfunction\b|\bclass\b|\binterface\b|\blet\b|\bvar\b|\bconst\b|\bimport\b|\benum\b|\bnamespace\b|\bmodule\b|\btype\b|\babstract\b|\bdeclare\b|\basync\b|$) + name + meta.export.ts + patterns + + + include + #import-export-declaration + + + + + expression name @@ -702,6 +795,10 @@ include #function-declaration + + include + #class-or-interface-declaration + include #paren-expression @@ -1061,115 +1158,10 @@ name storage.type.function.arrow.ts - import-block - - begin - \{ - beginCaptures - - 0 - - name - punctuation.definition.block.ts - - - end - \} - endCaptures - - 0 - - name - punctuation.definition.block.ts - - - name - meta.block.ts - patterns - - - include - #import-clause - - - - import-clause - - patterns - - - include - #comment - - - captures - - 1 - - name - keyword.control.default.ts - - 2 - - name - constant.language.import-all.ts - - 3 - - name - variable.other.readwrite.ts - - 4 - - name - keyword.control.as.ts - - 5 - - name - invalid.illegal.ts - - 6 - - name - variable.other.readwrite.alias.ts - - - comment - (default|*|name) as alias - match - (?x) (?: \b(default)\b | (\*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) \s* (\b as \b) \s* (?: (\b default \b | \*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) - - - match - , - name - meta.delimiter.object.comma.ts - - - match - \* - name - constant.language.import-all.ts - - - match - \b(default)\b - name - keyword.control.default.ts - - - match - \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b - name - variable.other.readwrite.alias.ts - - - import-declaration begin - (?:(\bexport)\s+)?(?<!\.)\b(import)(?!\s*:)\b + (?:(\bexport)\s+)?\b(?<!\.)(import)(?!\s*:)\b beginCaptures 1 @@ -1191,25 +1183,7 @@ include - #comment - - - include - #string - - - include - #import-block - - - match - \bfrom\b - name - keyword.control.from.ts - - - include - #import-clause + #import-export-declaration @@ -1319,7 +1293,7 @@ 1 name - entity.name.module.ts + entity.name.type.module.ts 2 @@ -1340,6 +1314,139 @@ + import-export-block + + begin + \{ + beginCaptures + + 0 + + name + punctuation.definition.block.ts + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.block.ts + + + name + meta.block.ts + patterns + + + include + #import-export-clause + + + + import-export-clause + + patterns + + + include + #comment + + + captures + + 1 + + name + keyword.control.default.ts + + 2 + + name + constant.language.import-export-all.ts + + 3 + + name + variable.other.readwrite.ts + + 4 + + name + keyword.control.as.ts + + 5 + + name + invalid.illegal.ts + + 6 + + name + variable.other.readwrite.alias.ts + + + comment + (default|*|name) as alias + match + (?x) (?: \b(default)\b | (\*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) \s* (\b as \b) \s* (?: (\b default \b | \*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) + + + match + , + name + meta.delimiter.object.comma.ts + + + match + \* + name + constant.language.import-export-all.ts + + + match + \b(default)\b + name + keyword.control.default.ts + + + match + \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b + name + variable.other.readwrite.alias.ts + + + + import-export-declaration + + patterns + + + include + #comment + + + include + #string + + + include + #import-export-block + + + match + \bfrom\b + name + keyword.control.from.ts + + + include + #import-export-clause + + + indexer-declaration begin @@ -2320,7 +2427,7 @@ storage-keyword match - \b(var|let|function|const|module|namespace)\b + \b(module|namespace)\b name storage.type.ts @@ -2666,7 +2773,7 @@ end - (?=$|[,);>]|var|type|function|class|interface|namespace|enum|declare|export) + (?=$|[,);>]|\bvar\b|\blet\b|\bconst\b|\btype\b|\bfunction\b|\bclass\b|\binterface\b|\bnamespace\b|\bmodule\b|\bimport\b|\benum\b|\bdeclare\b|\bexport\b|\babstract\b|\basync\b) name meta.type.declaration.ts patterns diff --git a/TypeScript.tmTheme b/TypeScript.tmTheme index 827902dc..aa6cadc7 100644 --- a/TypeScript.tmTheme +++ b/TypeScript.tmTheme @@ -66,7 +66,7 @@ scope - meta.brace.angle.ts, meta.brace.round.ts, meta.brace.square.ts, punctuation.definition, constant.language.import-all.ts, meta.delimiter.object.comma.ts, punctuation.accessor.ts + meta.brace.angle.ts, meta.brace.round.ts, meta.brace.square.ts, punctuation.definition, constant.language.import-export-all.ts, meta.delimiter.object.comma.ts, punctuation.accessor.ts settings vsclassificationtype @@ -123,7 +123,7 @@ scope - entity.name.module.ts + entity.name.type.module.ts settings vsclassificationtype diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 0509ada5..51b6720d 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -83,6 +83,7 @@ repository: - include: '#comment' - include: '#literal' - include: '#function-declaration' + - include: '#class-or-interface-declaration' - include: '#paren-expression' - include: '#ternary-expression' - include: '#new-expr' @@ -123,6 +124,7 @@ repository: - include: '#enum-declaration' - include: '#import-equals-declaration' - include: '#import-declaration' + - include: '#export-declaration' # TODO: change this to actual declarations of export, import, namespace - include: '#storage-keyword' @@ -133,7 +135,7 @@ repository: '1': { name: keyword.control.export.tsx } '2': { name: storage.type.type.tsx } '3': { name: entity.name.type.tsx } - end: (?=$|[,);>]|var|type|function|class|interface|namespace|enum|declare|export) + end: (?=$|[,);>]|\bvar\b|\blet\b|\bconst\b|\btype\b|\bfunction\b|\bclass\b|\binterface\b|\bnamespace\b|\bmodule\b|\bimport\b|\benum\b|\bdeclare\b|\bexport\b|\babstract\b|\basync\b) patterns: - include: '#comment' - include: '#type-parameters' @@ -179,27 +181,56 @@ repository: - include: '#comment' - match: \b([a-zA-Z_$][\w$]*)\s*(\.) captures: - '1': { name: entity.name.module.tsx } + '1': { name: entity.name.type.module.tsx } '2': { name: punctuation.accessor.tsx } - name: variable.other.readwrite.tsx match: \b([a-zA-Z_$][\w$]*)\b import-declaration: name: meta.import.tsx - begin: (?:(\bexport)\s+)?(?include #import-declaration + + include + #export-declaration + include #storage-keyword @@ -640,6 +644,95 @@ name meta.enum.declaration.tsx + export-declaration + + patterns + + + captures + + 1 + + name + keyword.control.export.tsx + + 2 + + name + keyword.control.as.tsx + + 3 + + name + storage.type.namespace.tsx + + 4 + + name + entity.name.type.module.tsx + + + match + \b(?<!\.)(export)\s+(as)\s+(namespace)\s+([a-zA-Z_$][\w$]*) + + + begin + \b(?<!\.)(export)(?:(?:\s*(=))|(?:\s+(default)\s+)) + beginCaptures + + 1 + + name + keyword.control.export.tsx + + 2 + + name + keyword.operator.assignment.tsx + + 3 + + name + keyword.control.default.tsx + + + end + (?=;|\bexport\b|\bfunction\b|\bclass\b|\binterface\b|\blet\b|\bvar\b|\bconst\b|\bimport\b|\benum\b|\bnamespace\b|\bmodule\b|\btype\b|\babstract\b|\bdeclare\b|\basync\b|$) + name + meta.export.default.tsx + patterns + + + include + #expression + + + + + begin + \b(?<!\.)(export)(?!\s*:)\b + beginCaptures + + 0 + + name + keyword.control.export.tsx + + + end + (?=;|\bexport\b|\bfunction\b|\bclass\b|\binterface\b|\blet\b|\bvar\b|\bconst\b|\bimport\b|\benum\b|\bnamespace\b|\bmodule\b|\btype\b|\babstract\b|\bdeclare\b|\basync\b|$) + name + meta.export.tsx + patterns + + + include + #import-export-declaration + + + + + expression name @@ -674,6 +767,10 @@ include #function-declaration + + include + #class-or-interface-declaration + include #paren-expression @@ -1029,115 +1126,10 @@ name storage.type.function.arrow.tsx - import-block - - begin - \{ - beginCaptures - - 0 - - name - punctuation.definition.block.tsx - - - end - \} - endCaptures - - 0 - - name - punctuation.definition.block.tsx - - - name - meta.block.tsx - patterns - - - include - #import-clause - - - - import-clause - - patterns - - - include - #comment - - - captures - - 1 - - name - keyword.control.default.tsx - - 2 - - name - constant.language.import-all.tsx - - 3 - - name - variable.other.readwrite.tsx - - 4 - - name - keyword.control.as.tsx - - 5 - - name - invalid.illegal.tsx - - 6 - - name - variable.other.readwrite.alias.tsx - - - comment - (default|*|name) as alias - match - (?x) (?: \b(default)\b | (\*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) \s* (\b as \b) \s* (?: (\b default \b | \*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) - - - match - , - name - meta.delimiter.object.comma.tsx - - - match - \* - name - constant.language.import-all.tsx - - - match - \b(default)\b - name - keyword.control.default.tsx - - - match - \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b - name - variable.other.readwrite.alias.tsx - - - import-declaration begin - (?:(\bexport)\s+)?(?<!\.)\b(import)(?!\s*:)\b + (?:(\bexport)\s+)?\b(?<!\.)(import)(?!\s*:)\b beginCaptures 1 @@ -1159,25 +1151,7 @@ include - #comment - - - include - #string - - - include - #import-block - - - match - \bfrom\b - name - keyword.control.from.tsx - - - include - #import-clause + #import-export-declaration @@ -1287,7 +1261,7 @@ 1 name - entity.name.module.tsx + entity.name.type.module.tsx 2 @@ -1308,6 +1282,139 @@ + import-export-block + + begin + \{ + beginCaptures + + 0 + + name + punctuation.definition.block.tsx + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.block.tsx + + + name + meta.block.tsx + patterns + + + include + #import-export-clause + + + + import-export-clause + + patterns + + + include + #comment + + + captures + + 1 + + name + keyword.control.default.tsx + + 2 + + name + constant.language.import-export-all.tsx + + 3 + + name + variable.other.readwrite.tsx + + 4 + + name + keyword.control.as.tsx + + 5 + + name + invalid.illegal.tsx + + 6 + + name + variable.other.readwrite.alias.tsx + + + comment + (default|*|name) as alias + match + (?x) (?: \b(default)\b | (\*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) \s* (\b as \b) \s* (?: (\b default \b | \*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) + + + match + , + name + meta.delimiter.object.comma.tsx + + + match + \* + name + constant.language.import-export-all.tsx + + + match + \b(default)\b + name + keyword.control.default.tsx + + + match + \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b + name + variable.other.readwrite.alias.tsx + + + + import-export-declaration + + patterns + + + include + #comment + + + include + #string + + + include + #import-export-block + + + match + \bfrom\b + name + keyword.control.from.tsx + + + include + #import-export-clause + + + indexer-declaration begin @@ -2721,7 +2828,7 @@ storage-keyword match - \b(var|let|function|const|module|namespace)\b + \b(module|namespace)\b name storage.type.tsx @@ -3067,7 +3174,7 @@ end - (?=$|[,);>]|var|type|function|class|interface|namespace|enum|declare|export) + (?=$|[,);>]|\bvar\b|\blet\b|\bconst\b|\btype\b|\bfunction\b|\bclass\b|\binterface\b|\bnamespace\b|\bmodule\b|\bimport\b|\benum\b|\bdeclare\b|\bexport\b|\babstract\b|\basync\b) name meta.type.declaration.tsx patterns diff --git a/TypeScriptReact.tmTheme b/TypeScriptReact.tmTheme index a38f0615..c3335fbf 100644 --- a/TypeScriptReact.tmTheme +++ b/TypeScriptReact.tmTheme @@ -66,7 +66,7 @@ scope - meta.brace.angle.tsx, meta.brace.round.tsx, meta.brace.square.tsx, punctuation.definition, constant.language.import-all.tsx, meta.delimiter.object.comma.tsx, punctuation.accessor.tsx + meta.brace.angle.tsx, meta.brace.round.tsx, meta.brace.square.tsx, punctuation.definition, constant.language.import-export-all.tsx, meta.delimiter.object.comma.tsx, punctuation.accessor.tsx settings vsclassificationtype @@ -123,7 +123,7 @@ scope - entity.name.module.tsx + entity.name.type.module.tsx settings vsclassificationtype diff --git a/tests/baselines/Issue200.baseline.txt b/tests/baselines/Issue200.baseline.txt index 33c07839..bb8deacc 100644 --- a/tests/baselines/Issue200.baseline.txt +++ b/tests/baselines/Issue200.baseline.txt @@ -51,19 +51,19 @@ original file ^ source.ts meta.block.ts meta.import-equals.internal.ts ^^^^ - source.ts meta.block.ts meta.import-equals.internal.ts entity.name.module.ts + source.ts meta.block.ts meta.import-equals.internal.ts entity.name.type.module.ts ^ source.ts meta.block.ts meta.import-equals.internal.ts punctuation.accessor.ts ^^^^^ - source.ts meta.block.ts meta.import-equals.internal.ts entity.name.module.ts + source.ts meta.block.ts meta.import-equals.internal.ts entity.name.type.module.ts ^ source.ts meta.block.ts meta.import-equals.internal.ts punctuation.accessor.ts ^^^^ - source.ts meta.block.ts meta.import-equals.internal.ts entity.name.module.ts + source.ts meta.block.ts meta.import-equals.internal.ts entity.name.type.module.ts ^ source.ts meta.block.ts meta.import-equals.internal.ts punctuation.accessor.ts ^^^^ - source.ts meta.block.ts meta.import-equals.internal.ts entity.name.module.ts + source.ts meta.block.ts meta.import-equals.internal.ts entity.name.type.module.ts ^ source.ts meta.block.ts meta.import-equals.internal.ts punctuation.accessor.ts ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -74,13 +74,17 @@ original file ^^ source.ts meta.block.ts ^^^^^^ - source.ts meta.block.ts storage.type.ts + source.ts meta.block.ts meta.export.default.ts keyword.control.export.ts ^ - source.ts meta.block.ts + source.ts meta.block.ts meta.export.default.ts ^^^^^^^ - source.ts meta.decl.block.ts keyword.control.switch.ts - ^^^^^^^^^ - source.ts meta.decl.block.ts + source.ts meta.block.ts meta.export.default.ts keyword.control.default.ts + ^ + source.ts meta.block.ts meta.export.default.ts + ^^^^^ + source.ts meta.block.ts meta.export.default.ts + ^^^ + source.ts meta.block.ts >} ^ source.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue200.txt b/tests/baselines/Issue200.txt index 94ad4fe1..cfb28e66 100644 --- a/tests/baselines/Issue200.txt +++ b/tests/baselines/Issue200.txt @@ -25,14 +25,14 @@ original file ^^^^^ [4, 10]: source.ts meta.block.ts meta.import-equals.internal.ts variable.other.readwrite.alias.ts ^^^^ - [4, 18]: source.ts meta.block.ts meta.import-equals.internal.ts entity.name.module.ts + [4, 18]: source.ts meta.block.ts meta.import-equals.internal.ts entity.name.type.module.ts > export default alias; ^^^^^^ - [5, 3]: source.ts meta.block.ts storage.type.ts + [5, 3]: source.ts meta.block.ts meta.export.default.ts keyword.control.export.ts ^^^^^^^ - [5, 10]: source.ts meta.block.ts keyword.control.switch.ts - ^^^^^^^^^ - [5, 18]: source.ts meta.block.ts + [5, 10]: source.ts meta.block.ts meta.export.default.ts keyword.control.default.ts + ^^^^^ + [5, 18]: source.ts meta.block.ts meta.export.default.ts >} ^ [6, 1]: source.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index df30de7c..957e6865 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -84,7 +84,7 @@ var j: I = {} ^ source.ts meta.import.ts ^ - source.ts meta.import.ts constant.language.import-all.ts + source.ts meta.import.ts constant.language.import-export-all.ts ^ source.ts meta.import.ts ^^ diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt index 3b04ae06..d166eada 100644 --- a/tests/baselines/Issue37.txt +++ b/tests/baselines/Issue37.txt @@ -76,7 +76,7 @@ var j: I = {} ^^^^^^ [3, 1]: source.ts meta.import.ts keyword.control.import.ts ^ - [3, 8]: source.ts meta.import.ts constant.language.import-all.ts + [3, 8]: source.ts meta.import.ts constant.language.import-export-all.ts ^^ [3, 10]: source.ts meta.import.ts keyword.control.as.ts ^^^^ diff --git a/tests/baselines/exportDeclarations.baseline.txt b/tests/baselines/exportDeclarations.baseline.txt new file mode 100644 index 00000000..d40eedba --- /dev/null +++ b/tests/baselines/exportDeclarations.baseline.txt @@ -0,0 +1,102 @@ +original file +----------------------------------- +export { a as b, x }; +export * from "AnotherModule"; +export { k as m, l } from "AnotherModule"; +----------------------------------- + +>export { a as b, x }; + ^^^^^^ + source.ts meta.export.ts keyword.control.export.ts + ^ + source.ts meta.export.ts + ^ + source.ts meta.export.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.export.ts meta.block.ts + ^ + source.ts meta.export.ts meta.block.ts variable.other.readwrite.ts + ^ + source.ts meta.export.ts meta.block.ts + ^^ + source.ts meta.export.ts meta.block.ts keyword.control.as.ts + ^ + source.ts meta.export.ts meta.block.ts + ^ + source.ts meta.export.ts meta.block.ts variable.other.readwrite.alias.ts + ^ + source.ts meta.export.ts meta.block.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.export.ts meta.block.ts + ^ + source.ts meta.export.ts meta.block.ts variable.other.readwrite.alias.ts + ^ + source.ts meta.export.ts meta.block.ts + ^ + source.ts meta.export.ts meta.block.ts punctuation.definition.block.ts + ^^^ + source.ts +>export * from "AnotherModule"; + ^^^^^^ + source.ts meta.export.ts keyword.control.export.ts + ^ + source.ts meta.export.ts + ^ + source.ts meta.export.ts constant.language.import-export-all.ts + ^ + source.ts meta.export.ts + ^^^^ + source.ts meta.export.ts keyword.control.from.ts + ^ + source.ts meta.export.ts + ^ + source.ts meta.export.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^^^^^^^^^ + source.ts meta.export.ts string.quoted.double.ts + ^ + source.ts meta.export.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^^^ + source.ts +>export { k as m, l } from "AnotherModule"; + ^^^^^^ + source.ts meta.export.ts keyword.control.export.ts + ^ + source.ts meta.export.ts + ^ + source.ts meta.export.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.export.ts meta.block.ts + ^ + source.ts meta.export.ts meta.block.ts variable.other.readwrite.ts + ^ + source.ts meta.export.ts meta.block.ts + ^^ + source.ts meta.export.ts meta.block.ts keyword.control.as.ts + ^ + source.ts meta.export.ts meta.block.ts + ^ + source.ts meta.export.ts meta.block.ts variable.other.readwrite.alias.ts + ^ + source.ts meta.export.ts meta.block.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.export.ts meta.block.ts + ^ + source.ts meta.export.ts meta.block.ts variable.other.readwrite.alias.ts + ^ + source.ts meta.export.ts meta.block.ts + ^ + source.ts meta.export.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.export.ts + ^^^^ + source.ts meta.export.ts keyword.control.from.ts + ^ + source.ts meta.export.ts + ^ + source.ts meta.export.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^^^^^^^^^ + source.ts meta.export.ts string.quoted.double.ts + ^ + source.ts meta.export.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/cases/exportDeclarations.ts b/tests/cases/exportDeclarations.ts new file mode 100644 index 00000000..c46c807b --- /dev/null +++ b/tests/cases/exportDeclarations.ts @@ -0,0 +1,3 @@ +export { a as b, x }; +export * from "AnotherModule"; +export { k as m, l } from "AnotherModule"; \ No newline at end of file From 9fbaca8a52f60d17761278f78834748489d844fe Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 19 Aug 2016 11:29:26 -0700 Subject: [PATCH 31/77] Namespace declarations --- TypeScript.YAML-tmLanguage | 22 +++++-- TypeScript.tmLanguage | 60 +++++++++++++++---- TypeScriptReact.YAML-tmLanguage | 22 +++++-- TypeScriptReact.tmLanguage | 60 +++++++++++++++---- tests/baselines/Issue200.baseline.txt | 12 ++-- tests/baselines/Issue200.txt | 4 +- tests/baselines/Issue37.baseline.txt | 20 +++++-- tests/baselines/Issue37.txt | 8 +-- .../baselines/namespaceAndModule.baseline.txt | 52 ++++++++++------ tests/baselines/namespaceAndModule.txt | 10 ++-- 10 files changed, 195 insertions(+), 75 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 8d25f044..baa2e47a 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -118,11 +118,10 @@ repository: - include: '#class-or-interface-declaration' - include: '#type-declaration' - include: '#enum-declaration' + - include: '#namespace-declaration' - include: '#import-equals-declaration' - include: '#import-declaration' - include: '#export-declaration' - # TODO: change this to actual declarations of export, import, namespace - - include: '#storage-keyword' type-declaration: name: meta.type.declaration.ts @@ -148,6 +147,21 @@ repository: '3': { name: storage.type.enum.ts } '4': { name: entity.name.type.enum.ts } + namespace-declaration: + name: meta.namespace.declaration.ts + begin: (?:(\bexport)\s+)?\b(? include - #import-equals-declaration + #namespace-declaration include - #import-declaration + #import-equals-declaration include - #export-declaration + #import-declaration include - #storage-keyword + #export-declaration @@ -1672,6 +1672,51 @@ name meta.method.overload.declaration.ts + namespace-declaration + + begin + (?:(\bexport)\s+)?\b(?<!\.)(namespace|module)\s+ + beginCaptures + + 1 + + name + keyword.control.export.ts + + 2 + + name + storage.type.namespace.ts + + + end + (?=$|\{) + name + meta.namespace.declaration.ts + patterns + + + include + #comment + + + include + #string + + + match + \b([a-zA-Z_$][\w$]*)\b + name + entity.name.type.module.ts + + + match + \. + name + punctuation.accessor.ts + + + new-expr begin @@ -2424,13 +2469,6 @@ name storage.modifier.ts - storage-keyword - - match - \b(module|namespace)\b - name - storage.type.ts - string name diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 51b6720d..b3f4ca48 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -122,11 +122,10 @@ repository: - include: '#class-or-interface-declaration' - include: '#type-declaration' - include: '#enum-declaration' + - include: '#namespace-declaration' - include: '#import-equals-declaration' - include: '#import-declaration' - include: '#export-declaration' - # TODO: change this to actual declarations of export, import, namespace - - include: '#storage-keyword' type-declaration: name: meta.type.declaration.tsx @@ -152,6 +151,21 @@ repository: '3': { name: storage.type.enum.tsx } '4': { name: entity.name.type.enum.tsx } + namespace-declaration: + name: meta.namespace.declaration.tsx + begin: (?:(\bexport)\s+)?\b(? include - #import-equals-declaration + #namespace-declaration include - #import-declaration + #import-equals-declaration include - #export-declaration + #import-declaration include - #storage-keyword + #export-declaration @@ -2069,6 +2069,51 @@ name meta.method.overload.declaration.tsx + namespace-declaration + + begin + (?:(\bexport)\s+)?\b(?<!\.)(namespace|module)\s+ + beginCaptures + + 1 + + name + keyword.control.export.tsx + + 2 + + name + storage.type.namespace.tsx + + + end + (?=$|\{) + name + meta.namespace.declaration.tsx + patterns + + + include + #comment + + + include + #string + + + match + \b([a-zA-Z_$][\w$]*)\b + name + entity.name.type.module.tsx + + + match + \. + name + punctuation.accessor.tsx + + + new-expr begin @@ -2825,13 +2870,6 @@ name storage.modifier.tsx - storage-keyword - - match - \b(module|namespace)\b - name - storage.type.tsx - string name diff --git a/tests/baselines/Issue200.baseline.txt b/tests/baselines/Issue200.baseline.txt index bb8deacc..cdef78e4 100644 --- a/tests/baselines/Issue200.baseline.txt +++ b/tests/baselines/Issue200.baseline.txt @@ -20,17 +20,17 @@ original file ^ source.ts ^^^^^^ - source.ts storage.type.ts + source.ts meta.namespace.declaration.ts storage.type.namespace.ts ^ - source.ts + source.ts meta.namespace.declaration.ts ^ - source.ts string.quoted.single.ts punctuation.definition.string.begin.ts + source.ts meta.namespace.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts string.quoted.single.ts + source.ts meta.namespace.declaration.ts string.quoted.single.ts ^ - source.ts string.quoted.single.ts punctuation.definition.string.end.ts + source.ts meta.namespace.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts + source.ts meta.namespace.declaration.ts ^ source.ts meta.block.ts punctuation.definition.block.ts ^^ diff --git a/tests/baselines/Issue200.txt b/tests/baselines/Issue200.txt index cfb28e66..36c76932 100644 --- a/tests/baselines/Issue200.txt +++ b/tests/baselines/Issue200.txt @@ -16,9 +16,9 @@ original file ^^^^^^^ [3, 1]: source.ts storage.modifier.ts ^^^^^^ - [3, 9]: source.ts storage.type.ts + [3, 9]: source.ts meta.namespace.declaration.ts storage.type.namespace.ts ^ - [3, 16]: source.ts string.quoted.single.ts punctuation.definition.string.begin.ts + [3, 16]: source.ts meta.namespace.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts > import alias = lool.clutz.goog.i18n.NumberFormatSymbols_en_TT; ^^^^^^ [4, 3]: source.ts meta.block.ts meta.import-equals.internal.ts keyword.control.import.ts diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index 957e6865..d86b03b2 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -382,9 +382,13 @@ var j: I = {} source.ts >module M { ^^^^^^ - source.ts storage.type.ts - ^^^ - source.ts + source.ts meta.namespace.declaration.ts storage.type.namespace.ts + ^ + source.ts meta.namespace.declaration.ts + ^ + source.ts meta.namespace.declaration.ts entity.name.type.module.ts + ^ + source.ts meta.namespace.declaration.ts ^ source.ts meta.block.ts punctuation.definition.block.ts > export function myFun(x: number) { @@ -574,9 +578,13 @@ var j: I = {} source.ts >module Body { ^^^^^^ - source.ts storage.type.ts - ^^^^^^ - source.ts + source.ts meta.namespace.declaration.ts storage.type.namespace.ts + ^ + source.ts meta.namespace.declaration.ts + ^^^^ + source.ts meta.namespace.declaration.ts entity.name.type.module.ts + ^ + source.ts meta.namespace.declaration.ts ^ source.ts meta.block.ts punctuation.definition.block.ts > export class Cell { diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt index d166eada..6c04d84d 100644 --- a/tests/baselines/Issue37.txt +++ b/tests/baselines/Issue37.txt @@ -150,7 +150,7 @@ var j: I = {} > >module M { ^^^^^^ - [35, 1]: source.ts storage.type.ts + [35, 1]: source.ts meta.namespace.declaration.ts storage.type.namespace.ts > export function myFun(x: number) { ^^^^^^ [36, 5]: source.ts meta.block.ts meta.function.ts keyword.control.export.ts @@ -176,9 +176,9 @@ var j: I = {} > >module Body { ^^^^^^ - [51, 1]: source.ts storage.type.ts - ^^^^^^ - [51, 8]: source.ts + [51, 1]: source.ts meta.namespace.declaration.ts storage.type.namespace.ts + ^^^^ + [51, 8]: source.ts meta.namespace.declaration.ts entity.name.type.module.ts > export class Cell { ^^^^^^ [52, 5]: source.ts meta.block.ts meta.declaration.object.ts keyword.control.export.ts diff --git a/tests/baselines/namespaceAndModule.baseline.txt b/tests/baselines/namespaceAndModule.baseline.txt index 4bf05606..9d267074 100644 --- a/tests/baselines/namespaceAndModule.baseline.txt +++ b/tests/baselines/namespaceAndModule.baseline.txt @@ -9,9 +9,13 @@ declare ^^module "x" {} >namespace ts { } ^^^^^^^^^ - source.ts storage.type.ts - ^^^^ - source.ts + source.ts meta.namespace.declaration.ts storage.type.namespace.ts + ^ + source.ts meta.namespace.declaration.ts + ^^ + source.ts meta.namespace.declaration.ts entity.name.type.module.ts + ^ + source.ts meta.namespace.declaration.ts ^ source.ts meta.block.ts punctuation.definition.block.ts ^ @@ -22,9 +26,13 @@ declare ^^module "x" {} source.ts >module ts { } ^^^^^^ - source.ts storage.type.ts - ^^^^ - source.ts + source.ts meta.namespace.declaration.ts storage.type.namespace.ts + ^ + source.ts meta.namespace.declaration.ts + ^^ + source.ts meta.namespace.declaration.ts entity.name.type.module.ts + ^ + source.ts meta.namespace.declaration.ts ^ source.ts meta.block.ts punctuation.definition.block.ts ^ @@ -39,9 +47,13 @@ declare ^^module "x" {} ^ source.ts ^^^^^^^^^ - source.ts storage.type.ts - ^^^^ - source.ts + source.ts meta.namespace.declaration.ts storage.type.namespace.ts + ^ + source.ts meta.namespace.declaration.ts + ^^ + source.ts meta.namespace.declaration.ts entity.name.type.module.ts + ^ + source.ts meta.namespace.declaration.ts ^ source.ts meta.block.ts punctuation.definition.block.ts ^ @@ -54,9 +66,13 @@ declare ^^module "x" {} ^ source.ts ^^^^^^ - source.ts storage.type.ts - ^^^^ - source.ts + source.ts meta.namespace.declaration.ts storage.type.namespace.ts + ^ + source.ts meta.namespace.declaration.ts + ^^ + source.ts meta.namespace.declaration.ts entity.name.type.module.ts + ^ + source.ts meta.namespace.declaration.ts ^ source.ts meta.block.ts punctuation.definition.block.ts ^ @@ -69,17 +85,17 @@ declare ^^module "x" {} ^ source.ts ^^^^^^ - source.ts storage.type.ts + source.ts meta.namespace.declaration.ts storage.type.namespace.ts ^ - source.ts + source.ts meta.namespace.declaration.ts ^ - source.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.namespace.declaration.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^ - source.ts string.quoted.double.ts + source.ts meta.namespace.declaration.ts string.quoted.double.ts ^ - source.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.namespace.declaration.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts + source.ts meta.namespace.declaration.ts ^ source.ts meta.block.ts punctuation.definition.block.ts ^ diff --git a/tests/baselines/namespaceAndModule.txt b/tests/baselines/namespaceAndModule.txt index 7f57055b..664f19f5 100644 --- a/tests/baselines/namespaceAndModule.txt +++ b/tests/baselines/namespaceAndModule.txt @@ -9,16 +9,16 @@ declare ^^module "x" {} >namespace ts { } ^^^^^^^^^ - [1, 1]: source.ts storage.type.ts + [1, 1]: source.ts meta.namespace.declaration.ts storage.type.namespace.ts >module ts { } ^^^^^^ - [2, 1]: source.ts storage.type.ts + [2, 1]: source.ts meta.namespace.declaration.ts storage.type.namespace.ts >declare namespace ts {} ^^^^^^^^^ - [3, 9]: source.ts storage.type.ts + [3, 9]: source.ts meta.namespace.declaration.ts storage.type.namespace.ts >declare module ts {} ^^^^^^ - [4, 9]: source.ts storage.type.ts + [4, 9]: source.ts meta.namespace.declaration.ts storage.type.namespace.ts >declare module "x" {} ^^^^^^ - [5, 9]: source.ts storage.type.ts \ No newline at end of file + [5, 9]: source.ts meta.namespace.declaration.ts storage.type.namespace.ts \ No newline at end of file From 35731c0f3bf1b58f286cbd0d4e87a4905f9d1f81 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 19 Aug 2016 11:29:26 -0700 Subject: [PATCH 32/77] Destructuring variable declaration --- TypeScript.YAML-tmLanguage | 90 ++- TypeScript.tmLanguage | 282 ++++++- TypeScript.tmTheme | 2 +- TypeScriptReact.YAML-tmLanguage | 88 +++ TypeScriptReact.tmLanguage | 280 +++++++ TypeScriptReact.tmTheme | 2 +- tests/baselines/Issue219.baseline.txt | 76 ++ .../variableBindingPattern.baseline.txt | 748 ++++++++++++++++++ tests/cases/Issue219.ts | 6 + tests/cases/variableBindingPattern.ts | 35 + 10 files changed, 1605 insertions(+), 4 deletions(-) create mode 100644 tests/baselines/Issue219.baseline.txt create mode 100644 tests/baselines/variableBindingPattern.baseline.txt create mode 100644 tests/cases/Issue219.ts create mode 100644 tests/cases/variableBindingPattern.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index baa2e47a..66b45853 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -34,6 +34,7 @@ repository: '2': { name: storage.type.ts } end: (?=$|;) patterns: + - include: '#destructuring-variable' - include: '#var-single-variable' - include: '#comment' @@ -52,6 +53,93 @@ repository: - include: '#string' - include: '#comment' + destructuring-variable: + patterns: + - name: meta.object-binding-pattern-variable.ts + begin: (? + array-binding-element + + patterns + + + include + #comment + + + include + #object-binding-pattern + + + include + #array-binding-pattern + + + match + \b([a-zA-Z_$][\w$]*)\b + name + variable.other.readwrite.ts + + + match + , + name + meta.delimiter.object.comma.ts + + + + array-binding-pattern + + begin + \[ + beginCaptures + + 0 + + name + punctuation.definition.binding-pattern.array.ts + + + end + \] + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.array.ts + + + patterns + + + include + #array-binding-element + + + array-literal begin @@ -607,6 +667,134 @@ + destructuring-variable + + patterns + + + begin + (?<!=|:)\s*(\{) + beginCaptures + + 1 + + name + punctuation.definition.binding-pattern.object.ts + + + end + (?=$|[;,]) + name + meta.object-binding-pattern-variable.ts + patterns + + + include + #variable-initializer + + + begin + \G + end + (?!\G)(?=$|[;,=]) + patterns + + + begin + \G + end + \} + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.object.ts + + + patterns + + + include + #object-binding-element + + + + + include + #type-annotation + + + include + #comment + + + + + + + begin + (?<!=|:)\s*(\[) + beginCaptures + + 1 + + name + punctuation.definition.binding-pattern.array.ts + + + end + (?=$|[;,]) + name + meta.array-binding-pattern-variable.ts + patterns + + + include + #variable-initializer + + + begin + \G + end + (?!\G)(?=$|[;,=]) + patterns + + + begin + \G + end + \] + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.array.ts + + + patterns + + + include + #array-binding-element + + + + + include + #type-annotation + + + include + #comment + + + + + + + docblock patterns @@ -1846,6 +2034,94 @@ + object-binding-element + + patterns + + + include + #comment + + + begin + \b([a-zA-Z_$][\w$]*)\s*(:) + beginCaptures + + 1 + + name + variable.object.property.ts + + 2 + + name + punctuation.destructuring.ts + + + end + (?=,|\}) + patterns + + + include + #object-binding-pattern + + + include + #array-binding-pattern + + + match + \b([a-zA-Z_$][\w$]*)\b + name + variable.other.readwrite.ts + + + + + match + \b([a-zA-Z_$][\w$]*)\b + name + variable.other.readwrite.ts + + + match + , + name + meta.delimiter.object.comma.ts + + + + object-binding-pattern + + begin + \{ + beginCaptures + + 0 + + name + punctuation.definition.binding-pattern.object.ts + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.object.ts + + + patterns + + + include + #object-binding-element + + + object-literal begin @@ -2959,7 +3235,7 @@ type-operator match - [.|] + [&|] name keyword.operator.type.ts @@ -3128,6 +3404,10 @@ meta.var.expr.ts patterns + + include + #destructuring-variable + include #var-single-variable diff --git a/TypeScript.tmTheme b/TypeScript.tmTheme index aa6cadc7..a81b6cc5 100644 --- a/TypeScript.tmTheme +++ b/TypeScript.tmTheme @@ -66,7 +66,7 @@ scope - meta.brace.angle.ts, meta.brace.round.ts, meta.brace.square.ts, punctuation.definition, constant.language.import-export-all.ts, meta.delimiter.object.comma.ts, punctuation.accessor.ts + meta.brace.angle.ts, meta.brace.round.ts, meta.brace.square.ts, punctuation, constant.language.import-export-all.ts, meta.delimiter.object.comma.ts settings vsclassificationtype diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index b3f4ca48..ae50408a 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -38,6 +38,7 @@ repository: '2': { name: storage.type.tsx } end: (?=$|;) patterns: + - include: '#destructuring-variable' - include: '#var-single-variable' - include: '#comment' @@ -56,6 +57,93 @@ repository: - include: '#string' - include: '#comment' + destructuring-variable: + patterns: + - name: meta.object-binding-pattern-variable.tsx + begin: (? + array-binding-element + + patterns + + + include + #comment + + + include + #object-binding-pattern + + + include + #array-binding-pattern + + + match + \b([a-zA-Z_$][\w$]*)\b + name + variable.other.readwrite.tsx + + + match + , + name + meta.delimiter.object.comma.tsx + + + + array-binding-pattern + + begin + \[ + beginCaptures + + 0 + + name + punctuation.definition.binding-pattern.array.tsx + + + end + \] + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.array.tsx + + + patterns + + + include + #array-binding-element + + + array-literal begin @@ -575,6 +635,134 @@ + destructuring-variable + + patterns + + + begin + (?<!=|:)\s*(\{) + beginCaptures + + 1 + + name + punctuation.definition.binding-pattern.object.tsx + + + end + (?=$|[;,]) + name + meta.object-binding-pattern-variable.tsx + patterns + + + include + #variable-initializer + + + begin + \G + end + (?!\G)(?=$|[;,=]) + patterns + + + begin + \G + end + \} + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.object.tsx + + + patterns + + + include + #object-binding-element + + + + + include + #type-annotation + + + include + #comment + + + + + + + begin + (?<!=|:)\s*(\[) + beginCaptures + + 1 + + name + punctuation.definition.binding-pattern.array.tsx + + + end + (?=$|[;,]) + name + meta.array-binding-pattern-variable.tsx + patterns + + + include + #variable-initializer + + + begin + \G + end + (?!\G)(?=$|[;,=]) + patterns + + + begin + \G + end + \] + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.array.tsx + + + patterns + + + include + #array-binding-element + + + + + include + #type-annotation + + + include + #comment + + + + + + + docblock patterns @@ -2243,6 +2431,94 @@ + object-binding-element + + patterns + + + include + #comment + + + begin + \b([a-zA-Z_$][\w$]*)\s*(:) + beginCaptures + + 1 + + name + variable.object.property.tsx + + 2 + + name + punctuation.destructuring.tsx + + + end + (?=,|\}) + patterns + + + include + #object-binding-pattern + + + include + #array-binding-pattern + + + match + \b([a-zA-Z_$][\w$]*)\b + name + variable.other.readwrite.tsx + + + + + match + \b([a-zA-Z_$][\w$]*)\b + name + variable.other.readwrite.tsx + + + match + , + name + meta.delimiter.object.comma.tsx + + + + object-binding-pattern + + begin + \{ + beginCaptures + + 0 + + name + punctuation.definition.binding-pattern.object.tsx + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.object.tsx + + + patterns + + + include + #object-binding-element + + + object-literal begin @@ -3529,6 +3805,10 @@ meta.var.expr.tsx patterns + + include + #destructuring-variable + include #var-single-variable diff --git a/TypeScriptReact.tmTheme b/TypeScriptReact.tmTheme index c3335fbf..c2ed099e 100644 --- a/TypeScriptReact.tmTheme +++ b/TypeScriptReact.tmTheme @@ -66,7 +66,7 @@ scope - meta.brace.angle.tsx, meta.brace.round.tsx, meta.brace.square.tsx, punctuation.definition, constant.language.import-export-all.tsx, meta.delimiter.object.comma.tsx, punctuation.accessor.tsx + meta.brace.angle.tsx, meta.brace.round.tsx, meta.brace.square.tsx, punctuation, constant.language.import-export-all.tsx, meta.delimiter.object.comma.tsx settings vsclassificationtype diff --git a/tests/baselines/Issue219.baseline.txt b/tests/baselines/Issue219.baseline.txt new file mode 100644 index 00000000..f43bae79 --- /dev/null +++ b/tests/baselines/Issue219.baseline.txt @@ -0,0 +1,76 @@ +original file +----------------------------------- +const { + map, + coordinate +} = this.props +if (!map) return; +var marker; +----------------------------------- + +>const { + ^^^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts +> map, + ^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.delimiter.object.comma.ts + ^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts +> coordinate + ^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^^^^^^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts + ^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts +>} = this.props + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.language.this.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts +>if (!map) return; + ^^ + source.ts keyword.control.conditional.ts + ^ + source.ts + ^ + source.ts meta.brace.round.ts + ^ + source.ts keyword.operator.logical.ts + ^^^ + source.ts + ^ + source.ts meta.brace.round.ts + ^ + source.ts + ^^^^^^ + source.ts keyword.control.flow.ts + ^^^ + source.ts +>var marker; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/variableBindingPattern.baseline.txt b/tests/baselines/variableBindingPattern.baseline.txt new file mode 100644 index 00000000..dc77bdb4 --- /dev/null +++ b/tests/baselines/variableBindingPattern.baseline.txt @@ -0,0 +1,748 @@ +original file +----------------------------------- +function foo() { + return { + x: { + a: 10, + b: 20 + }, + y: { + c: "hello", + d: "world" + }, + z: <[number, { hello: string }]>[10, { hello: "Hello" }] + }; +} + +var {x: k, y: { c: d}, z: [e, { hello }], x } = foo(); +var {x: k, y: { c: d}, z: [e, { hello }], x }: { + x: { + a: number; + b: number; + }; + y: { + c: string; + d: string; + }; + z: [number, { + hello: string; + }]; +} = foo(); + +function bar() { + return <[{ hello: string },string]>[{ hello: "Hello" }, "world"]; +} + +var [{hello}, world] = bar(); +var [{hello}, world]: [{ hello: string }, string] = bar(); +----------------------------------- + +>function foo() { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts +> return { + ^^^^ + source.ts meta.function.ts meta.block.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts +> x: { + ^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts +> a: 10, + ^^^^^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts constant.numeric.decimal.ts + ^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts +> b: 20 + ^^^^^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts constant.numeric.decimal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts +> }, + ^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + ^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts +> y: { + ^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts +> c: "hello", + ^^^^^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts +> d: "world" + ^^^^^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts +> }, + ^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + ^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts +> z: <[number, { hello: string }]>[10, { hello: "Hello" }] + ^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts support.type.primitive.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.brace.square.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts constant.numeric.decimal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.brace.square.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts +> }; + ^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts punctuation.definition.block.ts + ^^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>var {x: k, y: { c: d}, z: [e, { hello }], x } = foo(); + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.destructuring.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.destructuring.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.destructuring.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.destructuring.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts keyword.operator.assignment.ts + ^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.brace.round.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.brace.round.ts + ^^^ + source.ts +>var {x: k, y: { c: d}, z: [e, { hello }], x }: { + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.destructuring.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.destructuring.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.destructuring.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.destructuring.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts +> x: { + ^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts +> a: number; + ^^^^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts +> b: number; + ^^^^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts +> }; + ^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + ^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts +> y: { + ^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts +> c: string; + ^^^^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts +> d: string; + ^^^^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts +> }; + ^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + ^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts +> z: [number, { + ^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + ^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts +> hello: string; + ^^^^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts + ^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts +> }]; + ^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts +>} = foo(); + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts keyword.operator.assignment.ts + ^^^^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.brace.round.ts + ^ + source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.brace.round.ts + ^^^ + source.ts +> + ^^ + source.ts +>function bar() { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts +> return <[{ hello: string },string]>[{ hello: "Hello" }, "world"]; + ^^^^ + source.ts meta.function.ts meta.block.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.brace.angle.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.brace.angle.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts string.quoted.double.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts + ^^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>var [{hello}, world] = bar(); + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^^^^^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts + ^^^^^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts keyword.operator.assignment.ts + ^^^^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.brace.round.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.brace.round.ts + ^^^ + source.ts +>var [{hello}, world]: [{ hello: string }, string] = bar(); + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^^^^^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts + ^^^^^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts + ^^^^^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts keyword.operator.assignment.ts + ^^^^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.brace.round.ts + ^ + source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.brace.round.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/cases/Issue219.ts b/tests/cases/Issue219.ts new file mode 100644 index 00000000..7b120c3d --- /dev/null +++ b/tests/cases/Issue219.ts @@ -0,0 +1,6 @@ +const { + map, + coordinate +} = this.props +if (!map) return; +var marker; \ No newline at end of file diff --git a/tests/cases/variableBindingPattern.ts b/tests/cases/variableBindingPattern.ts new file mode 100644 index 00000000..20dafa10 --- /dev/null +++ b/tests/cases/variableBindingPattern.ts @@ -0,0 +1,35 @@ +function foo() { + return { + x: { + a: 10, + b: 20 + }, + y: { + c: "hello", + d: "world" + }, + z: <[number, { hello: string }]>[10, { hello: "Hello" }] + }; +} + +var {x: k, y: { c: d}, z: [e, { hello }], x } = foo(); +var {x: k, y: { c: d}, z: [e, { hello }], x }: { + x: { + a: number; + b: number; + }; + y: { + c: string; + d: string; + }; + z: [number, { + hello: string; + }]; +} = foo(); + +function bar() { + return <[{ hello: string },string]>[{ hello: "Hello" }, "world"]; +} + +var [{hello}, world] = bar(); +var [{hello}, world]: [{ hello: string }, string] = bar(); \ No newline at end of file From f0633d803100b410c97df40393b31c6353db0e1f Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 19 Aug 2016 11:29:26 -0700 Subject: [PATCH 33/77] Support for parameter destructuring --- TypeScript.YAML-tmLanguage | 72 +- TypeScript.tmLanguage | 222 ++++- TypeScriptReact.YAML-tmLanguage | 72 +- TypeScriptReact.tmLanguage | 222 ++++- .../parameterBindingPattern.baseline.txt | 810 ++++++++++++++++++ tests/cases/parameterBindingPattern.ts | 39 + 6 files changed, 1433 insertions(+), 4 deletions(-) create mode 100644 tests/baselines/parameterBindingPattern.baseline.txt create mode 100644 tests/cases/parameterBindingPattern.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 66b45853..9f4f18fa 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -579,13 +579,82 @@ repository: - include: '#object-member' parameter-name: - match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??)' + match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*(? + destructuring-parameter + + patterns + + + begin + (?<!=|:)\s*(\{) + beginCaptures + + 1 + + name + punctuation.definition.binding-pattern.object.ts + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.object.ts + + + name + meta.parameter.object-binding-pattern.ts + patterns + + + include + #parameter-object-binding-element + + + + + begin + (?<!=|:)\s*(\[) + beginCaptures + + 1 + + name + punctuation.definition.binding-pattern.array.ts + + + end + \] + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.array.ts + + + name + meta.paramter.array-binding-pattern.ts + patterns + + + include + #parameter-array-binding-element + + + + + destructuring-variable patterns @@ -1325,6 +1393,10 @@ include #comment + + include + #destructuring-parameter + include #parameter-name @@ -2236,6 +2308,66 @@ + parameter-array-binding-element + + patterns + + + include + #comment + + + include + #parameter-object-binding-pattern + + + include + #parameter-array-binding-pattern + + + match + \b([a-zA-Z_$][\w$]*)\b + name + variable.parameter.ts + + + match + , + name + meta.delimiter.object.comma.ts + + + + parameter-array-binding-pattern + + begin + \[ + beginCaptures + + 0 + + name + punctuation.definition.binding-pattern.array.ts + + + end + \] + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.array.ts + + + patterns + + + include + #parameter-array-binding-element + + + parameter-name captures @@ -2262,7 +2394,95 @@ match - (?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??) + (?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*(?<!=|:)([a-zA-Z_$][\w$]*)\s*(\??) + + parameter-object-binding-element + + patterns + + + include + #comment + + + begin + \b([a-zA-Z_$][\w$]*)\s*(:) + beginCaptures + + 1 + + name + variable.object.property.ts + + 2 + + name + punctuation.destructuring.ts + + + end + (?=,|\}) + patterns + + + include + #parameter-object-binding-pattern + + + include + #parameter-array-binding-pattern + + + match + \b([a-zA-Z_$][\w$]*)\b + name + variable.parameter.ts + + + + + match + \b([a-zA-Z_$][\w$]*)\b + name + variable.parameter.ts + + + match + , + name + meta.delimiter.object.comma.ts + + + + parameter-object-binding-pattern + + begin + \{ + beginCaptures + + 0 + + name + punctuation.definition.binding-pattern.object.ts + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.object.ts + + + patterns + + + include + #parameter-object-binding-element + + paren-expression diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index ae50408a..192591c4 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -583,13 +583,82 @@ repository: - include: '#object-member' parameter-name: - match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??)' + match: '(?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*(? + destructuring-parameter + + patterns + + + begin + (?<!=|:)\s*(\{) + beginCaptures + + 1 + + name + punctuation.definition.binding-pattern.object.tsx + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.object.tsx + + + name + meta.parameter.object-binding-pattern.tsx + patterns + + + include + #parameter-object-binding-element + + + + + begin + (?<!=|:)\s*(\[) + beginCaptures + + 1 + + name + punctuation.definition.binding-pattern.array.tsx + + + end + \] + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.array.tsx + + + name + meta.paramter.array-binding-pattern.tsx + patterns + + + include + #parameter-array-binding-element + + + + + destructuring-variable patterns @@ -1293,6 +1361,10 @@ include #comment + + include + #destructuring-parameter + include #parameter-name @@ -2633,6 +2705,66 @@ + parameter-array-binding-element + + patterns + + + include + #comment + + + include + #parameter-object-binding-pattern + + + include + #parameter-array-binding-pattern + + + match + \b([a-zA-Z_$][\w$]*)\b + name + variable.parameter.tsx + + + match + , + name + meta.delimiter.object.comma.tsx + + + + parameter-array-binding-pattern + + begin + \[ + beginCaptures + + 0 + + name + punctuation.definition.binding-pattern.array.tsx + + + end + \] + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.array.tsx + + + patterns + + + include + #parameter-array-binding-element + + + parameter-name captures @@ -2659,7 +2791,95 @@ match - (?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*([a-zA-Z_$][\w$]*)\s*(\??) + (?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*(?<!=|:)([a-zA-Z_$][\w$]*)\s*(\??) + + parameter-object-binding-element + + patterns + + + include + #comment + + + begin + \b([a-zA-Z_$][\w$]*)\s*(:) + beginCaptures + + 1 + + name + variable.object.property.tsx + + 2 + + name + punctuation.destructuring.tsx + + + end + (?=,|\}) + patterns + + + include + #parameter-object-binding-pattern + + + include + #parameter-array-binding-pattern + + + match + \b([a-zA-Z_$][\w$]*)\b + name + variable.parameter.tsx + + + + + match + \b([a-zA-Z_$][\w$]*)\b + name + variable.parameter.tsx + + + match + , + name + meta.delimiter.object.comma.tsx + + + + parameter-object-binding-pattern + + begin + \{ + beginCaptures + + 0 + + name + punctuation.definition.binding-pattern.object.tsx + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.binding-pattern.object.tsx + + + patterns + + + include + #parameter-object-binding-element + + paren-expression diff --git a/tests/baselines/parameterBindingPattern.baseline.txt b/tests/baselines/parameterBindingPattern.baseline.txt new file mode 100644 index 00000000..eb4353cf --- /dev/null +++ b/tests/baselines/parameterBindingPattern.baseline.txt @@ -0,0 +1,810 @@ +original file +----------------------------------- +function foo() { + return { + x: { + a: 10, + b: 20 + }, + y: { + c: "hello", + d: "world" + }, + z: <[number, { hello: string }]>[10, { hello: "Hello" }] + }; +} + +function foo2({x: k, y: { c: d}, z: [e, { hello }], x } = foo()) { +} +function foo3({x: k, y: { c: d}, z: [e, { hello }], x }: { + x: { + a: number; + b: number; + }; + y: { + c: string; + d: string; + }; + z: [number, { + hello: string; + }]; +} = foo()) { +} + +function bar() { + return <[{ hello: string },string]>[{ hello: "Hello" }, "world"]; +} + +function bar2([{hello}, world] = bar()) { +} +function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { +} +----------------------------------- + +>function foo() { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts +> return { + ^^^^ + source.ts meta.function.ts meta.block.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts +> x: { + ^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts +> a: 10, + ^^^^^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts constant.numeric.decimal.ts + ^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts +> b: 20 + ^^^^^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts constant.numeric.decimal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts +> }, + ^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + ^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts +> y: { + ^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts +> c: "hello", + ^^^^^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts +> d: "world" + ^^^^^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts +> }, + ^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.definition.block.ts + ^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts +> z: <[number, { hello: string }]>[10, { hello: "Hello" }] + ^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts support.type.primitive.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.brace.angle.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.brace.square.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts constant.numeric.decimal.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.brace.square.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts +> }; + ^^^^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts punctuation.definition.block.ts + ^^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>function foo2({x: k, y: { c: d}, z: [e, { hello }], x } = foo()) { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts keyword.operator.assignment.ts + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +>function foo3({x: k, y: { c: d}, z: [e, { hello }], x }: { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts +> x: { + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts +> a: number; + ^^^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts +> b: number; + ^^^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts +> }; + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts +> y: { + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts +> c: string; + ^^^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts +> d: string; + ^^^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts +> }; + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts +> z: [number, { + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts +> hello: string; + ^^^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts + ^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts +> }]; + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts +>} = foo()) { + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts keyword.operator.assignment.ts + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>function bar() { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts +> return <[{ hello: string },string]>[{ hello: "Hello" }, "world"]; + ^^^^ + source.ts meta.function.ts meta.block.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.brace.angle.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.block.ts cast.expr.ts meta.brace.angle.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts string.quoted.double.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts + ^^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>function bar2([{hello}, world] = bar()) { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts + ^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts keyword.operator.assignment.ts + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +>function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts + ^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts + ^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts keyword.operator.assignment.ts + ^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/cases/parameterBindingPattern.ts b/tests/cases/parameterBindingPattern.ts new file mode 100644 index 00000000..7e331c67 --- /dev/null +++ b/tests/cases/parameterBindingPattern.ts @@ -0,0 +1,39 @@ +function foo() { + return { + x: { + a: 10, + b: 20 + }, + y: { + c: "hello", + d: "world" + }, + z: <[number, { hello: string }]>[10, { hello: "Hello" }] + }; +} + +function foo2({x: k, y: { c: d}, z: [e, { hello }], x } = foo()) { +} +function foo3({x: k, y: { c: d}, z: [e, { hello }], x }: { + x: { + a: number; + b: number; + }; + y: { + c: string; + d: string; + }; + z: [number, { + hello: string; + }]; +} = foo()) { +} + +function bar() { + return <[{ hello: string },string]>[{ hello: "Hello" }, "world"]; +} + +function bar2([{hello}, world] = bar()) { +} +function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { +} \ No newline at end of file From c8dbfcfde4d222fade475a1ef6ac62893dc90a98 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 19 Aug 2016 11:29:26 -0700 Subject: [PATCH 34/77] Add support for method declaration as object member --- TypeScript.YAML-tmLanguage | 11 ++-- TypeScript.tmLanguage | 27 +++++++--- TypeScriptReact.YAML-tmLanguage | 11 ++-- TypeScriptReact.tmLanguage | 27 +++++++--- tests/baselines/Issue163.baseline.txt | 60 +++++++++++++++++++++ tests/baselines/Issue36.baseline.txt | 76 +++++++++++++++++++++++++++ tests/cases/Issue163.ts | 5 ++ tests/cases/Issue36.ts | 5 ++ 8 files changed, 200 insertions(+), 22 deletions(-) create mode 100644 tests/baselines/Issue163.baseline.txt create mode 100644 tests/baselines/Issue36.baseline.txt create mode 100644 tests/cases/Issue163.ts create mode 100644 tests/cases/Issue36.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 9f4f18fa..d74ee125 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -888,11 +888,14 @@ repository: - include: '#comment' object-member: - name: meta.object.member.ts - begin: '[a-zA-Z_$][\w$]*\s*:' - end: (?=,|\}) patterns: - - include: '#expression' + - include: '#comment' + - include: '#method-declaration' + - name: meta.object.member.ts + begin: '[a-zA-Z_$][\w$]*\s*:' + end: (?=,|\}) + patterns: + - include: '#expression' expression-operator: patterns: diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 4be6db81..1ae0a293 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -2228,17 +2228,30 @@ object-member - begin - [a-zA-Z_$][\w$]*\s*: - end - (?=,|\}) - name - meta.object.member.ts patterns include - #expression + #comment + + + include + #method-declaration + + + begin + [a-zA-Z_$][\w$]*\s*: + end + (?=,|\}) + name + meta.object.member.ts + patterns + + + include + #expression + + diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 192591c4..e1980f59 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -878,11 +878,14 @@ repository: - include: '#comment' object-member: - name: meta.object.member.tsx - begin: '[a-zA-Z_$][\w$]*\s*:' - end: (?=,|\}) patterns: - - include: '#expression' + - include: '#comment' + - include: '#method-declaration' + - name: meta.object.member.tsx + begin: '[a-zA-Z_$][\w$]*\s*:' + end: (?=,|\}) + patterns: + - include: '#expression' expression-operator: patterns: diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 23c8f765..eaef4fa0 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -2625,17 +2625,30 @@ object-member - begin - [a-zA-Z_$][\w$]*\s*: - end - (?=,|\}) - name - meta.object.member.tsx patterns include - #expression + #comment + + + include + #method-declaration + + + begin + [a-zA-Z_$][\w$]*\s*: + end + (?=,|\}) + name + meta.object.member.tsx + patterns + + + include + #expression + + diff --git a/tests/baselines/Issue163.baseline.txt b/tests/baselines/Issue163.baseline.txt new file mode 100644 index 00000000..c9c70260 --- /dev/null +++ b/tests/baselines/Issue163.baseline.txt @@ -0,0 +1,60 @@ +original file +----------------------------------- +const o = { + async f() { + + } +}; +----------------------------------- + +>const o = { + ^^^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts +> async f() { + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts storage.modifier.async.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts +> + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts +>}; + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/Issue36.baseline.txt b/tests/baselines/Issue36.baseline.txt new file mode 100644 index 00000000..9b74b496 --- /dev/null +++ b/tests/baselines/Issue36.baseline.txt @@ -0,0 +1,76 @@ +original file +----------------------------------- +let x = { + hello() { + let hello = "world"; + } +}; +----------------------------------- + +>let x = { + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts +> hello() { + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts +> let hello = "world"; + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts +>}; + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/cases/Issue163.ts b/tests/cases/Issue163.ts new file mode 100644 index 00000000..470936a7 --- /dev/null +++ b/tests/cases/Issue163.ts @@ -0,0 +1,5 @@ +const o = { + async f() { + + } +}; \ No newline at end of file diff --git a/tests/cases/Issue36.ts b/tests/cases/Issue36.ts new file mode 100644 index 00000000..4823147b --- /dev/null +++ b/tests/cases/Issue36.ts @@ -0,0 +1,5 @@ +let x = { + hello() { + let hello = "world"; + } +}; \ No newline at end of file From d0d1952bf26ba3b0f98a0d148aed5fd144d282ba Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 25 Aug 2016 11:41:39 -0700 Subject: [PATCH 35/77] Support decorators --- TypeScript.YAML-tmLanguage | 12 + TypeScript.tmLanguage | 36 +++ TypeScriptReact.YAML-tmLanguage | 12 + TypeScriptReact.tmLanguage | 36 +++ tests/baselines/Issue143.baseline.txt | 310 ++++++++++++++++++++++++++ tests/baselines/Issue148.baseline.txt | 154 +++++++++++++ tests/baselines/Issue217.baseline.txt | 186 ++++++++++++++++ tests/baselines/Issue235.baseline.txt | 102 +++++++++ tests/cases/Issue143.ts | 17 ++ tests/cases/Issue148.ts | 8 + tests/cases/Issue217.ts | 9 + tests/cases/Issue235.ts | 6 + 12 files changed, 888 insertions(+) create mode 100644 tests/baselines/Issue143.baseline.txt create mode 100644 tests/baselines/Issue148.baseline.txt create mode 100644 tests/baselines/Issue217.baseline.txt create mode 100644 tests/baselines/Issue235.baseline.txt create mode 100644 tests/cases/Issue143.ts create mode 100644 tests/cases/Issue148.ts create mode 100644 tests/cases/Issue217.ts create mode 100644 tests/cases/Issue235.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index d74ee125..ae169709 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -201,6 +201,7 @@ repository: declaration: name: meta.declaration.ts patterns: + - include: '#decorator' - include: '#var-expr' - include: '#function-declaration' - include: '#class-or-interface-declaration' @@ -211,6 +212,15 @@ repository: - include: '#import-declaration' - include: '#export-declaration' + decorator: + name: meta.decorator.ts + begin: \@ + beginCaptures: + '0': { name: punctuation.decorator.ts } + end: (?=\s) + patterns: + - include: '#expression' + type-declaration: name: meta.type.declaration.ts begin: (?:(\bexport)\s+)?\b(type)\b\s+([a-zA-Z_$][\w$]*)\s* @@ -416,6 +426,7 @@ repository: patterns: - include: "#string" - include: '#comment' + - include: '#decorator' - include: '#field-declaration' - include: '#method-declaration' - include: '#indexer-declaration' @@ -704,6 +715,7 @@ repository: '0': { name: punctuation.definition.parameters.end.ts } patterns: - include: '#comment' + - include: '#decorator' - include: '#destructuring-parameter' - include: '#parameter-name' - include: '#type-annotation' diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 1ae0a293..23c17d0b 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -288,6 +288,10 @@ include #comment + + include + #decorator + include #field-declaration @@ -629,6 +633,10 @@ meta.declaration.ts patterns + + include + #decorator + include #var-expr @@ -667,6 +675,30 @@ + decorator + + begin + \@ + beginCaptures + + 0 + + name + punctuation.decorator.ts + + + end + (?=\s) + name + meta.decorator.ts + patterns + + + include + #expression + + + destructuring-parameter patterns @@ -1393,6 +1425,10 @@ include #comment + + include + #decorator + include #destructuring-parameter diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index e1980f59..eac74b3d 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -205,6 +205,7 @@ repository: declaration: name: meta.declaration.tsx patterns: + - include: '#decorator' - include: '#var-expr' - include: '#function-declaration' - include: '#class-or-interface-declaration' @@ -215,6 +216,15 @@ repository: - include: '#import-declaration' - include: '#export-declaration' + decorator: + name: meta.decorator.tsx + begin: \@ + beginCaptures: + '0': { name: punctuation.decorator.tsx } + end: (?=\s) + patterns: + - include: '#expression' + type-declaration: name: meta.type.declaration.tsx begin: (?:(\bexport)\s+)?\b(type)\b\s+([a-zA-Z_$][\w$]*)\s* @@ -420,6 +430,7 @@ repository: patterns: - include: "#string" - include: '#comment' + - include: '#decorator' - include: '#field-declaration' - include: '#method-declaration' - include: '#indexer-declaration' @@ -708,6 +719,7 @@ repository: '0': { name: punctuation.definition.parameters.end.tsx } patterns: - include: '#comment' + - include: '#decorator' - include: '#destructuring-parameter' - include: '#parameter-name' - include: '#type-annotation' diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index eaef4fa0..994a6e70 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -256,6 +256,10 @@ include #comment + + include + #decorator + include #field-declaration @@ -597,6 +601,10 @@ meta.declaration.tsx patterns + + include + #decorator + include #var-expr @@ -635,6 +643,30 @@ + decorator + + begin + \@ + beginCaptures + + 0 + + name + punctuation.decorator.tsx + + + end + (?=\s) + name + meta.decorator.tsx + patterns + + + include + #expression + + + destructuring-parameter patterns @@ -1361,6 +1393,10 @@ include #comment + + include + #decorator + include #destructuring-parameter diff --git a/tests/baselines/Issue143.baseline.txt b/tests/baselines/Issue143.baseline.txt new file mode 100644 index 00000000..7d2a9a20 --- /dev/null +++ b/tests/baselines/Issue143.baseline.txt @@ -0,0 +1,310 @@ +original file +----------------------------------- +import {Component, HostListener, Directive} from 'angular2/core'; + +@Directive({selector: 'button[counting]'}) +class CountClicks { + numberOfClicks = 0; + @HostListener('click', ['$event.target']) onClick(btn) { + console.log("button", btn, "number of clicks:", this.numberOfClicks++); + } +} +@Component({ + selector: 'my-app', + template: ``, + directives: [CountClicks] +}) +export class AppComponent { + constructor() { console.clear(); } +} +----------------------------------- + +>import {Component, HostListener, Directive} from 'angular2/core'; + ^^^^^^ + source.ts meta.import.ts keyword.control.import.ts + ^ + source.ts meta.import.ts + ^ + source.ts meta.import.ts meta.block.ts punctuation.definition.block.ts + ^^^^^^^^^ + source.ts meta.import.ts meta.block.ts variable.other.readwrite.alias.ts + ^ + source.ts meta.import.ts meta.block.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.import.ts meta.block.ts + ^^^^^^^^^^^^ + source.ts meta.import.ts meta.block.ts variable.other.readwrite.alias.ts + ^ + source.ts meta.import.ts meta.block.ts meta.delimiter.object.comma.ts + ^ + source.ts meta.import.ts meta.block.ts + ^^^^^^^^^ + source.ts meta.import.ts meta.block.ts variable.other.readwrite.alias.ts + ^ + source.ts meta.import.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.import.ts + ^^^^ + source.ts meta.import.ts keyword.control.from.ts + ^ + source.ts meta.import.ts + ^ + source.ts meta.import.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^^^^^^^^^ + source.ts meta.import.ts string.quoted.single.ts + ^ + source.ts meta.import.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^^^ + source.ts +> + ^^ + source.ts +>@Directive({selector: 'button[counting]'}) + ^ + source.ts meta.decorator.ts punctuation.decorator.ts + ^^^^^^^^^ + source.ts meta.decorator.ts + ^ + source.ts meta.decorator.ts meta.brace.round.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts punctuation.definition.block.ts + ^^^^^^^^^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^^^^^^^^^^^^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts string.quoted.single.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts punctuation.definition.block.ts + ^ + source.ts meta.decorator.ts meta.brace.round.ts + ^^ + source.ts +>class CountClicks { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> numberOfClicks = 0; + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts constant.numeric.decimal.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> @HostListener('click', ['$event.target']) onClick(btn) { + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts punctuation.decorator.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts string.quoted.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts meta.array.literal.ts string.quoted.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> console.log("button", btn, "number of clicks:", this.numberOfClicks++); + ^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts + ^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.increment.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts +>@Component({ + ^ + source.ts meta.decorator.ts punctuation.decorator.ts + ^^^^^^^^^ + source.ts meta.decorator.ts + ^ + source.ts meta.decorator.ts meta.brace.round.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts punctuation.definition.block.ts + ^^ + source.ts meta.decorator.ts meta.object-literal.ts +> selector: 'my-app', + ^^ + source.ts meta.decorator.ts meta.object-literal.ts + ^^^^^^^^^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts string.quoted.single.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^^^ + source.ts meta.decorator.ts meta.object-literal.ts +> template: ``, + ^^ + source.ts meta.decorator.ts meta.object-literal.ts + ^^^^^^^^^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts string.template.ts punctuation.definition.string.template.begin.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts string.template.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts string.template.ts punctuation.definition.string.template.end.ts + ^^^ + source.ts meta.decorator.ts meta.object-literal.ts +> directives: [CountClicks] + ^^ + source.ts meta.decorator.ts meta.object-literal.ts + ^^^^^^^^^^^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.brace.square.ts + ^^^^^^^^^^^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts + ^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.array.literal.ts meta.brace.square.ts + ^^ + source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts +>}) + ^ + source.ts meta.decorator.ts meta.object-literal.ts punctuation.definition.block.ts + ^ + source.ts meta.decorator.ts meta.brace.round.ts + ^^ + source.ts +>export class AppComponent { + ^^^^^^ + source.ts meta.declaration.object.ts keyword.control.export.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> constructor() { console.clear(); } + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue148.baseline.txt b/tests/baselines/Issue148.baseline.txt new file mode 100644 index 00000000..e6c614d0 --- /dev/null +++ b/tests/baselines/Issue148.baseline.txt @@ -0,0 +1,154 @@ +original file +----------------------------------- +class Test { + constructor( + @inject private test: string, + @inject("test") private test2: string, + @inject("test") test3: string, + public test4: string + ) { } +} +----------------------------------- + +>class Test { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> constructor( + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts +> @inject private test: string, + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts punctuation.decorator.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts +> @inject("test") private test2: string, + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts punctuation.decorator.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts string.quoted.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts +> @inject("test") test3: string, + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts punctuation.decorator.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts string.quoted.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts +> public test4: string + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts +> ) { } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue217.baseline.txt b/tests/baselines/Issue217.baseline.txt new file mode 100644 index 00000000..945191ce --- /dev/null +++ b/tests/baselines/Issue217.baseline.txt @@ -0,0 +1,186 @@ +original file +----------------------------------- +export class StatusSelector { + @Output() select = new EventEmitter() + statuses = ["started", "completed"] +} + +export class StatusSelector2 { + @Output() select = new EventEmitter(); + statuses = ["started", "completed"] +} +----------------------------------- + +>export class StatusSelector { + ^^^^^^ + source.ts meta.declaration.object.ts keyword.control.export.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> @Output() select = new EventEmitter() + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts punctuation.decorator.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts keyword.operator.new.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts +> statuses = ["started", "completed"] + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>export class StatusSelector2 { + ^^^^^^ + source.ts meta.declaration.object.ts keyword.control.export.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> @Output() select = new EventEmitter(); + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts punctuation.decorator.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts keyword.operator.new.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> statuses = ["started", "completed"] + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue235.baseline.txt b/tests/baselines/Issue235.baseline.txt new file mode 100644 index 00000000..96b156e8 --- /dev/null +++ b/tests/baselines/Issue235.baseline.txt @@ -0,0 +1,102 @@ +original file +----------------------------------- +class A { + @Route.GET('/*') + get(q: Request, s: Response): void { + s.sendFile(); + } +} +----------------------------------- + +>class A { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> @Route.GET('/*') + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts punctuation.decorator.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts string.quoted.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.decorator.ts meta.brace.round.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> get(q: Request, s: Response): void { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> s.sendFile(); + ^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/cases/Issue143.ts b/tests/cases/Issue143.ts new file mode 100644 index 00000000..fec7d800 --- /dev/null +++ b/tests/cases/Issue143.ts @@ -0,0 +1,17 @@ +import {Component, HostListener, Directive} from 'angular2/core'; + +@Directive({selector: 'button[counting]'}) +class CountClicks { + numberOfClicks = 0; + @HostListener('click', ['$event.target']) onClick(btn) { + console.log("button", btn, "number of clicks:", this.numberOfClicks++); + } +} +@Component({ + selector: 'my-app', + template: ``, + directives: [CountClicks] +}) +export class AppComponent { + constructor() { console.clear(); } +} \ No newline at end of file diff --git a/tests/cases/Issue148.ts b/tests/cases/Issue148.ts new file mode 100644 index 00000000..9498f9e2 --- /dev/null +++ b/tests/cases/Issue148.ts @@ -0,0 +1,8 @@ +class Test { + constructor( + @inject private test: string, + @inject("test") private test2: string, + @inject("test") test3: string, + public test4: string + ) { } +} \ No newline at end of file diff --git a/tests/cases/Issue217.ts b/tests/cases/Issue217.ts new file mode 100644 index 00000000..d2c5d78b --- /dev/null +++ b/tests/cases/Issue217.ts @@ -0,0 +1,9 @@ +export class StatusSelector { + @Output() select = new EventEmitter() + statuses = ["started", "completed"] +} + +export class StatusSelector2 { + @Output() select = new EventEmitter(); + statuses = ["started", "completed"] +} \ No newline at end of file diff --git a/tests/cases/Issue235.ts b/tests/cases/Issue235.ts new file mode 100644 index 00000000..94d1b5e0 --- /dev/null +++ b/tests/cases/Issue235.ts @@ -0,0 +1,6 @@ +class A { + @Route.GET('/*') + get(q: Request, s: Response): void { + s.sendFile(); + } +} \ No newline at end of file From dbcfb87aa7e903542bba22e1f209829c458dc4aa Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 26 Aug 2016 12:54:39 -0700 Subject: [PATCH 36/77] Computed property names --- TypeScript.YAML-tmLanguage | 18 ++- TypeScript.tmLanguage | 26 +++- tests/baselines/Issue10.baseline.txt | 182 ++++++++++++++++++++++++++ tests/baselines/Issue154.baseline.txt | 142 ++++++++++++++++++++ tests/baselines/Issue218.baseline.txt | 90 +++++++++++++ tests/baselines/Issue236.baseline.txt | 142 ++++++++++++++++++++ tests/cases/Issue10.ts | 16 +++ tests/cases/Issue154.ts | 11 ++ tests/cases/Issue218.ts | 6 + tests/cases/Issue236.ts | 13 ++ 10 files changed, 640 insertions(+), 6 deletions(-) create mode 100644 tests/baselines/Issue10.baseline.txt create mode 100644 tests/baselines/Issue154.baseline.txt create mode 100644 tests/baselines/Issue218.baseline.txt create mode 100644 tests/baselines/Issue236.baseline.txt create mode 100644 tests/cases/Issue10.ts create mode 100644 tests/cases/Issue154.ts create mode 100644 tests/cases/Issue218.ts create mode 100644 tests/cases/Issue236.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index ae169709..46da18ed 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -469,7 +469,7 @@ repository: method-declaration: name: meta.method.declaration.ts - begin: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)' + begin: (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\bnew)|(?:\b(constructor)\b)|(?:((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*(?=\(|\<) beginCaptures: '1': { name: storage.modifier.ts } # captures keyword (abstract) '2': { name: storage.modifier.ts } # captures keyword (public or private or protected) @@ -477,7 +477,12 @@ repository: '4': { name: storage.type.property.ts } # captures keyword (get|set) '5': { name: keyword.operator.new.ts } # captures keyword (new) '6': { name: storage.type.ts } # captures keyword (constructor) - '7': { name: entity.name.function.ts } # captures method name ([a-zA-Z_$][\.\w$]*) + '7': + # captures method name ((?:[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\])) + name: entity.name.function.ts + patterns: + - include: '#string' + - include: '#array-literal' '8': { name: keyword.operator.optional.ts } # captures (\??) end: '(?=\}|;|,)|(?<=\})' patterns: @@ -490,7 +495,7 @@ repository: method-overload-declaration: name: meta.method.overload.declaration.ts - match: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)' + match: (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\bnew)|(?:\b(constructor)\b)|(?:((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*(?=\(|\<) captures: '1': { name: storage.modifier.ts } # captures keyword (abstract) '2': { name: storage.modifier.ts } # captures keyword (public or private or protected) @@ -498,7 +503,12 @@ repository: '4': { name: storage.type.property.ts } # captures keyword (get|set) '5': { name: keyword.operator.ts } # captures keyword (new) '6': { name: entity.name.function.constructor.ts } # captures keyword (constructor) - '7': { name: entity.name.function.ts } # captures method name ([a-zA-Z_$][\.\w$]*) + '7': + # captures method name ((?:[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\])) + name: entity.name.function.ts + patterns: + - include: '#string' + - include: '#array-literal' '8': { name: keyword.operator.optional.ts } # captures (\??) indexer-declaration: diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 23c17d0b..94309892 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -1842,7 +1842,7 @@ method-declaration begin - \b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<) + (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\bnew)|(?:\b(constructor)\b)|(?:((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*(?=\(|\<) beginCaptures 1 @@ -1879,6 +1879,17 @@ name entity.name.function.ts + patterns + + + include + #string + + + include + #array-literal + + 8 @@ -1956,6 +1967,17 @@ name entity.name.function.ts + patterns + + + include + #string + + + include + #array-literal + + 8 @@ -1964,7 +1986,7 @@ match - \b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<) + (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\bnew)|(?:\b(constructor)\b)|(?:((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*(?=\(|\<) name meta.method.overload.declaration.ts diff --git a/tests/baselines/Issue10.baseline.txt b/tests/baselines/Issue10.baseline.txt new file mode 100644 index 00000000..c9415ae9 --- /dev/null +++ b/tests/baselines/Issue10.baseline.txt @@ -0,0 +1,182 @@ +original file +----------------------------------- +enum Hello { + A, + B +} + +class World { + normal() { + let x = 5; + console.log("hello"); + } + + [Hello.A]() { + let x = 5; + console.log("hello"); + } +} +----------------------------------- + +>enum Hello { + ^^^^ + source.ts meta.enum.declaration.ts storage.type.enum.ts + ^ + source.ts meta.enum.declaration.ts + ^^^^^ + source.ts meta.enum.declaration.ts entity.name.type.enum.ts + ^ + source.ts + ^ + source.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.block.ts +> A, + ^^^^^^^^ + source.ts meta.block.ts +> B + ^^^^^^^ + source.ts meta.block.ts +>} + ^ + source.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>class World { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> normal() { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> let x = 5; + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> console.log("hello"); + ^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> [Hello.A]() { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> let x = 5; + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> console.log("hello"); + ^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue154.baseline.txt b/tests/baselines/Issue154.baseline.txt new file mode 100644 index 00000000..a3a6d2e0 --- /dev/null +++ b/tests/baselines/Issue154.baseline.txt @@ -0,0 +1,142 @@ +original file +----------------------------------- +class TestCase { + ['foo']() { + this.registerComponent('foo-bar'); + } +} + +class TestCase2 { + foo() { + this.registerComponent('foo-bar'); + } +} +----------------------------------- + +>class TestCase { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> ['foo']() { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts string.quoted.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> this.registerComponent('foo-bar'); + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts + ^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>class TestCase2 { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> foo() { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> this.registerComponent('foo-bar'); + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts + ^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue218.baseline.txt b/tests/baselines/Issue218.baseline.txt new file mode 100644 index 00000000..b99acc99 --- /dev/null +++ b/tests/baselines/Issue218.baseline.txt @@ -0,0 +1,90 @@ +original file +----------------------------------- +class A { + foo(a, b) { + } + [foo](a, b) { + } +} +----------------------------------- + +>class A { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> foo(a, b) { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> [foo](a, b) { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue236.baseline.txt b/tests/baselines/Issue236.baseline.txt new file mode 100644 index 00000000..16d81d35 --- /dev/null +++ b/tests/baselines/Issue236.baseline.txt @@ -0,0 +1,142 @@ +original file +----------------------------------- +class Test { + public before() { + // ... + } + + public [Symbol.iterator]() { + // ... + } + + public after() { + // ... + } +} +----------------------------------- + +>class Test { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public before() { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> // ... + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.whitespace.comment.leading.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts comment.line.double-slash.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public [Symbol.iterator]() { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + ^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> // ... + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.whitespace.comment.leading.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts comment.line.double-slash.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public after() { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> // ... + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.whitespace.comment.leading.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts comment.line.double-slash.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/cases/Issue10.ts b/tests/cases/Issue10.ts new file mode 100644 index 00000000..21fd3def --- /dev/null +++ b/tests/cases/Issue10.ts @@ -0,0 +1,16 @@ +enum Hello { + A, + B +} + +class World { + normal() { + let x = 5; + console.log("hello"); + } + + [Hello.A]() { + let x = 5; + console.log("hello"); + } +} \ No newline at end of file diff --git a/tests/cases/Issue154.ts b/tests/cases/Issue154.ts new file mode 100644 index 00000000..dbac3dd2 --- /dev/null +++ b/tests/cases/Issue154.ts @@ -0,0 +1,11 @@ +class TestCase { + ['foo']() { + this.registerComponent('foo-bar'); + } +} + +class TestCase2 { + foo() { + this.registerComponent('foo-bar'); + } +} \ No newline at end of file diff --git a/tests/cases/Issue218.ts b/tests/cases/Issue218.ts new file mode 100644 index 00000000..4c04cbfc --- /dev/null +++ b/tests/cases/Issue218.ts @@ -0,0 +1,6 @@ +class A { + foo(a, b) { + } + [foo](a, b) { + } +} \ No newline at end of file diff --git a/tests/cases/Issue236.ts b/tests/cases/Issue236.ts new file mode 100644 index 00000000..ecd06aa6 --- /dev/null +++ b/tests/cases/Issue236.ts @@ -0,0 +1,13 @@ +class Test { + public before() { + // ... + } + + public [Symbol.iterator]() { + // ... + } + + public after() { + // ... + } +} \ No newline at end of file From b0208af1a59d49dd85d37bec450e47d744bd2e22 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 26 Aug 2016 15:38:13 -0700 Subject: [PATCH 37/77] Because sublime doesnt understand patterns in the capture, re-implement computed method names --- TypeScript.YAML-tmLanguage | 43 ++++----- TypeScript.tmLanguage | 121 ++++++++++++-------------- TypeScriptReact.YAML-tmLanguage | 33 ++++--- TypeScriptReact.tmLanguage | 99 ++++++++++++--------- tests/baselines/Issue10.baseline.txt | 6 +- tests/baselines/Issue154.baseline.txt | 10 +-- tests/baselines/Issue218.baseline.txt | 6 +- tests/baselines/Issue236.baseline.txt | 6 +- 8 files changed, 172 insertions(+), 152 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 46da18ed..4f46fe13 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -469,23 +469,15 @@ repository: method-declaration: name: meta.method.declaration.ts - begin: (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\bnew)|(?:\b(constructor)\b)|(?:((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*(?=\(|\<) + begin: (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) beginCaptures: '1': { name: storage.modifier.ts } # captures keyword (abstract) '2': { name: storage.modifier.ts } # captures keyword (public or private or protected) '3': { name: storage.modifier.async.ts } # captures keyword (async) '4': { name: storage.type.property.ts } # captures keyword (get|set) - '5': { name: keyword.operator.new.ts } # captures keyword (new) - '6': { name: storage.type.ts } # captures keyword (constructor) - '7': - # captures method name ((?:[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\])) - name: entity.name.function.ts - patterns: - - include: '#string' - - include: '#array-literal' - '8': { name: keyword.operator.optional.ts } # captures (\??) end: '(?=\}|;|,)|(?<=\})' patterns: + - include: '#method-declaration-name' - include: '#comment' - include: '#type-parameters' - include: '#function-type-parameters' @@ -495,22 +487,31 @@ repository: method-overload-declaration: name: meta.method.overload.declaration.ts - match: (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\bnew)|(?:\b(constructor)\b)|(?:((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*(?=\(|\<) - captures: + begin: (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) + beginCaptures: '1': { name: storage.modifier.ts } # captures keyword (abstract) '2': { name: storage.modifier.ts } # captures keyword (public or private or protected) '3': { name: storage.modifier.ts } # captures keyword (async) '4': { name: storage.type.property.ts } # captures keyword (get|set) - '5': { name: keyword.operator.ts } # captures keyword (new) - '6': { name: entity.name.function.constructor.ts } # captures keyword (constructor) - '7': - # captures method name ((?:[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\])) - name: entity.name.function.ts - patterns: - - include: '#string' - - include: '#array-literal' - '8': { name: keyword.operator.optional.ts } # captures (\??) + end: (?=\(|\<) + patterns: + - include: '#method-declaration-name' + method-declaration-name: + begin: \G + end: (?=\(|\<) + patterns: + - include: '#string' + - include: '#array-literal' + - name: keyword.operator.new.ts + match: \bnew(?=\s*[\(\<]) + - name: storage.type.ts + match: \bconstructor\b(?=\s*[\(\<]) + - name: entity.name.function.ts + match: \b[a-zA-Z_$][\.\w$]* + - name: keyword.operator.optional.ts + match: \? + indexer-declaration: name: meta.indexer.declaration.ts begin: \[ diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 94309892..2575e572 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -1842,7 +1842,7 @@ method-declaration begin - (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\bnew)|(?:\b(constructor)\b)|(?:((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*(?=\(|\<) + (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) beginCaptures 1 @@ -1865,37 +1865,6 @@ name storage.type.property.ts - 5 - - name - keyword.operator.new.ts - - 6 - - name - storage.type.ts - - 7 - - name - entity.name.function.ts - patterns - - - include - #string - - - include - #array-literal - - - - 8 - - name - keyword.operator.optional.ts - end (?=\}|;|,)|(?<=\}) @@ -1903,6 +1872,10 @@ meta.method.declaration.ts patterns + + include + #method-declaration-name + include #comment @@ -1929,66 +1902,86 @@ - method-overload-declaration + method-declaration-name - captures - - 1 + begin + \G + end + (?=\(|\<) + patterns + + + include + #string + + + include + #array-literal + + match + \bnew(?=\s*[\(\<]) name - storage.modifier.ts + keyword.operator.new.ts - 2 + match + \bconstructor\b(?=\s*[\(\<]) name - storage.modifier.ts + storage.type.ts - 3 + match + \b[a-zA-Z_$][\.\w$]* name - storage.modifier.ts + entity.name.function.ts - 4 + match + \? name - storage.type.property.ts + keyword.operator.optional.ts - 5 + + + method-overload-declaration + + begin + (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) + beginCaptures + + 1 name - keyword.operator.ts + storage.modifier.ts - 6 + 2 name - entity.name.function.constructor.ts + storage.modifier.ts - 7 + 3 name - entity.name.function.ts - patterns - - - include - #string - - - include - #array-literal - - + storage.modifier.ts - 8 + 4 name - keyword.operator.optional.ts + storage.type.property.ts - match - (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\bnew)|(?:\b(constructor)\b)|(?:((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*(?=\(|\<) + end + (?=\(|\<) name meta.method.overload.declaration.ts + patterns + + + include + #method-declaration-name + + namespace-declaration diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index eac74b3d..4f091620 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -473,18 +473,15 @@ repository: method-declaration: name: meta.method.declaration.tsx - begin: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)' + begin: (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) beginCaptures: '1': { name: storage.modifier.tsx } # captures keyword (abstract) '2': { name: storage.modifier.tsx } # captures keyword (public or private or protected) '3': { name: storage.modifier.async.tsx } # captures keyword (async) '4': { name: storage.type.property.tsx } # captures keyword (get|set) - '5': { name: keyword.operator.new.tsx } # captures keyword (new) - '6': { name: storage.type.tsx } # captures keyword (constructor) - '7': { name: entity.name.function.tsx } # captures method name ([a-zA-Z_$][\.\w$]*) - '8': { name: keyword.operator.optional.tsx } # captures (\??) end: '(?=\}|;|,)|(?<=\})' patterns: + - include: '#method-declaration-name' - include: '#comment' - include: '#type-parameters' - include: '#function-type-parameters' @@ -494,17 +491,31 @@ repository: method-overload-declaration: name: meta.method.overload.declaration.tsx - match: '\b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<)' - captures: + begin: (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) + beginCaptures: '1': { name: storage.modifier.tsx } # captures keyword (abstract) '2': { name: storage.modifier.tsx } # captures keyword (public or private or protected) '3': { name: storage.modifier.tsx } # captures keyword (async) '4': { name: storage.type.property.tsx } # captures keyword (get|set) - '5': { name: keyword.operator.tsx } # captures keyword (new) - '6': { name: entity.name.function.constructor.tsx } # captures keyword (constructor) - '7': { name: entity.name.function.tsx } # captures method name ([a-zA-Z_$][\.\w$]*) - '8': { name: keyword.operator.optional.tsx } # captures (\??) + end: (?=\(|\<) + patterns: + - include: '#method-declaration-name' + method-declaration-name: + begin: \G + end: (?=\(|\<) + patterns: + - include: '#string' + - include: '#array-literal' + - name: keyword.operator.new.tsx + match: \bnew(?=\s*[\(\<]) + - name: storage.type.tsx + match: \bconstructor\b(?=\s*[\(\<]) + - name: entity.name.function.tsx + match: \b[a-zA-Z_$][\.\w$]* + - name: keyword.operator.optional.tsx + match: \? + indexer-declaration: name: meta.indexer.declaration.tsx begin: \[ diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index 994a6e70..f123c6a3 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -2239,7 +2239,7 @@ method-declaration begin - \b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<) + (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) beginCaptures 1 @@ -2262,26 +2262,6 @@ name storage.type.property.tsx - 5 - - name - keyword.operator.new.tsx - - 6 - - name - storage.type.tsx - - 7 - - name - entity.name.function.tsx - - 8 - - name - keyword.operator.optional.tsx - end (?=\}|;|,)|(?<=\}) @@ -2289,6 +2269,10 @@ meta.method.declaration.tsx patterns + + include + #method-declaration-name + include #comment @@ -2315,55 +2299,86 @@ - method-overload-declaration + method-declaration-name - captures - - 1 + begin + \G + end + (?=\(|\<) + patterns + + include + #string + + + include + #array-literal + + + match + \bnew(?=\s*[\(\<]) name - storage.modifier.tsx + keyword.operator.new.tsx - 2 + match + \bconstructor\b(?=\s*[\(\<]) name - storage.modifier.tsx + storage.type.tsx - 3 + match + \b[a-zA-Z_$][\.\w$]* name - storage.modifier.tsx + entity.name.function.tsx - 4 + match + \? name - storage.type.property.tsx + keyword.operator.optional.tsx - 5 + + + method-overload-declaration + + begin + (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) + beginCaptures + + 1 name - keyword.operator.tsx + storage.modifier.tsx - 6 + 2 name - entity.name.function.constructor.tsx + storage.modifier.tsx - 7 + 3 name - entity.name.function.tsx + storage.modifier.tsx - 8 + 4 name - keyword.operator.optional.tsx + storage.type.property.tsx - match - \b(?:(abstract)\s+)?\b(?:(public|private|protected)\s+)?\b(?:(async)\s+)?(?:(get|set)\s+)?(?:(new)|(?:\b(constructor)\b)|(?:([a-zA-Z_$][\.\w$]*)\s*(\??)))?\s*(?=\(|\<) + end + (?=\(|\<) name meta.method.overload.declaration.tsx + patterns + + + include + #method-declaration-name + + namespace-declaration diff --git a/tests/baselines/Issue10.baseline.txt b/tests/baselines/Issue10.baseline.txt index c9415ae9..2880a213 100644 --- a/tests/baselines/Issue10.baseline.txt +++ b/tests/baselines/Issue10.baseline.txt @@ -121,11 +121,11 @@ class World { ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ diff --git a/tests/baselines/Issue154.baseline.txt b/tests/baselines/Issue154.baseline.txt index a3a6d2e0..a5587d6a 100644 --- a/tests/baselines/Issue154.baseline.txt +++ b/tests/baselines/Issue154.baseline.txt @@ -30,15 +30,15 @@ class TestCase2 { ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts string.quoted.single.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts string.quoted.single.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ diff --git a/tests/baselines/Issue218.baseline.txt b/tests/baselines/Issue218.baseline.txt index b99acc99..e1e911cd 100644 --- a/tests/baselines/Issue218.baseline.txt +++ b/tests/baselines/Issue218.baseline.txt @@ -55,11 +55,11 @@ class A { ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ diff --git a/tests/baselines/Issue236.baseline.txt b/tests/baselines/Issue236.baseline.txt index 16d81d35..7b09daf5 100644 --- a/tests/baselines/Issue236.baseline.txt +++ b/tests/baselines/Issue236.baseline.txt @@ -72,11 +72,11 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts ^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts meta.array.literal.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts ^ From a5de0048a210f071aa86fba5d8e4079f6c11802a Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 26 Aug 2016 15:38:13 -0700 Subject: [PATCH 38/77] Fix the identifier pattern --- TypeScript.YAML-tmLanguage | 81 +++++++------- TypeScript.tmLanguage | 100 +++++++++++------- TypeScriptReact.YAML-tmLanguage | 79 +++++++------- TypeScriptReact.tmLanguage | 98 ++++++++++------- tests/baselines/Issue193.baseline.txt | 76 +++++++++++++ tests/baselines/pr48_noSemiColon.baseline.txt | 8 +- tests/cases/Issue193.ts | 7 ++ 7 files changed, 295 insertions(+), 154 deletions(-) create mode 100644 tests/baselines/Issue193.baseline.txt create mode 100644 tests/cases/Issue193.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 4f46fe13..b293eced 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -40,7 +40,7 @@ repository: var-single-variable: name: meta.var-single-variable.expr.ts - begin: \b([a-zA-Z_$][\w$]*)\b + begin: \b([_$[:alpha:]][_$[:alnum:]]*)\b beginCaptures: '1': { name: variable.other.readwrite.ts } end: (?=$|[;,]) @@ -95,7 +95,7 @@ repository: object-binding-element: patterns: - include: '#comment' - - begin: \b([a-zA-Z_$][\w$]*)\s*(:) + - begin: \b([_$[:alpha:]][_$[:alnum:]]*)\s*(:) beginCaptures: '1': { name: variable.object.property.ts } '2': { name: punctuation.destructuring.ts } @@ -104,9 +104,9 @@ repository: - include: '#object-binding-pattern' - include: '#array-binding-pattern' - name: variable.other.readwrite.ts - match: \b([a-zA-Z_$][\w$]*)\b + match: \b([_$[:alpha:]][_$[:alnum:]]*)\b - name: variable.other.readwrite.ts - match: \b([a-zA-Z_$][\w$]*)\b + match: \b([_$[:alpha:]][_$[:alnum:]]*)\b - name: meta.delimiter.object.comma.ts match: ',' @@ -116,7 +116,7 @@ repository: - include: '#object-binding-pattern' - include: '#array-binding-pattern' - name: variable.other.readwrite.ts - match: \b([a-zA-Z_$][\w$]*)\b + match: \b([_$[:alpha:]][_$[:alnum:]]*)\b - name: meta.delimiter.object.comma.ts match: ',' @@ -223,7 +223,7 @@ repository: type-declaration: name: meta.type.declaration.ts - begin: (?:(\bexport)\s+)?\b(type)\b\s+([a-zA-Z_$][\w$]*)\s* + begin: (?:(\bexport)\s+)?\b(type)\b\s+([_$[:alpha:]][_$[:alnum:]]*)\s* beginCaptures: '1': { name: keyword.control.export.ts } '2': { name: storage.type.type.ts } @@ -238,7 +238,7 @@ repository: enum-declaration: name: meta.enum.declaration.ts - match: (?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) + match: (?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([_$[:alpha:]][_$[:alnum:]]*) captures: '1': { name: keyword.control.export.ts } '2': { name: storage.modifier.ts} @@ -256,14 +256,14 @@ repository: - include: '#comment' - include: '#string' - name: entity.name.type.module.ts - match: \b([a-zA-Z_$][\w$]*)\b + match: \b([_$[:alpha:]][_$[:alnum:]]*)\b - name: punctuation.accessor.ts match: \. import-equals-declaration: patterns: - name: meta.import-equals.external.ts - begin: (?:(\bexport)\s+)?\b(?])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{) + end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[_$[:alpha:]])\s*(?=\{) patterns: - include: '#expression-operator' - include: '#type' @@ -790,12 +790,17 @@ repository: - include: '#comment' type-name: - name: entity.name.type.ts - match: '[a-zA-Z_$][.\w$]*' + patterns: + - match: \b([_$[:alpha:]][_$[:alnum:]]*)\s*(\.) + captures: + '1': { name: entity.name.type.module.ts } + '2': { name: punctuation.accessor.ts } + - name: entity.name.type.ts + match: '[_$[:alpha:]][_$[:alnum:]]*' type-parameters: name: meta.type.parameters.ts - begin: '([a-zA-Z_$][\w$]*)?(<)' + begin: '([_$[:alpha:]][_$[:alnum:]]*)?(<)' beginCaptures: '1': { name: entity.name.type.ts } '2': { name: punctuation.definition.typeparameters.begin.ts } @@ -871,7 +876,7 @@ repository: for-in-simple: name: forin.expr.ts - match: (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(?:(in)|(of))\b + match: (?<=\()\s*\b(var|let|const)\s+([_$[:alpha:]][_$[:alnum:]]*)\s+(?:(in)|(of))\b captures: '1': { name: storage.type.ts } '2': { name: variable.other.readwrite.ts } @@ -915,7 +920,7 @@ repository: - include: '#comment' - include: '#method-declaration' - name: meta.object.member.ts - begin: '[a-zA-Z_$][\w$]*\s*:' + begin: '[_$[:alpha:]][_$[:alnum:]]*\s*:' end: (?=,|\}) patterns: - include: '#expression' @@ -1087,7 +1092,7 @@ repository: template: name: string.template.ts - begin: '(?:\b([a-zA-Z_$][a-zA-Z_$0-9]*)\b)?(`)' + begin: '(?:\b([_$[:alpha:]][_$[:alnum:]]*)\b)?(`)' beginCaptures: '1': { name: entity.name.function.tagged-template.ts } '2': { name: punctuation.definition.string.template.begin.ts } @@ -1142,7 +1147,7 @@ repository: patterns: - name: storage.type.class.jsdoc match: (? match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.other.readwrite.ts @@ -444,7 +444,7 @@ match - (?:\b([a-zA-Z_$][\w$]*)\b) + (?:\b([_$[:alpha:]][_$[:alnum:]]*)\b) name meta.object.heritage.parent.ts @@ -459,7 +459,7 @@ match - [a-zA-Z_$][\w$]* + [_$[:alpha:]][_$[:alnum:]]* name meta.object.name.ts @@ -930,7 +930,7 @@ match - ({\b(?:[a-zA-Z_$][a-zA-Z_$0-9]*)\b})\s\b([a-zA-Z_$][a-zA-Z_$0-9]*)\b\s*((?:(?!\*\/).)*) + ({\b(?:[_$[:alpha:]][_$[:alnum:]]*)\b})\s\b([_$[:alpha:]][_$[:alnum:]]*)\b\s*((?:(?!\*\/).)*) @@ -960,7 +960,7 @@ match - (?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) + (?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([_$[:alpha:]][_$[:alnum:]]*) name meta.enum.declaration.ts @@ -993,7 +993,7 @@ match - \b(?<!\.)(export)\s+(as)\s+(namespace)\s+([a-zA-Z_$][\w$]*) + \b(?<!\.)(export)\s+(as)\s+(namespace)\s+([_$[:alpha:]][_$[:alnum:]]*) begin @@ -1192,7 +1192,7 @@ field-declaration begin - (?<!\()\s*((?:\b[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:)) + (?<!\()\s*((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:)) beginCaptures 1 @@ -1252,7 +1252,7 @@ match - (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(?:(in)|(of))\b + (?<=\()\s*\b(var|let|const)\s+([_$[:alpha:]][_$[:alnum:]]*)\s+(?:(in)|(of))\b name forin.expr.ts @@ -1314,7 +1314,7 @@ function-declaration begin - \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s* + \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s+([_$[:alpha:]][_$[:alnum:]]*))?\s* beginCaptures 1 @@ -1391,7 +1391,7 @@ match - \b(?:(export)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s* + \b(?:(export)\s+)?(function\b)(?:\s+([_$[:alpha:]][_$[:alnum:]]*))?\s* name meta.function.overload.ts @@ -1489,7 +1489,7 @@ begin - (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([a-zA-Z_$][\w$]*)\s*(=)\s*(require)\s*(\() + (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)\s*(require)\s*(\() beginCaptures 1 @@ -1549,7 +1549,7 @@ begin - (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([a-zA-Z_$][\w$]*)\s*(=)\s*(?!require\b) + (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)\s*(?!require\b) beginCaptures 1 @@ -1598,11 +1598,11 @@ match - \b([a-zA-Z_$][\w$]*)\s*(\.) + \b([_$[:alpha:]][_$[:alnum:]]*)\s*(\.) match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.other.readwrite.ts @@ -1687,7 +1687,7 @@ comment (default|*|name) as alias match - (?x) (?: \b(default)\b | (\*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) \s* (\b as \b) \s* (?: (\b default \b | \*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) + (?x) (?: \b(default)\b | (\*) | \b([_$[:alpha:]][_$[:alnum:]]*)\b) \s* (\b as \b) \s* (?: (\b default \b | \*) | \b([_$[:alpha:]][_$[:alnum:]]*)\b) match @@ -1709,7 +1709,7 @@ match - \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.other.readwrite.alias.ts @@ -1795,7 +1795,7 @@ match - ([a-zA-Z_$][\w$]*)(?=\:) + ([_$[:alpha:]][_$[:alnum:]]*)(?=\:) name meta.indexer.parameter.ts @@ -1842,7 +1842,7 @@ method-declaration begin - (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) + (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) beginCaptures 1 @@ -1932,7 +1932,7 @@ match - \b[a-zA-Z_$][\.\w$]* + \b[_$[:alpha:]][_$[:alnum:]]* name entity.name.function.ts @@ -1947,7 +1947,7 @@ method-overload-declaration begin - (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) + (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) beginCaptures 1 @@ -2016,7 +2016,7 @@ match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name entity.name.type.module.ts @@ -2167,7 +2167,7 @@ begin - \b([a-zA-Z_$][\w$]*)\s*(:) + \b([_$[:alpha:]][_$[:alnum:]]*)\s*(:) beginCaptures 1 @@ -2195,7 +2195,7 @@ match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.other.readwrite.ts @@ -2203,7 +2203,7 @@ match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.other.readwrite.ts @@ -2291,7 +2291,7 @@ begin - [a-zA-Z_$][\w$]*\s*: + [_$[:alpha:]][_$[:alnum:]]*\s*: end (?=,|\}) name @@ -2390,7 +2390,7 @@ match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.parameter.ts @@ -2458,7 +2458,7 @@ match - (?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*(?<!=|:)([a-zA-Z_$][\w$]*)\s*(\??) + (?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*(?<!=|:)([_$[:alpha:]][_$[:alnum:]]*)\s*(\??) parameter-object-binding-element @@ -2470,7 +2470,7 @@ begin - \b([a-zA-Z_$][\w$]*)\s*(:) + \b([_$[:alpha:]][_$[:alnum:]]*)\s*(:) beginCaptures 1 @@ -2498,7 +2498,7 @@ match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.parameter.ts @@ -2506,7 +2506,7 @@ match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.parameter.ts @@ -3155,7 +3155,7 @@ template begin - (?:\b([a-zA-Z_$][a-zA-Z_$0-9]*)\b)?(`) + (?:\b([_$[:alpha:]][_$[:alnum:]]*)\b)?(`) beginCaptures 1 @@ -3325,7 +3325,7 @@ begin : end - (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{) + (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[_$[:alpha:]])\s*(?=\{) name meta.type.annotation.ts patterns @@ -3351,7 +3351,7 @@ type-declaration begin - (?:(\bexport)\s+)?\b(type)\b\s+([a-zA-Z_$][\w$]*)\s* + (?:(\bexport)\s+)?\b(type)\b\s+([_$[:alpha:]][_$[:alnum:]]*)\s* beginCaptures 1 @@ -3453,10 +3453,32 @@ type-name - match - [a-zA-Z_$][.\w$]* - name - entity.name.type.ts + patterns + + + captures + + 1 + + name + entity.name.type.module.ts + + 2 + + name + punctuation.accessor.ts + + + match + \b([_$[:alpha:]][_$[:alnum:]]*)\s*(\.) + + + match + [_$[:alpha:]][_$[:alnum:]]* + name + entity.name.type.ts + + type-object @@ -3526,7 +3548,7 @@ type-parameters begin - ([a-zA-Z_$][\w$]*)?(<) + ([_$[:alpha:]][_$[:alnum:]]*)?(<) beginCaptures 1 @@ -3705,7 +3727,7 @@ var-single-variable begin - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b beginCaptures 1 diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 4f091620..668c286f 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -44,7 +44,7 @@ repository: var-single-variable: name: meta.var-single-variable.expr.tsx - begin: \b([a-zA-Z_$][\w$]*)\b + begin: \b([_$[:alpha:]][_$[:alnum:]]*)\b beginCaptures: '1': { name: variable.other.readwrite.tsx } end: (?=$|[;,]) @@ -99,7 +99,7 @@ repository: object-binding-element: patterns: - include: '#comment' - - begin: \b([a-zA-Z_$][\w$]*)\s*(:) + - begin: \b([_$[:alpha:]][_$[:alnum:]]*)\s*(:) beginCaptures: '1': { name: variable.object.property.tsx } '2': { name: punctuation.destructuring.tsx } @@ -108,9 +108,9 @@ repository: - include: '#object-binding-pattern' - include: '#array-binding-pattern' - name: variable.other.readwrite.tsx - match: \b([a-zA-Z_$][\w$]*)\b + match: \b([_$[:alpha:]][_$[:alnum:]]*)\b - name: variable.other.readwrite.tsx - match: \b([a-zA-Z_$][\w$]*)\b + match: \b([_$[:alpha:]][_$[:alnum:]]*)\b - name: meta.delimiter.object.comma.tsx match: ',' @@ -120,7 +120,7 @@ repository: - include: '#object-binding-pattern' - include: '#array-binding-pattern' - name: variable.other.readwrite.tsx - match: \b([a-zA-Z_$][\w$]*)\b + match: \b([_$[:alpha:]][_$[:alnum:]]*)\b - name: meta.delimiter.object.comma.tsx match: ',' @@ -227,7 +227,7 @@ repository: type-declaration: name: meta.type.declaration.tsx - begin: (?:(\bexport)\s+)?\b(type)\b\s+([a-zA-Z_$][\w$]*)\s* + begin: (?:(\bexport)\s+)?\b(type)\b\s+([_$[:alpha:]][_$[:alnum:]]*)\s* beginCaptures: '1': { name: keyword.control.export.tsx } '2': { name: storage.type.type.tsx } @@ -242,7 +242,7 @@ repository: enum-declaration: name: meta.enum.declaration.tsx - match: (?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) + match: (?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([_$[:alpha:]][_$[:alnum:]]*) captures: '1': { name: keyword.control.export.tsx } '2': { name: storage.modifier.tsx} @@ -260,14 +260,14 @@ repository: - include: '#comment' - include: '#string' - name: entity.name.type.module.tsx - match: \b([a-zA-Z_$][\w$]*)\b + match: \b([_$[:alpha:]][_$[:alnum:]]*)\b - name: punctuation.accessor.tsx match: \. import-equals-declaration: patterns: - name: meta.import-equals.external.tsx - begin: (?:(\bexport)\s+)?\b(? match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.other.readwrite.tsx @@ -412,7 +412,7 @@ match - (?:\b([a-zA-Z_$][\w$]*)\b) + (?:\b([_$[:alpha:]][_$[:alnum:]]*)\b) name meta.object.heritage.parent.tsx @@ -427,7 +427,7 @@ match - [a-zA-Z_$][\w$]* + [_$[:alpha:]][_$[:alnum:]]* name meta.object.name.tsx @@ -898,7 +898,7 @@ match - ({\b(?:[a-zA-Z_$][a-zA-Z_$0-9]*)\b})\s\b([a-zA-Z_$][a-zA-Z_$0-9]*)\b\s*((?:(?!\*\/).)*) + ({\b(?:[_$[:alpha:]][_$[:alnum:]]*)\b})\s\b([_$[:alpha:]][_$[:alnum:]]*)\b\s*((?:(?!\*\/).)*) @@ -928,7 +928,7 @@ match - (?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([a-zA-Z_$][\w$]*) + (?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([_$[:alpha:]][_$[:alnum:]]*) name meta.enum.declaration.tsx @@ -961,7 +961,7 @@ match - \b(?<!\.)(export)\s+(as)\s+(namespace)\s+([a-zA-Z_$][\w$]*) + \b(?<!\.)(export)\s+(as)\s+(namespace)\s+([_$[:alpha:]][_$[:alnum:]]*) begin @@ -1160,7 +1160,7 @@ field-declaration begin - (?<!\()\s*((?:\b[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:)) + (?<!\()\s*((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:)) beginCaptures 1 @@ -1220,7 +1220,7 @@ match - (?<=\()\s*\b(var|let|const)\s+([a-zA-Z_$][\w$]*)\s+(?:(in)|(of))\b + (?<=\()\s*\b(var|let|const)\s+([_$[:alpha:]][_$[:alnum:]]*)\s+(?:(in)|(of))\b name forin.expr.tsx @@ -1282,7 +1282,7 @@ function-declaration begin - \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s* + \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s+([_$[:alpha:]][_$[:alnum:]]*))?\s* beginCaptures 1 @@ -1359,7 +1359,7 @@ match - \b(?:(export)\s+)?(function\b)(?:\s+([a-zA-Z_$][\w$]*))?\s* + \b(?:(export)\s+)?(function\b)(?:\s+([_$[:alpha:]][_$[:alnum:]]*))?\s* name meta.function.overload.tsx @@ -1457,7 +1457,7 @@ begin - (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([a-zA-Z_$][\w$]*)\s*(=)\s*(require)\s*(\() + (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)\s*(require)\s*(\() beginCaptures 1 @@ -1517,7 +1517,7 @@ begin - (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([a-zA-Z_$][\w$]*)\s*(=)\s*(?!require\b) + (?:(\bexport)\s+)?\b(?<!\.)(import)\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)\s*(?!require\b) beginCaptures 1 @@ -1566,11 +1566,11 @@ match - \b([a-zA-Z_$][\w$]*)\s*(\.) + \b([_$[:alpha:]][_$[:alnum:]]*)\s*(\.) match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.other.readwrite.tsx @@ -1655,7 +1655,7 @@ comment (default|*|name) as alias match - (?x) (?: \b(default)\b | (\*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) \s* (\b as \b) \s* (?: (\b default \b | \*) | \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b) + (?x) (?: \b(default)\b | (\*) | \b([_$[:alpha:]][_$[:alnum:]]*)\b) \s* (\b as \b) \s* (?: (\b default \b | \*) | \b([_$[:alpha:]][_$[:alnum:]]*)\b) match @@ -1677,7 +1677,7 @@ match - \b([a-zA-Z_$][a-zA-Z_$0-9]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.other.readwrite.alias.tsx @@ -1763,7 +1763,7 @@ match - ([a-zA-Z_$][\w$]*)(?=\:) + ([_$[:alpha:]][_$[:alnum:]]*)(?=\:) name meta.indexer.parameter.tsx @@ -2239,7 +2239,7 @@ method-declaration begin - (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) + (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) beginCaptures 1 @@ -2329,7 +2329,7 @@ match - \b[a-zA-Z_$][\.\w$]* + \b[_$[:alpha:]][_$[:alnum:]]* name entity.name.function.tsx @@ -2344,7 +2344,7 @@ method-overload-declaration begin - (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[a-zA-Z_$][\.\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) + (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) beginCaptures 1 @@ -2413,7 +2413,7 @@ match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name entity.name.type.module.tsx @@ -2564,7 +2564,7 @@ begin - \b([a-zA-Z_$][\w$]*)\s*(:) + \b([_$[:alpha:]][_$[:alnum:]]*)\s*(:) beginCaptures 1 @@ -2592,7 +2592,7 @@ match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.other.readwrite.tsx @@ -2600,7 +2600,7 @@ match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.other.readwrite.tsx @@ -2688,7 +2688,7 @@ begin - [a-zA-Z_$][\w$]*\s*: + [_$[:alpha:]][_$[:alnum:]]*\s*: end (?=,|\}) name @@ -2787,7 +2787,7 @@ match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.parameter.tsx @@ -2855,7 +2855,7 @@ match - (?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*(?<!=|:)([a-zA-Z_$][\w$]*)\s*(\??) + (?:\s*\b(public|private|protected)\b\s+)?(\.\.\.)?\s*(?<!=|:)([_$[:alpha:]][_$[:alnum:]]*)\s*(\??) parameter-object-binding-element @@ -2867,7 +2867,7 @@ begin - \b([a-zA-Z_$][\w$]*)\s*(:) + \b([_$[:alpha:]][_$[:alnum:]]*)\s*(:) beginCaptures 1 @@ -2895,7 +2895,7 @@ match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.parameter.tsx @@ -2903,7 +2903,7 @@ match - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b name variable.parameter.tsx @@ -3556,7 +3556,7 @@ template begin - (?:\b([a-zA-Z_$][a-zA-Z_$0-9]*)\b)?(`) + (?:\b([_$[:alpha:]][_$[:alnum:]]*)\b)?(`) beginCaptures 1 @@ -3752,7 +3752,7 @@ type-declaration begin - (?:(\bexport)\s+)?\b(type)\b\s+([a-zA-Z_$][\w$]*)\s* + (?:(\bexport)\s+)?\b(type)\b\s+([_$[:alpha:]][_$[:alnum:]]*)\s* beginCaptures 1 @@ -3854,10 +3854,32 @@ type-name - match - [a-zA-Z_$][.\w$]* - name - entity.name.type.tsx + patterns + + + captures + + 1 + + name + entity.name.type.module.tsx + + 2 + + name + punctuation.accessor.tsx + + + match + \b([_$[:alpha:]][_$[:alnum:]]*)\s*(\.) + + + match + [_$[:alpha:]][_$[:alnum:]]* + name + entity.name.type.tsx + + type-object @@ -3927,7 +3949,7 @@ type-parameters begin - ([a-zA-Z_$][\w$]*)?(<) + ([_$[:alpha:]][_$[:alnum:]]*)?(<) beginCaptures 1 @@ -4106,7 +4128,7 @@ var-single-variable begin - \b([a-zA-Z_$][\w$]*)\b + \b([_$[:alpha:]][_$[:alnum:]]*)\b beginCaptures 1 diff --git a/tests/baselines/Issue193.baseline.txt b/tests/baselines/Issue193.baseline.txt new file mode 100644 index 00000000..5f7a4e58 --- /dev/null +++ b/tests/baselines/Issue193.baseline.txt @@ -0,0 +1,76 @@ +original file +----------------------------------- +function Main_Функция(s: string) +{ +} + +function Функция_Main(s: string) +{ +} +----------------------------------- + +>function Main_Функция(s: string) + ^ + source.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^^ + source.ts meta.function.ts +>{ + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>function Функция_Main(s: string) + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^^ + source.ts meta.function.ts +>{ + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index ed9fcb48..b5d00ba8 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -128,8 +128,12 @@ class Test { source.ts meta.type.declaration.ts ^^ source.ts meta.type.declaration.ts keyword.operator.assignment.ts - ^^^^^^^^ - source.ts meta.type.declaration.ts entity.name.type.ts + ^^ + source.ts meta.type.declaration.ts entity.name.type.module.ts + ^ + source.ts meta.type.declaration.ts punctuation.accessor.ts + ^^^^^ + source.ts meta.type.declaration.ts entity.name.type.ts >export const touch = thenify(tch) ^^^^^^ source.ts meta.var.expr.ts keyword.control.export.ts diff --git a/tests/cases/Issue193.ts b/tests/cases/Issue193.ts new file mode 100644 index 00000000..745455ea --- /dev/null +++ b/tests/cases/Issue193.ts @@ -0,0 +1,7 @@ +function Main_Функция(s: string) +{ +} + +function Функция_Main(s: string) +{ +} \ No newline at end of file From 037f4190344d5c50569741aa6b5d2eea1f5ab775 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 26 Aug 2016 15:38:13 -0700 Subject: [PATCH 39/77] Adding test for already fixed bug --- tests/baselines/Issue186.baseline.txt | 180 ++++++++++++++++++++++++++ tests/baselines/Issue193.baseline.txt | 52 +++++++- tests/cases/Issue186.ts | 10 ++ tests/cases/Issue193.ts | 5 +- 4 files changed, 245 insertions(+), 2 deletions(-) create mode 100644 tests/baselines/Issue186.baseline.txt create mode 100644 tests/cases/Issue186.ts diff --git a/tests/baselines/Issue186.baseline.txt b/tests/baselines/Issue186.baseline.txt new file mode 100644 index 00000000..e7c5d2dd --- /dev/null +++ b/tests/baselines/Issue186.baseline.txt @@ -0,0 +1,180 @@ +original file +----------------------------------- +function myFunction(param1, param2, number, string, boolean) { + let y = (number) => { + console.log(param1); + } + console.log(param1); + console.log(param1 + number); + console.log(string); + console.log(boolean); + let x = param1 ? 2 : param2; +} +----------------------------------- + +>function myFunction(param1, param2, number, string, boolean) { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts + ^^^^^^^ + source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts +> let y = (number) => { + ^^ + source.ts meta.function.ts meta.block.ts + ^^^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts storage.type.function.arrow.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts +> console.log(param1); + ^^^^^^^^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.round.ts + ^^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts +> } + ^^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts +> console.log(param1); + ^^^^^^^^^^^^^ + source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.brace.round.ts + ^^ + source.ts meta.function.ts meta.block.ts +> console.log(param1 + number); + ^^^^^^^^^^^^^ + source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.brace.round.ts + ^^^^^^^ + source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts keyword.operator.arithmetic.ts + ^^^^^^^ + source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.brace.round.ts + ^^ + source.ts meta.function.ts meta.block.ts +> console.log(string); + ^^^^^^^^^^^^^ + source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.brace.round.ts + ^^ + source.ts meta.function.ts meta.block.ts +> console.log(boolean); + ^^^^^^^^^^^^^ + source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.brace.round.ts + ^^^^^^^ + source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.brace.round.ts + ^^ + source.ts meta.function.ts meta.block.ts +> let x = param1 ? 2 : param2; + ^^ + source.ts meta.function.ts meta.block.ts + ^^^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts + ^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue193.baseline.txt b/tests/baselines/Issue193.baseline.txt index 5f7a4e58..ae9074d9 100644 --- a/tests/baselines/Issue193.baseline.txt +++ b/tests/baselines/Issue193.baseline.txt @@ -7,6 +7,9 @@ original file function Функция_Main(s: string) { } + +let item = "value1"; +let элемент = "value2"; ----------------------------------- >function Main_Функция(s: string) @@ -73,4 +76,51 @@ function Функция_Main(s: string) source.ts meta.function.ts meta.block.ts >} ^ - source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>let item = "value1"; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^^^ + source.ts +>let элемент = "value2"; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/cases/Issue186.ts b/tests/cases/Issue186.ts new file mode 100644 index 00000000..81904f56 --- /dev/null +++ b/tests/cases/Issue186.ts @@ -0,0 +1,10 @@ +function myFunction(param1, param2, number, string, boolean) { + let y = (number) => { + console.log(param1); + } + console.log(param1); + console.log(param1 + number); + console.log(string); + console.log(boolean); + let x = param1 ? 2 : param2; +} \ No newline at end of file diff --git a/tests/cases/Issue193.ts b/tests/cases/Issue193.ts index 745455ea..c3235c6a 100644 --- a/tests/cases/Issue193.ts +++ b/tests/cases/Issue193.ts @@ -4,4 +4,7 @@ function Функция_Main(s: string) { -} \ No newline at end of file +} + +let item = "value1"; +let элемент = "value2"; \ No newline at end of file From e038ac8f4431d32f6763d25c393b0f1d9cc4da30 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 29 Aug 2016 11:28:15 -0700 Subject: [PATCH 40/77] Rename meta.function.type.parameter.ts to meta.parameters.ts --- TypeScript.YAML-tmLanguage | 14 +- TypeScript.tmLanguage | 14 +- TypeScriptReact.YAML-tmLanguage | 16 +- TypeScriptReact.tmLanguage | 16 +- tests/baselines/Abstracts.baseline.txt | 16 +- ...owFunctionInsideTypeAssertion.baseline.txt | 40 +- tests/baselines/Comments.baseline.txt | 36 +- .../FunctionMethodOverloads.baseline.txt | 476 +++++++-------- .../FunctionMethodParameters.baseline.txt | 552 +++++++++--------- tests/baselines/FunctionMethodParameters.txt | 40 +- .../FunctionMethodReturnTypes.baseline.txt | 104 ++-- tests/baselines/Issue10.baseline.txt | 8 +- tests/baselines/Issue143.baseline.txt | 10 +- tests/baselines/Issue148.baseline.txt | 106 ++-- tests/baselines/Issue149.baseline.txt | 96 +-- tests/baselines/Issue149.txt | 2 +- tests/baselines/Issue153.baseline.txt | 28 +- tests/baselines/Issue154.baseline.txt | 8 +- tests/baselines/Issue156.baseline.txt | 34 +- tests/baselines/Issue156.txt | 10 +- tests/baselines/Issue163.baseline.txt | 4 +- tests/baselines/Issue186.baseline.txt | 30 +- tests/baselines/Issue191.baseline.txt | 32 +- tests/baselines/Issue191.txt | 12 +- tests/baselines/Issue193.baseline.txt | 36 +- tests/baselines/Issue218.baseline.txt | 24 +- tests/baselines/Issue235.baseline.txt | 24 +- tests/baselines/Issue236.baseline.txt | 12 +- tests/baselines/Issue241.baseline.txt | 20 +- tests/baselines/Issue288.baseline.txt | 16 +- tests/baselines/Issue288.txt | 4 +- tests/baselines/Issue32.baseline.txt | 48 +- tests/baselines/Issue32.txt | 8 +- tests/baselines/Issue335.baseline.txt | 32 +- tests/baselines/Issue36.baseline.txt | 4 +- tests/baselines/Issue37.baseline.txt | 28 +- tests/baselines/Issue37.txt | 4 +- tests/baselines/Issue44.baseline.txt | 4 +- tests/baselines/Issue77.baseline.txt | 8 +- tests/baselines/Issue82.baseline.txt | 48 +- tests/baselines/Issue82.txt | 12 +- .../ParameterProperties.baseline.txt | 52 +- tests/baselines/ParameterProperties.txt | 6 +- tests/baselines/TsxSamples.baseline.txt | 4 +- tests/baselines/docComments.baseline.txt | 24 +- .../multipleVariableDeclaration.baseline.txt | 6 +- .../parameterBindingPattern.baseline.txt | 404 ++++++------- tests/baselines/pr48_noSemiColon.baseline.txt | 12 +- .../variableBindingPattern.baseline.txt | 8 +- 49 files changed, 1276 insertions(+), 1276 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index b293eced..6387f741 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -480,7 +480,7 @@ repository: - include: '#method-declaration-name' - include: '#comment' - include: '#type-parameters' - - include: '#function-type-parameters' + - include: '#function-parameters' - include: '#return-type' - include: '#method-overload-declaration' - include: '#decl-block' @@ -543,7 +543,7 @@ repository: patterns: - include: '#comment' - include: '#type-parameters' - - include: '#function-type-parameters' + - include: '#function-parameters' - include: '#return-type' - include: '#function-overload-declaration' - include: '#decl-block' @@ -712,12 +712,12 @@ repository: - include: '#type-tuple' - include: '#type-object' - include: '#type-operator' - - include: '#type-paren-or-function-type-parameters' + - include: '#type-paren-or-function-parameters' - include: '#type-function-return-type' - include: '#type-name' - function-type-parameters: - name: meta.function.type.parameter.ts + function-parameters: + name: meta.parameters.ts begin: \( beginCaptures: '0': { name: punctuation.definition.parameters.begin.ts } @@ -740,7 +740,7 @@ repository: # (number | string) or (param: number, param2: string) # and it can be nested, for example # (number | (param: number, param2: string) => void) - type-paren-or-function-type-parameters: + type-paren-or-function-parameters: name: meta.type.paren.cover.ts begin: '(?:\b(new)\b)?\s*(\()' beginCaptures: @@ -752,7 +752,7 @@ repository: patterns: - include: '#comment' - include: '#type' - - include: '#function-type-parameters' + - include: '#function-parameters' type-operator: name: keyword.operator.type.ts diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index e5e0e81e..e7d07316 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -1354,7 +1354,7 @@ include - #function-type-parameters + #function-parameters include @@ -1395,7 +1395,7 @@ name meta.function.overload.ts - function-type-parameters + function-parameters begin \( @@ -1418,7 +1418,7 @@ name - meta.function.type.parameter.ts + meta.parameters.ts patterns @@ -1886,7 +1886,7 @@ include - #function-type-parameters + #function-parameters include @@ -3308,7 +3308,7 @@ include - #type-paren-or-function-type-parameters + #type-paren-or-function-parameters include @@ -3592,7 +3592,7 @@ - type-paren-or-function-type-parameters + type-paren-or-function-parameters begin (?:\b(new)\b)?\s*(\() @@ -3633,7 +3633,7 @@ include - #function-type-parameters + #function-parameters diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 668c286f..61329cb3 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -484,7 +484,7 @@ repository: - include: '#method-declaration-name' - include: '#comment' - include: '#type-parameters' - - include: '#function-type-parameters' + - include: '#function-parameters' - include: '#return-type' - include: '#method-overload-declaration' - include: '#decl-block' @@ -547,7 +547,7 @@ repository: patterns: - include: '#comment' - include: '#type-parameters' - - include: '#function-type-parameters' + - include: '#function-parameters' - include: '#return-type' - include: '#function-overload-declaration' - include: '#decl-block' @@ -716,12 +716,12 @@ repository: - include: '#type-tuple' - include: '#type-object' - include: '#type-operator' - - include: '#type-paren-or-function-type-parameters' + - include: '#type-paren-or-function-parameters' - include: '#type-function-return-type' - include: '#type-name' - function-type-parameters: - name: meta.function.type.parameter.tsx + function-parameters: + name: meta.parameters.tsx begin: \( beginCaptures: '0': { name: punctuation.definition.parameters.begin.tsx } @@ -744,7 +744,7 @@ repository: # (number | string) or (param: number, param2: string) # and it can be nested, for example # (number | (param: number, param2: string) => void) - type-paren-or-function-type-parameters: + type-paren-or-function-parameters: name: meta.type.paren.cover.tsx begin: '(?:\b(new)\b)?\s*(\()' beginCaptures: @@ -756,11 +756,11 @@ repository: patterns: - include: '#comment' - include: '#type' - - include: '#function-type-parameters' + - include: '#function-parameters' type-operator: name: keyword.operator.type.tsx - match: '[.|]' + match: '[&|]' type-function-return-type: name: meta.type.function.return.tsx diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index edbfc20a..b6ae15ee 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -1322,7 +1322,7 @@ include - #function-type-parameters + #function-parameters include @@ -1363,7 +1363,7 @@ name meta.function.overload.tsx - function-type-parameters + function-parameters begin \( @@ -1386,7 +1386,7 @@ name - meta.function.type.parameter.tsx + meta.parameters.tsx patterns @@ -2283,7 +2283,7 @@ include - #function-type-parameters + #function-parameters include @@ -3709,7 +3709,7 @@ include - #type-paren-or-function-type-parameters + #type-paren-or-function-parameters include @@ -3942,7 +3942,7 @@ type-operator match - [.|] + [&|] name keyword.operator.type.tsx @@ -3993,7 +3993,7 @@ - type-paren-or-function-type-parameters + type-paren-or-function-parameters begin (?:\b(new)\b)?\s*(\() @@ -4034,7 +4034,7 @@ include - #function-type-parameters + #function-parameters diff --git a/tests/baselines/Abstracts.baseline.txt b/tests/baselines/Abstracts.baseline.txt index 44cd7802..a1952aca 100644 --- a/tests/baselines/Abstracts.baseline.txt +++ b/tests/baselines/Abstracts.baseline.txt @@ -60,9 +60,9 @@ cow.makeSound(); ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -97,9 +97,9 @@ cow.makeSound(); ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -139,9 +139,9 @@ cow.makeSound(); ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -193,9 +193,9 @@ cow.makeSound(); ^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index 313b328a..1bc369de 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -161,45 +161,45 @@ function f(x: string | ((value: string) => number)) { ^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts entity.name.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts entity.name.type.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ diff --git a/tests/baselines/Comments.baseline.txt b/tests/baselines/Comments.baseline.txt index d2cfb210..5ead59d7 100644 --- a/tests/baselines/Comments.baseline.txt +++ b/tests/baselines/Comments.baseline.txt @@ -1782,17 +1782,17 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1855,17 +1855,17 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1928,17 +1928,17 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ diff --git a/tests/baselines/FunctionMethodOverloads.baseline.txt b/tests/baselines/FunctionMethodOverloads.baseline.txt index 7a49939b..227f2e8c 100644 --- a/tests/baselines/FunctionMethodOverloads.baseline.txt +++ b/tests/baselines/FunctionMethodOverloads.baseline.txt @@ -71,17 +71,17 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -112,17 +112,17 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts >export function testFunctionOverload(p: string []) ^^^^^^ source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts @@ -135,23 +135,23 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts >export function testFunctionOverload(p: {}) ^^^^^^ source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts @@ -164,19 +164,19 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts >export function testFunctionOverload(p: {a: A, b:B} | string []) ^^^^^^ source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts @@ -189,51 +189,51 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts >export function testFunctionOverload(p: any): new() => any { ^^^^^^ source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts @@ -246,17 +246,17 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -318,17 +318,17 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -363,17 +363,17 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts >export function testFunctionOverloadWithSemicolon(p: string[]); @@ -388,21 +388,21 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts >export function testFunctionOverloadWithSemicolon(p: {}); @@ -417,19 +417,19 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts >export function testFunctionOverloadWithSemicolon(p: { a: A, b: B } | string[]); @@ -444,55 +444,55 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts >export function testFunctionOverloadWithSemicolon(p: any): new () => any { @@ -507,17 +507,17 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -602,17 +602,17 @@ abstract class C { ^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -641,17 +641,17 @@ abstract class C { ^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts > public testMethodOverload(p: string []) ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -662,23 +662,23 @@ abstract class C { ^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts > public testMethodOverload(p: {}) ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -689,19 +689,19 @@ abstract class C { ^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts > public testMethodOverload(p: {a: A, b:B} | string []) ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -712,51 +712,51 @@ abstract class C { ^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts > public testMethodOverload(p: any): new() => any { ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -767,17 +767,17 @@ abstract class C { ^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -839,17 +839,17 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -882,17 +882,17 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > public testMethodOverloadWithSemicolon(p: string[]); @@ -905,21 +905,21 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > public testMethodOverloadWithSemicolon(p: {}); @@ -932,19 +932,19 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > public testMethodOverloadWithSemicolon(p: { a: A, b: B } | string[]); @@ -957,55 +957,55 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts > public testMethodOverloadWithSemicolon(p: any): new () => any { @@ -1018,17 +1018,17 @@ abstract class C { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1102,9 +1102,9 @@ abstract class C { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1117,9 +1117,9 @@ abstract class C { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1159,9 +1159,9 @@ abstract class C { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts > abstract bar() ^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts @@ -1172,9 +1172,9 @@ abstract class C { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/FunctionMethodParameters.baseline.txt b/tests/baselines/FunctionMethodParameters.baseline.txt index bc6eae98..a2818e07 100644 --- a/tests/baselines/FunctionMethodParameters.baseline.txt +++ b/tests/baselines/FunctionMethodParameters.baseline.txt @@ -48,291 +48,291 @@ class testClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts > m1: string, ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts > m2: {}, ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts > m3: any [], ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts > m4: {a: A, b: B}, ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts > m5: () => void, ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts > m6: (x:(string), y:[number, string]) => number, ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts entity.name.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts entity.name.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts support.type.primitive.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts > m7: Array, ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts entity.name.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts > m8: [number, number], ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts > m9: {a: A, b: B} | [number, number], ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts > m10: (() => void) | string[]): number { ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -386,291 +386,291 @@ class testClass { ^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts > m1: string, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts > m2: {}, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts > m3: any [], ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts > m4: {a: A, b: B}, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts > m5: () => void, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts > m6: (x:(string), y:[number, string]) => number, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts support.type.primitive.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts > m7: Array, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts > m8: [number, number], ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts > m9: {a: A, b: B} | [number, number], ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts > m10: (() => void) | string[]): number { ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ diff --git a/tests/baselines/FunctionMethodParameters.txt b/tests/baselines/FunctionMethodParameters.txt index bcfb6879..5aea5be1 100644 --- a/tests/baselines/FunctionMethodParameters.txt +++ b/tests/baselines/FunctionMethodParameters.txt @@ -37,34 +37,34 @@ class testClass { >function testFunctionParamType( > m1: string, ^^ - [3, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + [3, 5]: source.ts meta.function.ts meta.parameters.ts variable.parameter.ts > m2: {}, ^^ - [4, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + [4, 5]: source.ts meta.function.ts meta.parameters.ts variable.parameter.ts > m3: any [], ^^ - [5, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + [5, 5]: source.ts meta.function.ts meta.parameters.ts variable.parameter.ts > m4: {a: A, b: B}, ^^ - [6, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + [6, 5]: source.ts meta.function.ts meta.parameters.ts variable.parameter.ts > m5: () => void, ^^ - [7, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + [7, 5]: source.ts meta.function.ts meta.parameters.ts variable.parameter.ts > m6: (x:(string), y:[number, string]) => number, ^^ - [8, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + [8, 5]: source.ts meta.function.ts meta.parameters.ts variable.parameter.ts > m7: Array, ^^ - [9, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + [9, 5]: source.ts meta.function.ts meta.parameters.ts variable.parameter.ts > m8: [number, number], ^^ - [10, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + [10, 5]: source.ts meta.function.ts meta.parameters.ts variable.parameter.ts > m9: {a: A, b: B} | [number, number], ^^ - [11, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + [11, 5]: source.ts meta.function.ts meta.parameters.ts variable.parameter.ts > m10: (() => void) | string[]): number { ^^^ - [12, 5]: source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + [12, 5]: source.ts meta.function.ts meta.parameters.ts variable.parameter.ts > return m6.length; ^^^^^^ [13, 5]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts @@ -75,34 +75,34 @@ class testClass { > public testMethodParamType( > m1: string, ^^ - [19, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [19, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts > m2: {}, ^^ - [20, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [20, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts > m3: any [], ^^ - [21, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [21, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts > m4: {a: A, b: B}, ^^ - [22, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [22, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts > m5: () => void, ^^ - [23, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [23, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts > m6: (x:(string), y:[number, string]) => number, ^^ - [24, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [24, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts > m7: Array, ^^ - [25, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [25, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts > m8: [number, number], ^^ - [26, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [26, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts > m9: {a: A, b: B} | [number, number], ^^ - [27, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [27, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts > m10: (() => void) | string[]): number { ^^^ - [28, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [28, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts > return m6.length; ^^^^^^ [29, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt index c8692377..e90ec3f6 100644 --- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -52,9 +52,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -101,9 +101,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -142,9 +142,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -241,9 +241,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -294,9 +294,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -355,9 +355,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -418,9 +418,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -481,9 +481,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -550,9 +550,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -635,9 +635,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -744,9 +744,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -789,9 +789,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -836,9 +836,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -922,9 +922,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -969,9 +969,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1008,9 +1008,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1105,9 +1105,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1156,9 +1156,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1215,9 +1215,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1276,9 +1276,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1337,9 +1337,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1404,9 +1404,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1487,9 +1487,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1594,9 +1594,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1637,9 +1637,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -1682,9 +1682,9 @@ class TestClass { ^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ diff --git a/tests/baselines/Issue10.baseline.txt b/tests/baselines/Issue10.baseline.txt index 2880a213..89b4632a 100644 --- a/tests/baselines/Issue10.baseline.txt +++ b/tests/baselines/Issue10.baseline.txt @@ -64,9 +64,9 @@ class World { ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -127,9 +127,9 @@ class World { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ diff --git a/tests/baselines/Issue143.baseline.txt b/tests/baselines/Issue143.baseline.txt index 7d2a9a20..dce7dbaf 100644 --- a/tests/baselines/Issue143.baseline.txt +++ b/tests/baselines/Issue143.baseline.txt @@ -146,11 +146,11 @@ export class AppComponent { ^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -286,9 +286,9 @@ export class AppComponent { ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ diff --git a/tests/baselines/Issue148.baseline.txt b/tests/baselines/Issue148.baseline.txt index e6c614d0..9bdbadbc 100644 --- a/tests/baselines/Issue148.baseline.txt +++ b/tests/baselines/Issue148.baseline.txt @@ -29,116 +29,116 @@ class Test { ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts > @inject private test: string, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts punctuation.decorator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts punctuation.decorator.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts storage.modifier.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts > @inject("test") private test2: string, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts punctuation.decorator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts punctuation.decorator.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts string.quoted.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts string.quoted.double.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts storage.modifier.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts > @inject("test") test3: string, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts punctuation.decorator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts punctuation.decorator.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts string.quoted.double.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts string.quoted.double.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.decorator.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts > public test4: string ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts storage.modifier.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts > ) { } ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ diff --git a/tests/baselines/Issue149.baseline.txt b/tests/baselines/Issue149.baseline.txt index 8a73a6e2..f54ce37b 100644 --- a/tests/baselines/Issue149.baseline.txt +++ b/tests/baselines/Issue149.baseline.txt @@ -27,17 +27,17 @@ original file ^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -68,17 +68,17 @@ original file ^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts >export function fn(n: number) ^^^^^^ source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts @@ -91,17 +91,17 @@ original file ^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts >export function fn(s: any) { ^^^^^^ source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts @@ -114,17 +114,17 @@ original file ^^ source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ @@ -160,17 +160,17 @@ original file ^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -205,17 +205,17 @@ original file ^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts >export function fn(n: number); @@ -230,17 +230,17 @@ original file ^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts >export function fn(s: any) { @@ -255,17 +255,17 @@ original file ^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ diff --git a/tests/baselines/Issue149.txt b/tests/baselines/Issue149.txt index 9f58a7d8..0ca49ffb 100644 --- a/tests/baselines/Issue149.txt +++ b/tests/baselines/Issue149.txt @@ -21,7 +21,7 @@ original file ^^ [1, 17]: source.ts meta.function.ts entity.name.function.ts ^^^^^^ - [1, 23]: source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + [1, 23]: source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^^^ [1, 32]: source.ts meta.function.ts meta.return.type.ts meta.type.paren.cover.ts keyword.control.new.ts ^^^^ diff --git a/tests/baselines/Issue153.baseline.txt b/tests/baselines/Issue153.baseline.txt index 65bd264d..a0d2fdaa 100644 --- a/tests/baselines/Issue153.baseline.txt +++ b/tests/baselines/Issue153.baseline.txt @@ -379,19 +379,19 @@ class Matrix { ^^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ @@ -715,19 +715,19 @@ class Matrix { ^^^^^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ diff --git a/tests/baselines/Issue154.baseline.txt b/tests/baselines/Issue154.baseline.txt index a5587d6a..81ac2fd0 100644 --- a/tests/baselines/Issue154.baseline.txt +++ b/tests/baselines/Issue154.baseline.txt @@ -40,9 +40,9 @@ class TestCase2 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -102,9 +102,9 @@ class TestCase2 { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ diff --git a/tests/baselines/Issue156.baseline.txt b/tests/baselines/Issue156.baseline.txt index 314efd58..51074692 100644 --- a/tests/baselines/Issue156.baseline.txt +++ b/tests/baselines/Issue156.baseline.txt @@ -25,39 +25,39 @@ class Test { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts > { diff --git a/tests/baselines/Issue156.txt b/tests/baselines/Issue156.txt index 6216fbb5..29075be8 100644 --- a/tests/baselines/Issue156.txt +++ b/tests/baselines/Issue156.txt @@ -13,15 +13,15 @@ class Test { ^^^ [2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^^ - [2, 6]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [2, 6]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^^^^^^ - [2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + [2, 10]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - [2, 19]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + [2, 19]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ - [2, 23]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [2, 23]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^^^^^^ - [2, 27]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + [2, 27]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts > { > ^^^^^^^^^ diff --git a/tests/baselines/Issue163.baseline.txt b/tests/baselines/Issue163.baseline.txt index c9c70260..917a099a 100644 --- a/tests/baselines/Issue163.baseline.txt +++ b/tests/baselines/Issue163.baseline.txt @@ -34,9 +34,9 @@ const o = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts ^ diff --git a/tests/baselines/Issue186.baseline.txt b/tests/baselines/Issue186.baseline.txt index e7c5d2dd..e3c99f3b 100644 --- a/tests/baselines/Issue186.baseline.txt +++ b/tests/baselines/Issue186.baseline.txt @@ -20,35 +20,35 @@ function myFunction(param1, param2, number, string, boolean) { ^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index 49997d2b..ce5beed2 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -39,21 +39,21 @@ class Thing<^^T, ^^U> { ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts storage.modifier.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > var prop = Q.defer(); @@ -207,21 +207,21 @@ class Thing<^^T, ^^U> { ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts storage.modifier.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > var prop = Q.defer(); diff --git a/tests/baselines/Issue191.txt b/tests/baselines/Issue191.txt index 363dce92..da52243e 100644 --- a/tests/baselines/Issue191.txt +++ b/tests/baselines/Issue191.txt @@ -27,11 +27,11 @@ class Thing<^^T, ^^U> { ^^^^^^^^^^^ [2, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^^^^^^ - [2, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + [2, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts storage.modifier.ts ^^^^^^^ - [2, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [2, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^^^^^^ - [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts > var prop = Q.defer(); ^^^^ [3, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts @@ -71,11 +71,11 @@ class Thing<^^T, ^^U> { ^^^^^^^^^^^ [12, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^^^^^^ - [12, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + [12, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts storage.modifier.ts ^^^^^^^ - [12, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [12, 24]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^^^^^^ - [12, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + [12, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts > var prop = Q.defer(); ^^^^ [13, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts diff --git a/tests/baselines/Issue193.baseline.txt b/tests/baselines/Issue193.baseline.txt index ae9074d9..a2f6ade6 100644 --- a/tests/baselines/Issue193.baseline.txt +++ b/tests/baselines/Issue193.baseline.txt @@ -6,9 +6,9 @@ original file function Функция_Main(s: string) { -} - -let item = "value1"; +} + +let item = "value1"; let элемент = "value2"; ----------------------------------- @@ -22,17 +22,17 @@ let элемент = "value2"; ^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts meta.function.ts >{ @@ -56,17 +56,17 @@ let элемент = "value2"; ^^^^^^^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^^ source.ts meta.function.ts >{ @@ -74,15 +74,15 @@ let элемент = "value2"; source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.function.ts meta.block.ts ->} +>} ^ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts -> +> ^^ source.ts ->let item = "value1"; +>let item = "value1"; ^^^ source.ts meta.var.expr.ts storage.type.ts ^ diff --git a/tests/baselines/Issue218.baseline.txt b/tests/baselines/Issue218.baseline.txt index e1e911cd..3af2a678 100644 --- a/tests/baselines/Issue218.baseline.txt +++ b/tests/baselines/Issue218.baseline.txt @@ -27,17 +27,17 @@ class A { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -61,17 +61,17 @@ class A { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ diff --git a/tests/baselines/Issue235.baseline.txt b/tests/baselines/Issue235.baseline.txt index 96b156e8..888587ba 100644 --- a/tests/baselines/Issue235.baseline.txt +++ b/tests/baselines/Issue235.baseline.txt @@ -46,29 +46,29 @@ class A { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ diff --git a/tests/baselines/Issue236.baseline.txt b/tests/baselines/Issue236.baseline.txt index 7b09daf5..73cdc3d6 100644 --- a/tests/baselines/Issue236.baseline.txt +++ b/tests/baselines/Issue236.baseline.txt @@ -38,9 +38,9 @@ class Test { ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -78,9 +78,9 @@ class Test { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -114,9 +114,9 @@ class Test { ^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ diff --git a/tests/baselines/Issue241.baseline.txt b/tests/baselines/Issue241.baseline.txt index fee0b7b5..9bacbe88 100644 --- a/tests/baselines/Issue241.baseline.txt +++ b/tests/baselines/Issue241.baseline.txt @@ -25,9 +25,9 @@ function foo2(): [number, () => { x: number }] { ^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -82,9 +82,9 @@ function foo2(): [number, () => { x: number }] { ^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -149,9 +149,9 @@ function foo2(): [number, () => { x: number }] { ^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -206,9 +206,9 @@ function foo2(): [number, () => { x: number }] { ^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -273,9 +273,9 @@ function foo2(): [number, () => { x: number }] { ^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ diff --git a/tests/baselines/Issue288.baseline.txt b/tests/baselines/Issue288.baseline.txt index 0fc4c84f..e57c2adb 100644 --- a/tests/baselines/Issue288.baseline.txt +++ b/tests/baselines/Issue288.baseline.txt @@ -47,9 +47,9 @@ return^^Name+=1; ^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >} @@ -71,9 +71,9 @@ return^^Name+=1; ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts storage.type.function.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >} @@ -94,9 +94,9 @@ return^^Name+=1; ^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >} @@ -122,9 +122,9 @@ return^^Name+=1; ^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts storage.type.function.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts >} diff --git a/tests/baselines/Issue288.txt b/tests/baselines/Issue288.txt index 926dba91..6c216676 100644 --- a/tests/baselines/Issue288.txt +++ b/tests/baselines/Issue288.txt @@ -35,7 +35,7 @@ return^^Name+=1; >} >var AnotherName = function(){ ^ - [6, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + [6, 27]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts >} > >export function eName(){ @@ -44,7 +44,7 @@ return^^Name+=1; >} >export var eAnotherName = function(){ ^ - [11, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + [11, 35]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts >} > >var functionName=1; diff --git a/tests/baselines/Issue32.baseline.txt b/tests/baselines/Issue32.baseline.txt index 0e629380..89b5323a 100644 --- a/tests/baselines/Issue32.baseline.txt +++ b/tests/baselines/Issue32.baseline.txt @@ -63,17 +63,17 @@ original file ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts @@ -121,17 +121,17 @@ original file ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > this.currentData = d; @@ -156,29 +156,29 @@ original file ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts ^ diff --git a/tests/baselines/Issue32.txt b/tests/baselines/Issue32.txt index 7f10a030..6a61c7ad 100644 --- a/tests/baselines/Issue32.txt +++ b/tests/baselines/Issue32.txt @@ -58,13 +58,13 @@ original file ^^^^^^^^^^^ [16, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - [16, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [16, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^^^^^^ - [16, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + [16, 17]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - [16, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [16, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^^^^^^ - [16, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + [16, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts >} > ^ diff --git a/tests/baselines/Issue335.baseline.txt b/tests/baselines/Issue335.baseline.txt index b5622590..74a74a1b 100644 --- a/tests/baselines/Issue335.baseline.txt +++ b/tests/baselines/Issue335.baseline.txt @@ -70,9 +70,9 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -121,9 +121,9 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -156,9 +156,9 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -205,9 +205,9 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -240,9 +240,9 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -345,9 +345,9 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -380,9 +380,9 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -485,9 +485,9 @@ class A4 { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ diff --git a/tests/baselines/Issue36.baseline.txt b/tests/baselines/Issue36.baseline.txt index 9b74b496..b32e2079 100644 --- a/tests/baselines/Issue36.baseline.txt +++ b/tests/baselines/Issue36.baseline.txt @@ -30,9 +30,9 @@ let x = { ^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts ^ diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt index d86b03b2..e2300aa1 100644 --- a/tests/baselines/Issue37.baseline.txt +++ b/tests/baselines/Issue37.baseline.txt @@ -187,9 +187,9 @@ var j: I = {} ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts > @@ -405,17 +405,17 @@ var j: I = {} ^^^^^ source.ts meta.block.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.block.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.block.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.block.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.block.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.block.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.block.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.block.ts meta.function.ts ^ @@ -630,17 +630,17 @@ var j: I = {} ^^^^^^^^^^^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^^^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt index 6c04d84d..2eda2683 100644 --- a/tests/baselines/Issue37.txt +++ b/tests/baselines/Issue37.txt @@ -198,9 +198,9 @@ var j: I = {} ^^^^^^^^^^^ [55, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^^^^^^ - [55, 21]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [55, 21]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^^^^ - [55, 29]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts + [55, 29]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts > this.parent = parent; ^^^^ [56, 13]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts diff --git a/tests/baselines/Issue44.baseline.txt b/tests/baselines/Issue44.baseline.txt index 856e3ff6..32b4126b 100644 --- a/tests/baselines/Issue44.baseline.txt +++ b/tests/baselines/Issue44.baseline.txt @@ -45,9 +45,9 @@ original file ^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ diff --git a/tests/baselines/Issue77.baseline.txt b/tests/baselines/Issue77.baseline.txt index daf7c28c..fb099a42 100644 --- a/tests/baselines/Issue77.baseline.txt +++ b/tests/baselines/Issue77.baseline.txt @@ -85,9 +85,9 @@ function foo() { } ^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -185,9 +185,9 @@ function foo() { } ^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ diff --git a/tests/baselines/Issue82.baseline.txt b/tests/baselines/Issue82.baseline.txt index 83d22ad0..dbf772bd 100644 --- a/tests/baselines/Issue82.baseline.txt +++ b/tests/baselines/Issue82.baseline.txt @@ -27,56 +27,56 @@ class Foo { ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts > test: number, // foo bar, ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts punctuation.definition.comment.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts comment.line.double-slash.ts punctuation.definition.comment.ts ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts comment.line.double-slash.ts > exitEditModeCallback: () => void // Used to re-enable View updates. ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.function.return.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts punctuation.definition.comment.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts comment.line.double-slash.ts punctuation.definition.comment.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts comment.line.double-slash.ts > ) { ^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ diff --git a/tests/baselines/Issue82.txt b/tests/baselines/Issue82.txt index 8b59cd51..2ebd7a9e 100644 --- a/tests/baselines/Issue82.txt +++ b/tests/baselines/Issue82.txt @@ -14,18 +14,18 @@ class Foo { > constructor( > test: number, // foo bar, ^^^^ - [3, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [3, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^^^^^^ - [3, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + [3, 15]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^^^^^^^^^ - [3, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts + [3, 25]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts comment.line.double-slash.ts > exitEditModeCallback: () => void // Used to re-enable View updates. ^^^^^^^^^^^^^^^^^^^^ - [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + [4, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - [4, 31]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts + [4, 31]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - [4, 44]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts comment.line.double-slash.ts + [4, 44]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts comment.line.double-slash.ts > ) { > ^^^^^^^^^ diff --git a/tests/baselines/ParameterProperties.baseline.txt b/tests/baselines/ParameterProperties.baseline.txt index 6f2d58e7..2f94e2b9 100644 --- a/tests/baselines/ParameterProperties.baseline.txt +++ b/tests/baselines/ParameterProperties.baseline.txt @@ -26,53 +26,53 @@ class A { ^^^^^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts storage.modifier.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts storage.modifier.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts storage.modifier.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ @@ -88,9 +88,9 @@ class A { ^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts ^ diff --git a/tests/baselines/ParameterProperties.txt b/tests/baselines/ParameterProperties.txt index 0294c84d..38df3c2c 100644 --- a/tests/baselines/ParameterProperties.txt +++ b/tests/baselines/ParameterProperties.txt @@ -12,11 +12,11 @@ class A { >class A { > constructor(private a: string, protected b: string, public c: string) { ^^^^^^^ - [2, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + [2, 14]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts storage.modifier.ts ^^^^^^^^^ - [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + [2, 33]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts storage.modifier.ts ^^^^^^ - [2, 54]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts storage.modifier.ts + [2, 54]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts storage.modifier.ts > } > foo() { > return this.a + this.b + this.c; diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index cd4abad3..5c2e1a26 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -92,9 +92,9 @@ var e =
^^^^^^ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx entity.name.function.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.function.type.parameter.tsx punctuation.definition.parameters.begin.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.parameters.tsx punctuation.definition.parameters.begin.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.function.type.parameter.tsx punctuation.definition.parameters.end.tsx + source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.parameters.tsx punctuation.definition.parameters.end.tsx ^ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx ^ diff --git a/tests/baselines/docComments.baseline.txt b/tests/baselines/docComments.baseline.txt index d0fe6af1..c664a08f 100644 --- a/tests/baselines/docComments.baseline.txt +++ b/tests/baselines/docComments.baseline.txt @@ -70,29 +70,29 @@ function foo(param1: string, param2: number) { ^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index 5a1f33b5..f94be92b 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -53,11 +53,11 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts ^ diff --git a/tests/baselines/parameterBindingPattern.baseline.txt b/tests/baselines/parameterBindingPattern.baseline.txt index eb4353cf..2a75f753 100644 --- a/tests/baselines/parameterBindingPattern.baseline.txt +++ b/tests/baselines/parameterBindingPattern.baseline.txt @@ -49,9 +49,9 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { ^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ @@ -243,93 +243,93 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { ^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.array.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.array.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts keyword.operator.assignment.ts + source.ts meta.function.ts meta.parameters.ts keyword.operator.assignment.ts ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ @@ -349,237 +349,237 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { ^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.destructuring.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.array.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.array.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts meta.delimiter.object.comma.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts > x: { ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts > a: number; ^^^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts > b: number; ^^^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts > }; ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts > y: { ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts > c: string; ^^^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts > d: string; ^^^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts > }; ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts > z: [number, { ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts > hello: string; ^^^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts ^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts > }]; ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts >} = foo()) { ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts keyword.operator.assignment.ts + source.ts meta.function.ts meta.parameters.ts keyword.operator.assignment.ts ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ @@ -602,9 +602,9 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { ^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ @@ -694,35 +694,35 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { ^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.array.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts meta.delimiter.object.comma.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts meta.delimiter.object.comma.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts ^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.array.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts keyword.operator.assignment.ts + source.ts meta.function.ts meta.parameters.ts keyword.operator.assignment.ts ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ @@ -742,63 +742,63 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { ^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.array.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.object.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.object.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts meta.delimiter.object.comma.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts meta.delimiter.object.comma.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts ^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.array.ts + source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.array.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts ^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts punctuation.definition.block.ts ^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts keyword.operator.assignment.ts + source.ts meta.function.ts meta.parameters.ts keyword.operator.assignment.ts ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts + source.ts meta.function.ts meta.parameters.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.brace.round.ts + source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index b5d00ba8..ab298a71 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -183,17 +183,17 @@ class Test { ^^^^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ - source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ diff --git a/tests/baselines/variableBindingPattern.baseline.txt b/tests/baselines/variableBindingPattern.baseline.txt index dc77bdb4..0ba1462c 100644 --- a/tests/baselines/variableBindingPattern.baseline.txt +++ b/tests/baselines/variableBindingPattern.baseline.txt @@ -45,9 +45,9 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); ^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ @@ -568,9 +568,9 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); ^^^ source.ts meta.function.ts entity.name.function.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ source.ts meta.function.ts ^ From 4b6badfbca936141a44f9f95cc5d11ffd8e3e894 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 30 Aug 2016 12:27:34 -0700 Subject: [PATCH 41/77] Arrow functions --- TypeScript.YAML-tmLanguage | 36 +- TypeScript.tmLanguage | 93 ++++- TypeScriptReact.YAML-tmLanguage | 36 +- TypeScriptReact.tmLanguage | 93 ++++- ...owFunctionInsideTypeAssertion.baseline.txt | 32 +- tests/baselines/Issue115.baseline.txt | 320 ++++++++++++++++++ tests/baselines/Issue119.baseline.txt | 112 ++++++ tests/baselines/Issue172.baseline.txt | 74 ++++ tests/baselines/Issue177.baseline.txt | 48 +++ tests/baselines/Issue186.baseline.txt | 12 +- tests/baselines/Issue187.baseline.txt | 106 ++++++ tests/baselines/Issue191.baseline.txt | 44 ++- tests/baselines/Issue22.baseline.txt | 50 +++ tests/baselines/Issue226.baseline.txt | 70 ++++ tests/baselines/Issue249.baseline.txt | 108 ++++++ tests/baselines/Issue42.baseline.txt | 80 +++++ .../multipleVariableDeclaration.baseline.txt | 10 +- tests/baselines/pr48_noSemiColon.baseline.txt | 20 +- tests/cases/Issue115.ts | 14 + tests/cases/Issue119.ts | 7 + tests/cases/Issue172.ts | 2 + tests/cases/Issue177.ts | 2 + tests/cases/Issue187.ts | 5 + tests/cases/Issue22.ts | 2 + tests/cases/Issue226.ts | 4 + tests/cases/Issue249.ts | 7 + tests/cases/Issue42.ts | 4 + 27 files changed, 1305 insertions(+), 86 deletions(-) create mode 100644 tests/baselines/Issue115.baseline.txt create mode 100644 tests/baselines/Issue119.baseline.txt create mode 100644 tests/baselines/Issue172.baseline.txt create mode 100644 tests/baselines/Issue177.baseline.txt create mode 100644 tests/baselines/Issue187.baseline.txt create mode 100644 tests/baselines/Issue22.baseline.txt create mode 100644 tests/baselines/Issue226.baseline.txt create mode 100644 tests/baselines/Issue249.baseline.txt create mode 100644 tests/baselines/Issue42.baseline.txt create mode 100644 tests/cases/Issue115.ts create mode 100644 tests/cases/Issue119.ts create mode 100644 tests/cases/Issue172.ts create mode 100644 tests/cases/Issue177.ts create mode 100644 tests/cases/Issue187.ts create mode 100644 tests/cases/Issue22.ts create mode 100644 tests/cases/Issue226.ts create mode 100644 tests/cases/Issue249.ts create mode 100644 tests/cases/Issue42.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 6387f741..7935fce0 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -167,14 +167,13 @@ repository: - include: '#literal' - include: '#function-declaration' - include: '#class-or-interface-declaration' + - include: '#cast' + - include: '#arrow-function' - include: '#paren-expression' - include: '#ternary-expression' - - include: '#cast' - include: '#new-expr' - - include: '#arrow-body' - include: '#object-literal' - include: '#expression-operator' - - include: '#imply-operator' - include: '#operators' - include: '#function-call' @@ -946,10 +945,6 @@ repository: - name: keyword.operator.is.ts match: \bis\b - imply-operator: - name: storage.type.function.arrow.ts - match: => - operators: patterns: - name: keyword.operator.assignment.compound.ts @@ -973,6 +968,33 @@ repository: - name: keyword.operator.arithmetic.ts match: '%|\*|/|-|\+' + arrow-function: + patterns: + # TODO: type parameter of arrow + - name: meta.arrow.ts + match: (\basync)(?=\s*[<(]) + captures: + '1': { name: storage.modifier.async.ts } + # paramters of the arrow + - name: meta.arrow.ts + match: ([_$[:alpha:]][_$[:alnum:]]*)\s*(=>) + captures: + '1': { name: variable.parameter.ts } + '2': { name: storage.type.function.arrow.ts } + - name: meta.arrow.ts + begin: (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)\s*=>) + end: => + endCaptures: + '0': { name: storage.type.function.arrow.ts } + patterns: + - include: '#function-parameters' + # TODO: return type of the arrow + # arrow operator for anything that doesnt get captured by above regex + - name: storage.type.function.arrow.ts + match: => + # body + - include: '#arrow-body' + paren-expression: begin: \( beginCaptures: diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index e7d07316..5d7b0811 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -180,6 +180,78 @@ + arrow-function + + patterns + + + captures + + 1 + + name + storage.modifier.async.ts + + + match + (\basync)(?=\s*[<(]) + name + meta.arrow.ts + + + captures + + 1 + + name + variable.parameter.ts + + 2 + + name + storage.type.function.arrow.ts + + + match + ([_$[:alpha:]][_$[:alnum:]]*)\s*(=>) + name + meta.arrow.ts + + + begin + (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)\s*=>) + end + => + endCaptures + + 0 + + name + storage.type.function.arrow.ts + + + name + meta.arrow.ts + patterns + + + include + #function-parameters + + + + + match + => + name + storage.type.function.arrow.ts + + + include + #arrow-body + + + boolean-literal patterns @@ -1089,23 +1161,23 @@ include - #paren-expression + #cast include - #ternary-expression + #arrow-function include - #cast + #paren-expression include - #new-expr + #ternary-expression include - #arrow-body + #new-expr include @@ -1115,10 +1187,6 @@ include #expression-operator - - include - #imply-operator - include #operators @@ -1447,13 +1515,6 @@ - imply-operator - - match - => - name - storage.type.function.arrow.ts - import-declaration begin diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 61329cb3..fe79eee9 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -172,13 +172,12 @@ repository: - include: '#literal' - include: '#function-declaration' - include: '#class-or-interface-declaration' + - include: '#arrow-function' - include: '#paren-expression' - include: '#ternary-expression' - include: '#new-expr' - - include: '#arrow-body' - include: '#object-literal' - include: '#expression-operator' - - include: '#imply-operator' - include: '#operators' - include: '#function-call' @@ -701,7 +700,7 @@ repository: type-annotation: name: meta.type.annotation.tsx begin: ":" - end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{) + end: (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[_$[:alpha:]])\s*(?=\{) patterns: - include: '#expression-operator' - include: '#type' @@ -936,10 +935,6 @@ repository: - name: keyword.operator.is.tsx match: \bis\b - imply-operator: - name: storage.type.function.arrow.tsx - match: => - operators: patterns: - name: keyword.operator.assignment.compound.tsx @@ -963,6 +958,33 @@ repository: - name: keyword.operator.arithmetic.tsx match: '%|\*|/|-|\+' + arrow-function: + patterns: + # TODO: type parameter of arrow + - name: meta.arrow.ts + match: (\basync)(?=\s*[<(]) + captures: + '1': { name: storage.modifier.async.tsx } + # paramters of the arrow + - name: meta.arrow.tsx + match: ([_$[:alpha:]][_$[:alnum:]]*)\s*(=>) + captures: + '1': { name: variable.parameter.tsx } + '2': { name: storage.type.function.arrow.tsx } + - name: meta.arrow.tsx + begin: (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)\s*=>) + end: => + endCaptures: + '0': { name: storage.type.function.arrow.tsx } + patterns: + - include: '#function-parameters' + # TODO: return type of the arrow + # arrow operator for anything that doesnt get captured by above regex + - name: storage.type.function.arrow.tsx + match: => + # body + - include: '#arrow-body' + paren-expression: begin: \( beginCaptures: diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index b6ae15ee..ebb447d5 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -180,6 +180,78 @@ + arrow-function + + patterns + + + captures + + 1 + + name + storage.modifier.async.tsx + + + match + (\basync)(?=\s*[<(]) + name + meta.arrow.ts + + + captures + + 1 + + name + variable.parameter.tsx + + 2 + + name + storage.type.function.arrow.tsx + + + match + ([_$[:alpha:]][_$[:alnum:]]*)\s*(=>) + name + meta.arrow.tsx + + + begin + (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)\s*=>) + end + => + endCaptures + + 0 + + name + storage.type.function.arrow.tsx + + + name + meta.arrow.tsx + patterns + + + include + #function-parameters + + + + + match + => + name + storage.type.function.arrow.tsx + + + include + #arrow-body + + + boolean-literal patterns @@ -1061,19 +1133,19 @@ include - #paren-expression + #arrow-function include - #ternary-expression + #paren-expression include - #new-expr + #ternary-expression include - #arrow-body + #new-expr include @@ -1083,10 +1155,6 @@ include #expression-operator - - include - #imply-operator - include #operators @@ -1415,13 +1483,6 @@ - imply-operator - - match - => - name - storage.type.function.arrow.tsx - import-declaration begin @@ -3726,7 +3787,7 @@ begin : end - (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[a-zA-Z_$])\s*(?=\{) + (?=$|[,);\}\]]|//)|(?==[^>])|(?<=[\}>\]\)]|[_$[:alpha:]])\s*(?=\{) name meta.type.annotation.tsx patterns diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index 1bc369de..84471beb 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -94,17 +94,35 @@ function f(x: string | ((value: string) => number)) { ^^^^^^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.brace.round.ts - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.parameters.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.parameters.ts + ^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts storage.type.function.arrow.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts storage.type.function.arrow.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts ^ diff --git a/tests/baselines/Issue115.baseline.txt b/tests/baselines/Issue115.baseline.txt new file mode 100644 index 00000000..0d530b38 --- /dev/null +++ b/tests/baselines/Issue115.baseline.txt @@ -0,0 +1,320 @@ +original file +----------------------------------- +class Foo { + bar(a: Foo, b: string) { } +} + +function foo(a: Foo, b: string) { } + +const bar = function (a: Foo, b: string) { } + +const baz = (a: Foo, b: string) => { }; + +const qux = { + bar(a: Foo, b: string) { }, + set bar2(x: string) { } +} +----------------------------------- + +>class Foo { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> bar(a: Foo, b: string) { } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>function foo(a: Foo, b: string) { } + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^^^ + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.function.ts meta.parameters.ts + ^ + source.ts meta.function.ts meta.parameters.ts + ^ + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>const bar = function (a: Foo, b: string) { } + ^^^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts +> + ^^ + source.ts +>const baz = (a: Foo, b: string) => { }; + ^^^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.type.function.arrow.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + ^^^ + source.ts +> + ^^ + source.ts +>const qux = { + ^^^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts +> bar(a: Foo, b: string) { }, + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts +> set bar2(x: string) { } + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts storage.type.property.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts +>} + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue119.baseline.txt b/tests/baselines/Issue119.baseline.txt new file mode 100644 index 00000000..53d4d569 --- /dev/null +++ b/tests/baselines/Issue119.baseline.txt @@ -0,0 +1,112 @@ +original file +----------------------------------- +class x { + public SomeMethod() { + } + public OtherMethod() { } + + public SomeMethod = () => { } +} +----------------------------------- + +>class x { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public SomeMethod() { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public OtherMethod() { } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public SomeMethod = () => { } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts storage.type.function.arrow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue172.baseline.txt b/tests/baselines/Issue172.baseline.txt new file mode 100644 index 00000000..9c79ab15 --- /dev/null +++ b/tests/baselines/Issue172.baseline.txt @@ -0,0 +1,74 @@ +original file +----------------------------------- +let f = async (x) => {}; +let f2 = async function(x) {}; +----------------------------------- + +>let f = async (x) => {}; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.modifier.async.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.type.function.arrow.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + ^^^ + source.ts +>let f2 = async function(x) {}; + ^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts storage.modifier.async.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/Issue177.baseline.txt b/tests/baselines/Issue177.baseline.txt new file mode 100644 index 00000000..3176cd4f --- /dev/null +++ b/tests/baselines/Issue177.baseline.txt @@ -0,0 +1,48 @@ +original file +----------------------------------- +() => (/s/); +() => /s/; +----------------------------------- + +>() => (/s/); + ^ + source.ts meta.brace.round.ts + ^ + source.ts meta.brace.round.ts + ^ + source.ts + ^^ + source.ts storage.type.function.arrow.ts + ^ + source.ts + ^ + source.ts meta.brace.round.ts + ^ + source.ts string.regex.ts punctuation.definition.string.begin.ts + ^ + source.ts string.regex.ts + ^ + source.ts string.regex.ts punctuation.definition.string.end.ts + ^ + source.ts meta.brace.round.ts + ^^^ + source.ts +>() => /s/; + ^ + source.ts meta.brace.round.ts + ^ + source.ts meta.brace.round.ts + ^ + source.ts + ^^ + source.ts storage.type.function.arrow.ts + ^ + source.ts string.regex.ts + ^ + source.ts string.regex.ts punctuation.definition.string.begin.ts + ^ + source.ts string.regex.ts + ^ + source.ts string.regex.ts punctuation.definition.string.end.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/Issue186.baseline.txt b/tests/baselines/Issue186.baseline.txt index e3c99f3b..54ea9cc3 100644 --- a/tests/baselines/Issue186.baseline.txt +++ b/tests/baselines/Issue186.baseline.txt @@ -67,17 +67,17 @@ function myFunction(param1, param2, number, string, boolean) { ^ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts ^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^^^^^^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts ^^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts storage.type.function.arrow.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts ^ diff --git a/tests/baselines/Issue187.baseline.txt b/tests/baselines/Issue187.baseline.txt new file mode 100644 index 00000000..bf4d8b49 --- /dev/null +++ b/tests/baselines/Issue187.baseline.txt @@ -0,0 +1,106 @@ +original file +----------------------------------- +const trim = module.exports = str => trim.trailing(trim.leading(str)); + +const trim = module.exports = function(str) { + return trim.trailing(trim.leading(str)); +} +----------------------------------- + +>const trim = module.exports = str => trim.trailing(trim.leading(str)); + ^^^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.type.function.arrow.ts + ^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + ^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + ^^^ + source.ts +> + ^^ + source.ts +>const trim = module.exports = function(str) { + ^^^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts +> return trim.trailing(trim.leading(str)); + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts keyword.control.flow.ts + ^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts meta.brace.round.ts + ^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts meta.brace.round.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index ce5beed2..5b10750b 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -129,18 +129,26 @@ class Thing<^^T, ^^U> { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts - ^^ + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts - ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ @@ -297,18 +305,26 @@ class Thing<^^T, ^^U> { source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts - ^^ + ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts - ^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts storage.type.function.arrow.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts storage.type.function.arrow.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^ diff --git a/tests/baselines/Issue22.baseline.txt b/tests/baselines/Issue22.baseline.txt new file mode 100644 index 00000000..638ebfbe --- /dev/null +++ b/tests/baselines/Issue22.baseline.txt @@ -0,0 +1,50 @@ +original file +----------------------------------- +app.get('/test/', (req, res) => { +}); +----------------------------------- + +>app.get('/test/', (req, res) => { + ^^^^^^^ + source.ts + ^ + source.ts meta.brace.round.ts + ^ + source.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^^ + source.ts string.quoted.single.ts + ^ + source.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^ + source.ts + ^ + source.ts meta.arrow.ts + ^ + source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^^^ + source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.arrow.ts meta.parameters.ts + ^ + source.ts meta.arrow.ts meta.parameters.ts + ^^^ + source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.arrow.ts + ^^ + source.ts meta.arrow.ts storage.type.function.arrow.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.block.ts +>}); + ^ + source.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.brace.round.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/Issue226.baseline.txt b/tests/baselines/Issue226.baseline.txt new file mode 100644 index 00000000..6b41ff89 --- /dev/null +++ b/tests/baselines/Issue226.baseline.txt @@ -0,0 +1,70 @@ +original file +----------------------------------- +async function x() { + +} +const y = async () => { } +----------------------------------- + +>async function x() { + ^^^^^ + source.ts meta.function.ts storage.modifier.async.ts + ^ + source.ts meta.function.ts + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts +> + ^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +>const y = async () => { } + ^^^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.modifier.async.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.type.function.arrow.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue249.baseline.txt b/tests/baselines/Issue249.baseline.txt new file mode 100644 index 00000000..592411fd --- /dev/null +++ b/tests/baselines/Issue249.baseline.txt @@ -0,0 +1,108 @@ +original file +----------------------------------- +const selectDictionary = (dictionaries: StoredDictionaries, lang:string) => { + +} + +function selectDictionary(dictionaries: StoredDictionaries, lang:string) { + +} +----------------------------------- + +>const selectDictionary = (dictionaries: StoredDictionaries, lang:string) => { + ^^^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts + ^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.type.function.arrow.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts +> + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts +>} + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts +> + ^^ + source.ts +>function selectDictionary(dictionaries: StoredDictionaries, lang:string) { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^^^^^^^^^^^^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^^^^^^^^^^^^ + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^^^^^^^^^^^^^ + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.function.ts meta.parameters.ts + ^ + source.ts meta.function.ts meta.parameters.ts + ^^^^ + source.ts meta.function.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts +> + ^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue42.baseline.txt b/tests/baselines/Issue42.baseline.txt new file mode 100644 index 00000000..252eca18 --- /dev/null +++ b/tests/baselines/Issue42.baseline.txt @@ -0,0 +1,80 @@ +original file +----------------------------------- + return this.travelWorld((cell: Cell) => { + cell.live = Math.random() < this.initialLifeProbability; + return cell; + }); +----------------------------------- + +> return this.travelWorld((cell: Cell) => { + ^^^^^^^^^^^^ + source.ts + ^^^^^^ + source.ts keyword.control.flow.ts + ^ + source.ts + ^^^^ + source.ts variable.language.this.ts + ^^^^^^^^^^^^ + source.ts + ^ + source.ts meta.brace.round.ts + ^ + source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^^^^ + source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts + ^^^^ + source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.arrow.ts + ^^ + source.ts meta.arrow.ts storage.type.function.arrow.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.block.ts +> cell.live = Math.random() < this.initialLifeProbability; + ^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts keyword.operator.assignment.ts + ^^^^^^^^^^^^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts meta.brace.round.ts + ^ + source.ts meta.block.ts meta.brace.round.ts + ^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts keyword.operator.relational.ts + ^ + source.ts meta.block.ts + ^^^^ + source.ts meta.block.ts variable.language.this.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.block.ts +> return cell; + ^^^^^^^^^^^^^^^^ + source.ts meta.block.ts + ^^^^^^ + source.ts meta.block.ts keyword.control.flow.ts + ^^^^^^^^ + source.ts meta.block.ts +> }); + ^^^^^^^^^^^^ + source.ts meta.block.ts + ^ + source.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.brace.round.ts + ^^ + source.ts \ No newline at end of file diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index f94be92b..39ed2446 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -140,15 +140,15 @@ var ^^obj = { ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts storage.type.function.arrow.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.type.function.arrow.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts ^ diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index ab298a71..88b460f6 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -227,26 +227,30 @@ class Test { source.ts meta.function.ts meta.block.ts ^ source.ts meta.function.ts meta.block.ts meta.brace.round.ts - ^^^^^ - source.ts meta.function.ts meta.block.ts + ^^^^ + source.ts meta.function.ts meta.block.ts meta.arrow.ts variable.parameter.ts + ^ + source.ts meta.function.ts meta.block.ts meta.arrow.ts ^^ - source.ts meta.function.ts meta.block.ts storage.type.function.arrow.ts + source.ts meta.function.ts meta.block.ts meta.arrow.ts storage.type.function.arrow.ts ^^^^^^^^^^^^ source.ts meta.function.ts meta.block.ts ^ source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^ source.ts meta.function.ts meta.block.ts meta.brace.round.ts - ^^ + ^ source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.arrow.ts ^ - source.ts meta.function.ts meta.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ - source.ts meta.function.ts meta.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts ^ - source.ts meta.function.ts meta.block.ts + source.ts meta.function.ts meta.block.ts meta.arrow.ts ^^ - source.ts meta.function.ts meta.block.ts storage.type.function.arrow.ts + source.ts meta.function.ts meta.block.ts meta.arrow.ts storage.type.function.arrow.ts ^ source.ts meta.function.ts meta.block.ts ^^^^^ diff --git a/tests/cases/Issue115.ts b/tests/cases/Issue115.ts new file mode 100644 index 00000000..f0d1af43 --- /dev/null +++ b/tests/cases/Issue115.ts @@ -0,0 +1,14 @@ +class Foo { + bar(a: Foo, b: string) { } +} + +function foo(a: Foo, b: string) { } + +const bar = function (a: Foo, b: string) { } + +const baz = (a: Foo, b: string) => { }; + +const qux = { + bar(a: Foo, b: string) { }, + set bar2(x: string) { } +} \ No newline at end of file diff --git a/tests/cases/Issue119.ts b/tests/cases/Issue119.ts new file mode 100644 index 00000000..b69c320a --- /dev/null +++ b/tests/cases/Issue119.ts @@ -0,0 +1,7 @@ +class x { + public SomeMethod() { + } + public OtherMethod() { } + + public SomeMethod = () => { } +} \ No newline at end of file diff --git a/tests/cases/Issue172.ts b/tests/cases/Issue172.ts new file mode 100644 index 00000000..3189d48a --- /dev/null +++ b/tests/cases/Issue172.ts @@ -0,0 +1,2 @@ +let f = async (x) => {}; +let f2 = async function(x) {}; \ No newline at end of file diff --git a/tests/cases/Issue177.ts b/tests/cases/Issue177.ts new file mode 100644 index 00000000..c9c9374b --- /dev/null +++ b/tests/cases/Issue177.ts @@ -0,0 +1,2 @@ +() => (/s/); +() => /s/; \ No newline at end of file diff --git a/tests/cases/Issue187.ts b/tests/cases/Issue187.ts new file mode 100644 index 00000000..d5a78375 --- /dev/null +++ b/tests/cases/Issue187.ts @@ -0,0 +1,5 @@ +const trim = module.exports = str => trim.trailing(trim.leading(str)); + +const trim = module.exports = function(str) { + return trim.trailing(trim.leading(str)); +} \ No newline at end of file diff --git a/tests/cases/Issue22.ts b/tests/cases/Issue22.ts new file mode 100644 index 00000000..1ec88268 --- /dev/null +++ b/tests/cases/Issue22.ts @@ -0,0 +1,2 @@ +app.get('/test/', (req, res) => { +}); \ No newline at end of file diff --git a/tests/cases/Issue226.ts b/tests/cases/Issue226.ts new file mode 100644 index 00000000..0d2792e9 --- /dev/null +++ b/tests/cases/Issue226.ts @@ -0,0 +1,4 @@ +async function x() { + +} +const y = async () => { } \ No newline at end of file diff --git a/tests/cases/Issue249.ts b/tests/cases/Issue249.ts new file mode 100644 index 00000000..2c69051f --- /dev/null +++ b/tests/cases/Issue249.ts @@ -0,0 +1,7 @@ +const selectDictionary = (dictionaries: StoredDictionaries, lang:string) => { + +} + +function selectDictionary(dictionaries: StoredDictionaries, lang:string) { + +} \ No newline at end of file diff --git a/tests/cases/Issue42.ts b/tests/cases/Issue42.ts new file mode 100644 index 00000000..2d8a0d1d --- /dev/null +++ b/tests/cases/Issue42.ts @@ -0,0 +1,4 @@ + return this.travelWorld((cell: Cell) => { + cell.live = Math.random() < this.initialLifeProbability; + return cell; + }); \ No newline at end of file From b0e78c0c545a73e3a98402cc48de1b11ae0ace23 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 11 Aug 2016 15:38:31 -0700 Subject: [PATCH 42/77] Generate the marker file only if there are any markers in the file --- tests/build.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/build.ts b/tests/build.ts index a284256b..914f8ef2 100644 --- a/tests/build.ts +++ b/tests/build.ts @@ -35,9 +35,11 @@ function getScopesAtMarkers(text: string, grammar: vt.IGrammar): string { let oriLines = text.split('\n'); let ruleStack:vt.StackElement[] = undefined; let outputLines: string[] = []; + let markers = 0; for (let i in oriLines) { let oriLine = oriLines[i]; let markerLocations = getMarkerLocations(oriLine); + markers += markerLocations.length; let line = oriLine.split(marker).join(''); let lineTokens = grammar.tokenizeLine(line, ruleStack); ruleStack = lineTokens.ruleStack; @@ -52,7 +54,7 @@ function getScopesAtMarkers(text: string, grammar: vt.IGrammar): string { } } - return getInputFile(oriLines) + outputLines.join('\n'); + return markers ? (getInputFile(oriLines) + outputLines.join('\n')) : null; } function writeTokenLine(token: vt.IToken, preTextForToken: string, postTextForToken: string, outputLines: string[]) { @@ -97,7 +99,10 @@ for (var fileName of fs.readdirSync('cases')) { fs.mkdirSync('generated'); } let outputFileName = path.join('./generated', parsedFileName.name + '.txt'); - fs.writeFile(outputFileName, getScopesAtMarkers(text, grammar), "utf8"); + let scopesFileText = getScopesAtMarkers(text, grammar); + if (scopesFileText) { + fs.writeFile(outputFileName, getScopesAtMarkers(text, grammar), "utf8"); + } let outputBaselineName = path.join('./generated', parsedFileName.name + '.baseline.txt'); fs.writeFile(outputBaselineName, baselineWholeFile(text, grammar), "utf8"); From d0e25ead219b67601979d84a58f0fe06d894476f Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 30 Aug 2016 12:27:34 -0700 Subject: [PATCH 43/77] Tokenize only once per file --- tests/build.ts | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/tests/build.ts b/tests/build.ts index 914f8ef2..808866a3 100644 --- a/tests/build.ts +++ b/tests/build.ts @@ -31,10 +31,11 @@ function getInputFile(oriLines: string[]): string { "\n-----------------------------------\n\n"; } -function getScopesAtMarkers(text: string, grammar: vt.IGrammar): string { +function getScopesAtMarkers(text: string, grammar: vt.IGrammar): { markerScopes: string, wholeBaseline: string } { let oriLines = text.split('\n'); let ruleStack:vt.StackElement[] = undefined; let outputLines: string[] = []; + let baselineLines: string[] = []; let markers = 0; for (let i in oriLines) { let oriLine = oriLines[i]; @@ -45,16 +46,23 @@ function getScopesAtMarkers(text: string, grammar: vt.IGrammar): string { ruleStack = lineTokens.ruleStack; outputLines.push(">" + line); + baselineLines.push(">" + line); for (let token of lineTokens.tokens) { for (let markerLocation of markerLocations) { if (token.startIndex <= markerLocation && markerLocation < token.endIndex) { writeTokenLine(token, '[' + (parseInt(i) + 1) + ', ' + (markerLocation + 1) + ']: ', ' ', outputLines); } } + + writeTokenLine(token, "", "", baselineLines); } } - return markers ? (getInputFile(oriLines) + outputLines.join('\n')) : null; + const oriLineText = getInputFile(oriLines); + return { + markerScopes: markers ? (oriLineText + outputLines.join('\n')) : null, + wholeBaseline: oriLineText + baselineLines.join('\n') + }; } function writeTokenLine(token: vt.IToken, preTextForToken: string, postTextForToken: string, outputLines: string[]) { @@ -71,26 +79,6 @@ function writeTokenLine(token: vt.IToken, preTextForToken: string, postTextForTo outputLines.push(startingSpaces + preTextForToken + token.scopes.join(' ') + postTextForToken); } -function baselineWholeFile(text: string, grammar: vt.IGrammar): string { - let oriLines = text.split('\n'); - let ruleStack: vt.StackElement[] = undefined; - let outputLines: string[] = []; - for (let i in oriLines) { - let oriLine = oriLines[i]; - let markerLocations = getMarkerLocations(oriLine); - let line = oriLine.split(marker).join(''); - let lineTokens = grammar.tokenizeLine(line, ruleStack); - ruleStack = lineTokens.ruleStack; - - outputLines.push(">" + line); - for (let token of lineTokens.tokens) { - writeTokenLine(token, "", "", outputLines); - } - } - - return getInputFile(oriLines) + outputLines.join('\n'); -} - for (var fileName of fs.readdirSync('cases')) { const text = fs.readFileSync(path.join('./cases', fileName), 'utf8'); let parsedFileName = path.parse(fileName); @@ -99,11 +87,11 @@ for (var fileName of fs.readdirSync('cases')) { fs.mkdirSync('generated'); } let outputFileName = path.join('./generated', parsedFileName.name + '.txt'); - let scopesFileText = getScopesAtMarkers(text, grammar); - if (scopesFileText) { - fs.writeFile(outputFileName, getScopesAtMarkers(text, grammar), "utf8"); + const { markerScopes, wholeBaseline } = getScopesAtMarkers(text, grammar); + if (markerScopes) { + fs.writeFile(outputFileName, markerScopes, "utf8"); } let outputBaselineName = path.join('./generated', parsedFileName.name + '.baseline.txt'); - fs.writeFile(outputBaselineName, baselineWholeFile(text, grammar), "utf8"); + fs.writeFile(outputBaselineName, wholeBaseline, "utf8"); } From 82ac7df37156e3a39953c71a42418c4d97949a28 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 30 Aug 2016 16:13:37 -0700 Subject: [PATCH 44/77] Arrow function bodies and minimal return type support --- TypeScript.YAML-tmLanguage | 55 ++-- TypeScript.tmLanguage | 115 ++++---- TypeScriptReact.YAML-tmLanguage | 57 ++-- TypeScriptReact.tmLanguage | 117 +++++---- ...owFunctionInsideTypeAssertion.baseline.txt | 38 +-- tests/baselines/Issue115.baseline.txt | 8 +- tests/baselines/Issue119.baseline.txt | 12 +- tests/baselines/Issue142.baseline.txt | 98 +++++++ tests/baselines/Issue172.baseline.txt | 6 +- tests/baselines/Issue177.baseline.txt | 14 +- tests/baselines/Issue183.baseline.txt | 246 ++++++++++++++++++ tests/baselines/Issue186.baseline.txt | 18 +- tests/baselines/Issue187.baseline.txt | 6 +- tests/baselines/Issue191.baseline.txt | 44 ++-- tests/baselines/Issue191.txt | 12 +- tests/baselines/Issue216.baseline.txt | 116 +++++++++ tests/baselines/Issue22.baseline.txt | 8 +- tests/baselines/Issue226.baseline.txt | 8 +- tests/baselines/Issue249.baseline.txt | 10 +- tests/baselines/Issue42.baseline.txt | 36 +-- .../multipleVariableDeclaration.baseline.txt | 20 +- tests/baselines/pr48_noSemiColon.baseline.txt | 8 +- tests/cases/Issue142.ts | 4 + tests/cases/Issue183.ts | 22 ++ tests/cases/Issue216.ts | 9 + 25 files changed, 801 insertions(+), 286 deletions(-) create mode 100644 tests/baselines/Issue142.baseline.txt create mode 100644 tests/baselines/Issue183.baseline.txt create mode 100644 tests/baselines/Issue216.baseline.txt create mode 100644 tests/cases/Issue142.ts create mode 100644 tests/cases/Issue183.ts create mode 100644 tests/cases/Issue216.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 7935fce0..43e5f1f7 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -462,9 +462,13 @@ repository: '2': { name: keyword.operator.optional.ts } end: '(?=\}|;|,|$)|(?<=\})' patterns: - - include: '#ternary-expression' - - include: '#type-annotation' - - include: '#expression' + - include: '#variable-initializer' + - begin: \G + end: (?!\G)(?=[};,=]|$)|(?<=\}) + patterns: + - include: '#type-annotation' + - include: '#string' + - include: '#comment' method-declaration: name: meta.method.declaration.ts @@ -577,17 +581,6 @@ repository: patterns: - include: '#statements' - arrow-body: - name: meta.block.ts - begin: (?<==>)\s*(\{) - beginCaptures: - '1': { name: punctuation.definition.block.ts } - end: \} - endCaptures: - '0': { name: punctuation.definition.block.ts } - patterns: - - include: '#statements' - after-operator-block: name: meta.object-literal.ts begin: (?<=[=(:,\[?+!]|^|await|return|yield|throw|in|of|typeof|&&|\|\|)\s*(\{) @@ -977,23 +970,33 @@ repository: '1': { name: storage.modifier.async.ts } # paramters of the arrow - name: meta.arrow.ts - match: ([_$[:alpha:]][_$[:alnum:]]*)\s*(=>) + match: ([_$[:alpha:]][_$[:alnum:]]*)\s*(?==>) captures: '1': { name: variable.parameter.ts } - '2': { name: storage.type.function.arrow.ts } - name: meta.arrow.ts - begin: (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)\s*=>) - end: => - endCaptures: - '0': { name: storage.type.function.arrow.ts } + begin: (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>) + end: (?==>) patterns: - include: '#function-parameters' - # TODO: return type of the arrow - # arrow operator for anything that doesnt get captured by above regex - - name: storage.type.function.arrow.ts - match: => - # body - - include: '#arrow-body' + # return type of the arrow + - include: '#arrow-return-type' + # arrow operator + - name: meta.arrow.ts + begin: => + beginCaptures: + '0': { name: storage.type.function.arrow.ts } + end: (?<=\})|((?!\{)(?=\S)) + patterns: + - include: '#decl-block' + - include: '#expression' + + arrow-return-type: + name: meta.return.type.arrow.ts + begin: '(?<=\))\s*:' + end: (?|;|//)) + patterns: + # TODO: handle the fn and constructor type specifically. + - include: '#type' paren-expression: begin: \( diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index 5d7b0811..cf5aeda9 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -148,38 +148,6 @@ - arrow-body - - begin - (?<==>)\s*(\{) - beginCaptures - - 1 - - name - punctuation.definition.block.ts - - - end - \} - endCaptures - - 0 - - name - punctuation.definition.block.ts - - - name - meta.block.ts - patterns - - - include - #statements - - - arrow-function patterns @@ -206,23 +174,35 @@ name variable.parameter.ts - 2 - - name - storage.type.function.arrow.ts - match - ([_$[:alpha:]][_$[:alnum:]]*)\s*(=>) + ([_$[:alpha:]][_$[:alnum:]]*)\s*(?==>) name meta.arrow.ts begin - (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)\s*=>) + (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>) end + (?==>) + name + meta.arrow.ts + patterns + + + include + #function-parameters + + + include + #arrow-return-type + + + + + begin => - endCaptures + beginCaptures 0 @@ -230,25 +210,37 @@ storage.type.function.arrow.ts + end + (?<=\})|((?!\{)(?=\S)) name meta.arrow.ts patterns include - #function-parameters + #decl-block + + + include + #expression - - match - => - name - storage.type.function.arrow.ts - + + + arrow-return-type + + begin + (?<=\))\s*: + end + (?<!:)((?=$)|(?==>|;|//)) + name + meta.return.type.arrow.ts + patterns + include - #arrow-body + #type @@ -1282,15 +1274,28 @@ include - #ternary-expression - - - include - #type-annotation + #variable-initializer - include - #expression + begin + \G + end + (?!\G)(?=[};,=]|$)|(?<=\}) + patterns + + + include + #type-annotation + + + include + #string + + + include + #comment + + diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index fe79eee9..ac891c4a 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -466,9 +466,13 @@ repository: '2': { name: keyword.operator.optional.tsx } end: '(?=\}|;|,|$)|(?<=\})' patterns: - - include: '#ternary-expression' - - include: '#type-annotation' - - include: '#expression' + - include: '#variable-initializer' + - begin: \G + end: (?!\G)(?=[};,=]|$)|(?<=\}) + patterns: + - include: '#type-annotation' + - include: '#string' + - include: '#comment' method-declaration: name: meta.method.declaration.tsx @@ -581,17 +585,6 @@ repository: patterns: - include: '#statements' - arrow-body: - name: meta.block.tsx - begin: (?<==>)\s*(\{) - beginCaptures: - '1': { name: punctuation.definition.block.tsx } - end: \} - endCaptures: - '0': { name: punctuation.definition.block.tsx } - patterns: - - include: '#statements' - after-operator-block: name: meta.object-literal.tsx begin: (?<=[=(:,\[?+!]|^|await|return|yield|throw|in|of|typeof|&&|\|\|)\s*(\{) @@ -961,29 +954,39 @@ repository: arrow-function: patterns: # TODO: type parameter of arrow - - name: meta.arrow.ts + - name: meta.arrow.tsx match: (\basync)(?=\s*[<(]) captures: '1': { name: storage.modifier.async.tsx } # paramters of the arrow - name: meta.arrow.tsx - match: ([_$[:alpha:]][_$[:alnum:]]*)\s*(=>) + match: ([_$[:alpha:]][_$[:alnum:]]*)\s*(?==>) captures: '1': { name: variable.parameter.tsx } - '2': { name: storage.type.function.arrow.tsx } - name: meta.arrow.tsx - begin: (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)\s*=>) - end: => - endCaptures: - '0': { name: storage.type.function.arrow.tsx } + begin: (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>) + end: (?==>) patterns: - include: '#function-parameters' - # TODO: return type of the arrow - # arrow operator for anything that doesnt get captured by above regex - - name: storage.type.function.arrow.tsx - match: => - # body - - include: '#arrow-body' + # return type of the arrow + - include: '#arrow-return-type' + # arrow operator + - name: meta.arrow.tsx + begin: => + beginCaptures: + '0': { name: storage.type.function.arrow.tsx } + end: (?<=\})|((?!\{)(?=\S)) + patterns: + - include: '#decl-block' + - include: '#expression' + + arrow-return-type: + name: meta.return.type.arrow.tsx + begin: '(?<=\))\s*:' + end: (?|;|//)) + patterns: + # TODO: handle the fn and constructor type specifically. + - include: '#type' paren-expression: begin: \( diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index ebb447d5..ff765d35 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -148,38 +148,6 @@ - arrow-body - - begin - (?<==>)\s*(\{) - beginCaptures - - 1 - - name - punctuation.definition.block.tsx - - - end - \} - endCaptures - - 0 - - name - punctuation.definition.block.tsx - - - name - meta.block.tsx - patterns - - - include - #statements - - - arrow-function patterns @@ -196,7 +164,7 @@ match (\basync)(?=\s*[<(]) name - meta.arrow.ts + meta.arrow.tsx captures @@ -206,23 +174,35 @@ name variable.parameter.tsx - 2 - - name - storage.type.function.arrow.tsx - match - ([_$[:alpha:]][_$[:alnum:]]*)\s*(=>) + ([_$[:alpha:]][_$[:alnum:]]*)\s*(?==>) name meta.arrow.tsx begin - (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)\s*=>) + (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>) end + (?==>) + name + meta.arrow.tsx + patterns + + + include + #function-parameters + + + include + #arrow-return-type + + + + + begin => - endCaptures + beginCaptures 0 @@ -230,25 +210,37 @@ storage.type.function.arrow.tsx + end + (?<=\})|((?!\{)(?=\S)) name meta.arrow.tsx patterns include - #function-parameters + #decl-block + + + include + #expression - - match - => - name - storage.type.function.arrow.tsx - + + + arrow-return-type + + begin + (?<=\))\s*: + end + (?<!:)((?=$)|(?==>|;|//)) + name + meta.return.type.arrow.tsx + patterns + include - #arrow-body + #type @@ -1250,15 +1242,28 @@ include - #ternary-expression - - - include - #type-annotation + #variable-initializer - include - #expression + begin + \G + end + (?!\G)(?=[};,=]|$)|(?<=\}) + patterns + + + include + #type-annotation + + + include + #string + + + include + #comment + + diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index 84471beb..d06e5b56 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -124,47 +124,47 @@ function f(x: string | ((value: string) => number)) { ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + 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.definition.block.ts > if (domNode.style.display !== desiredValue) { ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts + 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 ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts keyword.control.conditional.ts + 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.control.conditional.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts + 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 ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.brace.round.ts + 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 ^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts + 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 ^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts keyword.operator.comparison.ts + 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 ^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts + 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 ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.brace.round.ts + 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 ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts + 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 ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.block.ts punctuation.definition.block.ts + 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 > domNode.style.display = desiredValue; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.block.ts + 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 ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.block.ts keyword.operator.assignment.ts + 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 ^^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.block.ts + 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 > } ^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.block.ts + 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 ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts meta.block.ts punctuation.definition.block.ts + 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 > } ^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts + 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 ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.block.ts punctuation.definition.block.ts + 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.definition.block.ts >} ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts punctuation.definition.block.ts diff --git a/tests/baselines/Issue115.baseline.txt b/tests/baselines/Issue115.baseline.txt index 0d530b38..97582c9c 100644 --- a/tests/baselines/Issue115.baseline.txt +++ b/tests/baselines/Issue115.baseline.txt @@ -216,13 +216,13 @@ const qux = { ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^^^ source.ts > diff --git a/tests/baselines/Issue119.baseline.txt b/tests/baselines/Issue119.baseline.txt index 53d4d569..51a1e4f5 100644 --- a/tests/baselines/Issue119.baseline.txt +++ b/tests/baselines/Issue119.baseline.txt @@ -98,15 +98,15 @@ class x { ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.block.ts punctuation.definition.block.ts - ^^ - source.ts meta.declaration.object.ts meta.object.body.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts >} ^ source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue142.baseline.txt b/tests/baselines/Issue142.baseline.txt new file mode 100644 index 00000000..a968038f --- /dev/null +++ b/tests/baselines/Issue142.baseline.txt @@ -0,0 +1,98 @@ +original file +----------------------------------- +class x { + abc = () => + this.func(this.arr.concat(['one 1', 'two 2', 'three 3'])); +} + +----------------------------------- + +>class x { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> abc = () => + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts storage.type.function.arrow.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts +> this.func(this.arr.concat(['one 1', 'two 2', 'three 3'])); + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.language.this.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.language.this.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^ + source.ts \ No newline at end of file diff --git a/tests/baselines/Issue172.baseline.txt b/tests/baselines/Issue172.baseline.txt index 9c79ab15..271e1dd6 100644 --- a/tests/baselines/Issue172.baseline.txt +++ b/tests/baselines/Issue172.baseline.txt @@ -32,11 +32,11 @@ let f2 = async function(x) {}; ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^^^ source.ts >let f2 = async function(x) {}; diff --git a/tests/baselines/Issue177.baseline.txt b/tests/baselines/Issue177.baseline.txt index 3176cd4f..669c8147 100644 --- a/tests/baselines/Issue177.baseline.txt +++ b/tests/baselines/Issue177.baseline.txt @@ -12,9 +12,9 @@ original file ^ source.ts ^^ - source.ts storage.type.function.arrow.ts + source.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts + source.ts meta.arrow.ts ^ source.ts meta.brace.round.ts ^ @@ -35,14 +35,14 @@ original file ^ source.ts ^^ - source.ts storage.type.function.arrow.ts + source.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts string.regex.ts + source.ts meta.arrow.ts string.regex.ts ^ - source.ts string.regex.ts punctuation.definition.string.begin.ts + source.ts meta.arrow.ts string.regex.ts punctuation.definition.string.begin.ts ^ - source.ts string.regex.ts + source.ts meta.arrow.ts string.regex.ts ^ - source.ts string.regex.ts punctuation.definition.string.end.ts + source.ts meta.arrow.ts string.regex.ts punctuation.definition.string.end.ts ^^ source.ts \ No newline at end of file diff --git a/tests/baselines/Issue183.baseline.txt b/tests/baselines/Issue183.baseline.txt new file mode 100644 index 00000000..17d73479 --- /dev/null +++ b/tests/baselines/Issue183.baseline.txt @@ -0,0 +1,246 @@ +original file +----------------------------------- +class Sample2 +{ + constructor() + { + } + + callback = (): void => + { + } + + public method1(): void + { + } + private method2 () : number + { + return 2; + } + method3 () : string + { + return "method3"; + } +} +----------------------------------- + +>class Sample2 + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^^ + source.ts meta.declaration.object.ts +>{ + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> constructor() + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts +> { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> callback = (): void => + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.return.type.arrow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.return.type.arrow.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.return.type.arrow.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.return.type.arrow.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts storage.type.function.arrow.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts +> { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts +> + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public method1(): void + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts +> { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> private method2 () : number + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts +> { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> return 2; + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> method3 () : string + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts +> { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> return "method3"; + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue186.baseline.txt b/tests/baselines/Issue186.baseline.txt index 54ea9cc3..a4ba198c 100644 --- a/tests/baselines/Issue186.baseline.txt +++ b/tests/baselines/Issue186.baseline.txt @@ -79,25 +79,25 @@ function myFunction(param1, param2, number, string, boolean) { ^^ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts ^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts > console.log(param1); ^^^^^^^^^^^^^^^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^^^^^^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.round.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts > } ^^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts > console.log(param1); ^^^^^^^^^^^^^ source.ts meta.function.ts meta.block.ts diff --git a/tests/baselines/Issue187.baseline.txt b/tests/baselines/Issue187.baseline.txt index bf4d8b49..75ca339f 100644 --- a/tests/baselines/Issue187.baseline.txt +++ b/tests/baselines/Issue187.baseline.txt @@ -30,8 +30,10 @@ const trim = module.exports = function(str) { source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.type.function.arrow.ts - ^^^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts + ^^^^^^^^^^^^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^^^^^^^^^^^ diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index 5b10750b..e91d978c 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -150,29 +150,29 @@ class Thing<^^T, ^^U> { ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts string.template.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts string.template.ts punctuation.definition.string.template.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts > }) ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts > }; @@ -326,29 +326,29 @@ class Thing<^^T, ^^U> { ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.begin.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts string.template.ts punctuation.definition.string.template.begin.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts string.template.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts punctuation.definition.string.template.end.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts string.template.ts punctuation.definition.string.template.end.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts > }) ^^^^^^^^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts > }; diff --git a/tests/baselines/Issue191.txt b/tests/baselines/Issue191.txt index da52243e..86ed30a1 100644 --- a/tests/baselines/Issue191.txt +++ b/tests/baselines/Issue191.txt @@ -53,11 +53,11 @@ class Thing<^^T, ^^U> { [5, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - [6, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts + [6, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - [6, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts + [6, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts string.template.ts ^ - [6, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts + [6, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts meta.brace.round.ts > }) > }; >} @@ -97,11 +97,11 @@ class Thing<^^T, ^^U> { [15, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts > process.stuout.write(`Watching for changes in:`); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - [16, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts + [16, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts ^^^^^^^^^^^^^^^^^^^^^^^^ - [16, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts + [16, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts string.template.ts ^ - [16, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts + [16, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts meta.brace.round.ts > }) > }; >} diff --git a/tests/baselines/Issue216.baseline.txt b/tests/baselines/Issue216.baseline.txt new file mode 100644 index 00000000..f686fb73 --- /dev/null +++ b/tests/baselines/Issue216.baseline.txt @@ -0,0 +1,116 @@ +original file +----------------------------------- +class MyType +{ + public myFunction = (): void => + { + // From this point on the syntax highlighting will be confused as to where it is. + var myVar = 5; + console.log("Hello there!"); + } +} +----------------------------------- + +>class MyType + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^^ + source.ts meta.declaration.object.ts +>{ + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> public myFunction = (): void => + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts keyword.operator.assignment.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.return.type.arrow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.return.type.arrow.ts + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.return.type.arrow.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.return.type.arrow.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts storage.type.function.arrow.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts +> { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts +> // From this point on the syntax highlighting will be confused as to where it is. + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts punctuation.whitespace.comment.leading.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts comment.line.double-slash.ts punctuation.definition.comment.ts + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts comment.line.double-slash.ts +> var myVar = 5; + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts meta.var.expr.ts + ^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts +> console.log("Hello there!"); + ^^^^^^^^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + ^^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts string.quoted.double.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts meta.brace.round.ts + ^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue22.baseline.txt b/tests/baselines/Issue22.baseline.txt index 638ebfbe..e056b24a 100644 --- a/tests/baselines/Issue22.baseline.txt +++ b/tests/baselines/Issue22.baseline.txt @@ -36,14 +36,14 @@ app.get('/test/', (req, res) => { ^^ source.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts meta.block.ts + source.ts meta.arrow.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.block.ts + source.ts meta.arrow.ts meta.block.ts >}); ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.brace.round.ts ^^ diff --git a/tests/baselines/Issue226.baseline.txt b/tests/baselines/Issue226.baseline.txt index 6b41ff89..c5756209 100644 --- a/tests/baselines/Issue226.baseline.txt +++ b/tests/baselines/Issue226.baseline.txt @@ -61,10 +61,10 @@ const y = async () => { } ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue249.baseline.txt b/tests/baselines/Issue249.baseline.txt index 592411fd..92355094 100644 --- a/tests/baselines/Issue249.baseline.txt +++ b/tests/baselines/Issue249.baseline.txt @@ -49,17 +49,17 @@ function selectDictionary(dictionaries: StoredDictionaries, lang:string) { ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts > ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts >} ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts > diff --git a/tests/baselines/Issue42.baseline.txt b/tests/baselines/Issue42.baseline.txt index 252eca18..f6d5b3c0 100644 --- a/tests/baselines/Issue42.baseline.txt +++ b/tests/baselines/Issue42.baseline.txt @@ -36,44 +36,44 @@ original file ^^ source.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts meta.block.ts + source.ts meta.arrow.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^^ - source.ts meta.block.ts + source.ts meta.arrow.ts meta.block.ts > cell.live = Math.random() < this.initialLifeProbability; ^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.block.ts + source.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.block.ts keyword.operator.assignment.ts + source.ts meta.arrow.ts meta.block.ts keyword.operator.assignment.ts ^^^^^^^^^^^^ - source.ts meta.block.ts + source.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.block.ts meta.brace.round.ts + source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.block.ts meta.brace.round.ts + source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.block.ts + source.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.block.ts keyword.operator.relational.ts + source.ts meta.arrow.ts meta.block.ts keyword.operator.relational.ts ^ - source.ts meta.block.ts + source.ts meta.arrow.ts meta.block.ts ^^^^ - source.ts meta.block.ts variable.language.this.ts + source.ts meta.arrow.ts meta.block.ts variable.language.this.ts ^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.ts meta.block.ts + source.ts meta.arrow.ts meta.block.ts > return cell; ^^^^^^^^^^^^^^^^ - source.ts meta.block.ts + source.ts meta.arrow.ts meta.block.ts ^^^^^^ - source.ts meta.block.ts keyword.control.flow.ts + source.ts meta.arrow.ts meta.block.ts keyword.control.flow.ts ^^^^^^^^ - source.ts meta.block.ts + source.ts meta.arrow.ts meta.block.ts > }); ^^^^^^^^^^^^ - source.ts meta.block.ts + source.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^ source.ts meta.brace.round.ts ^^ diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index 39ed2446..e428e9de 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -150,25 +150,25 @@ var ^^obj = { ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^^^^^^^^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts string.quoted.double.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.round.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts ^^ source.ts meta.var.expr.ts ^^ diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index 88b460f6..92cf345f 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -233,8 +233,10 @@ class Test { source.ts meta.function.ts meta.block.ts meta.arrow.ts ^^ source.ts meta.function.ts meta.block.ts meta.arrow.ts storage.type.function.arrow.ts - ^^^^^^^^^^^^ - source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.arrow.ts + ^^^^^^^^^^^ + source.ts meta.function.ts meta.block.ts ^ source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^ @@ -252,7 +254,7 @@ class Test { ^^ source.ts meta.function.ts meta.block.ts meta.arrow.ts storage.type.function.arrow.ts ^ - source.ts meta.function.ts meta.block.ts + source.ts meta.function.ts meta.block.ts meta.arrow.ts ^^^^^ source.ts meta.function.ts meta.block.ts constant.language.boolean.false.ts ^ diff --git a/tests/cases/Issue142.ts b/tests/cases/Issue142.ts new file mode 100644 index 00000000..81d2ca45 --- /dev/null +++ b/tests/cases/Issue142.ts @@ -0,0 +1,4 @@ +class x { + abc = () => + this.func(this.arr.concat(['one 1', 'two 2', 'three 3'])); +} diff --git a/tests/cases/Issue183.ts b/tests/cases/Issue183.ts new file mode 100644 index 00000000..45e091f8 --- /dev/null +++ b/tests/cases/Issue183.ts @@ -0,0 +1,22 @@ +class Sample2 +{ + constructor() + { + } + + callback = (): void => + { + } + + public method1(): void + { + } + private method2 () : number + { + return 2; + } + method3 () : string + { + return "method3"; + } +} \ No newline at end of file diff --git a/tests/cases/Issue216.ts b/tests/cases/Issue216.ts new file mode 100644 index 00000000..fec34706 --- /dev/null +++ b/tests/cases/Issue216.ts @@ -0,0 +1,9 @@ +class MyType +{ + public myFunction = (): void => + { + // From this point on the syntax highlighting will be confused as to where it is. + var myVar = 5; + console.log("Hello there!"); + } +} \ No newline at end of file From f01053fb79fde1501ebf4b9788000bdab85284b5 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 31 Aug 2016 11:21:34 -0700 Subject: [PATCH 45/77] Support generators syntax and fix the scoping of type parameter end --- TypeScript.YAML-tmLanguage | 34 +- TypeScript.tmLanguage | 64 ++- TypeScriptReact.YAML-tmLanguage | 32 +- TypeScriptReact.tmLanguage | 64 ++- tests/baselines/Comments.baseline.txt | 32 +- .../FunctionMethodParameters.baseline.txt | 4 +- .../FunctionMethodReturnTypes.baseline.txt | 4 +- tests/baselines/Issue146.baseline.txt | 110 +++++ tests/baselines/Issue191.baseline.txt | 6 +- tests/baselines/Issue208.baseline.txt | 12 +- tests/baselines/Issue63.baseline.txt | 8 +- tests/baselines/TsxSamples.baseline.txt | 2 +- tests/baselines/generator.baseline.txt | 424 ++++++++++++++++++ tests/baselines/pr48_noSemiColon.baseline.txt | 6 +- tests/cases/Issue146.ts | 8 + tests/cases/generator.ts | 20 + 16 files changed, 750 insertions(+), 80 deletions(-) create mode 100644 tests/baselines/Issue146.baseline.txt create mode 100644 tests/baselines/generator.baseline.txt create mode 100644 tests/cases/Issue146.ts create mode 100644 tests/cases/generator.ts diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index 43e5f1f7..b4f843c4 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -185,7 +185,11 @@ repository: - name: keyword.control.loop.ts match: (?)' endCaptures: - '2': { name: punctuation.definition.typeparameters.end.ts } + '1': { name: punctuation.definition.typeparameters.end.ts } patterns: - name: storage.modifier.ts match: '\b(extends)\b' @@ -887,7 +897,7 @@ repository: # If '<' is preceeded by 'return', 'throw', 'yield', or 'await', it's most likely a type assertion # If '=', '(', ',', ':', or '>' are followed by a '<', it is also likely a type assertion as otherwise it would be a syntax error # '<=' and '<<=' are cannot be type assertions, as they are assignment operators. - begin: '(?:(?<=return|throw|yield|await|[=(,:>]))\s*(<)(?!*]))\s*(<)(?!' @@ -974,7 +984,7 @@ repository: captures: '1': { name: variable.parameter.ts } - name: meta.arrow.ts - begin: (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>) + begin: (?x)(?<=return|throw|yield|await|async|[=(,:>*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>) end: (?==>) patterns: - include: '#function-parameters' diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index cf5aeda9..c6380c81 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -27,7 +27,7 @@ after-operator-block begin - (?<=[=(:,\[?+!]|^|await|return|yield|throw|in|of|typeof|&&|\|\|)\s*(\{) + (?<=[=(:,\[?+!]|^|await|return|yield|throw|in|of|typeof|&&|\|\||\*)\s*(\{) beginCaptures 1 @@ -182,7 +182,7 @@ begin - (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>) + (?x)(?<=return|throw|yield|await|async|[=(,:>*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>) end (?==>) name @@ -289,7 +289,7 @@ cast begin - (?:(?<=return|throw|yield|await|[=(,:>]))\s*(<)(?!<?\=) + (?:(?<=return|throw|yield|await|[=(,:>*]))\s*(<)(?!<?\=) beginCaptures 1 @@ -623,10 +623,27 @@ match - (?<!\.)\b(await|return|yield)\b + (?<!\.)\b(await|return)\b name keyword.control.flow.ts + + captures + + 1 + + name + keyword.control.flow.ts + + 2 + + name + keyword.generator.asterisk.ts + + + match + (?<!\.)\b(yield)\b(?:\s*(\*))? + match (?<!\.)\b(case|default|switch)\b @@ -1387,7 +1404,7 @@ function-declaration begin - \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s+([_$[:alpha:]][_$[:alnum:]]*))?\s* + \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s*(\*))?(?:(?:\s+|(?<=\*))([_$[:alpha:]][_$[:alnum:]]*))?\s* beginCaptures 1 @@ -1406,6 +1423,11 @@ storage.type.function.ts 4 + + name + keyword.generator.asterisk.ts + + 5 name entity.name.function.ts @@ -1455,16 +1477,26 @@ 2 name - storage.type.function.ts + storage.modifier.async.ts 3 + + name + storage.type.function.ts + + 4 + + name + keyword.generator.asterisk.ts + + 5 name entity.name.function.ts match - \b(?:(export)\s+)?(function\b)(?:\s+([_$[:alpha:]][_$[:alnum:]]*))?\s* + \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s*(\*))?(?:(?:\s+|(?<=\*))([_$[:alpha:]][_$[:alnum:]]*))?\s* name meta.function.overload.ts @@ -1908,7 +1940,7 @@ method-declaration begin - (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) + (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|((?:(\*)\s*)?((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) beginCaptures 1 @@ -1976,6 +2008,18 @@ (?=\(|\<) patterns + + captures + + 1 + + name + keyword.generator.asterisk.ts + + + match + (\*)\s* + include #string @@ -2013,7 +2057,7 @@ method-overload-declaration begin - (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) + (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|((?:(\*)\s*)?((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) beginCaptures 1 @@ -3632,7 +3676,7 @@ (?=$)|(>) endCaptures - 2 + 1 name punctuation.definition.typeparameters.end.ts diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index ac891c4a..14c187f0 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -189,7 +189,11 @@ repository: - name: keyword.control.loop.tsx match: (?)' endCaptures: - '2': { name: punctuation.definition.typeparameters.end.tsx } + '1': { name: punctuation.definition.typeparameters.end.tsx } patterns: - name: storage.modifier.tsx match: '\b(extends)\b' @@ -964,7 +974,7 @@ repository: captures: '1': { name: variable.parameter.tsx } - name: meta.arrow.tsx - begin: (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>) + begin: (?x)(?<=return|throw|yield|await|async|[=(,:>*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>) end: (?==>) patterns: - include: '#function-parameters' diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index ff765d35..5a856b30 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -27,7 +27,7 @@ after-operator-block begin - (?<=[=(:,\[?+!]|^|await|return|yield|throw|in|of|typeof|&&|\|\|)\s*(\{) + (?<=[=(:,\[?+!]|^|await|return|yield|throw|in|of|typeof|&&|\|\||\*)\s*(\{) beginCaptures 1 @@ -182,7 +182,7 @@ begin - (?x)(?<=return|throw|yield|await|async|[=(,:>])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>) + (?x)(?<=return|throw|yield|await|async|[=(,:>*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>) end (?==>) name @@ -591,10 +591,27 @@ match - (?<!\.)\b(await|return|yield)\b + (?<!\.)\b(await|return)\b name keyword.control.flow.tsx + + captures + + 1 + + name + keyword.control.flow.tsx + + 2 + + name + keyword.generator.asterisk.tsx + + + match + (?<!\.)\b(yield)\b(?:\s*(\*))? + match (?<!\.)\b(case|default|switch)\b @@ -1355,7 +1372,7 @@ function-declaration begin - \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s+([_$[:alpha:]][_$[:alnum:]]*))?\s* + \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s*(\*))?(?:(?:\s+|(?<=\*))([_$[:alpha:]][_$[:alnum:]]*))?\s* beginCaptures 1 @@ -1376,7 +1393,12 @@ 4 name - entity.name.function.tsx + keyword.generator.asterisk.tsx + + 5 + + name + entity.name.function.ts end @@ -1423,16 +1445,26 @@ 2 name - storage.type.function.tsx + storage.modifier.async.tsx 3 + + name + storage.type.function.tsx + + 4 + + name + keyword.generator.asterisk.tsx + + 5 name entity.name.function.tsx match - \b(?:(export)\s+)?(function\b)(?:\s+([_$[:alpha:]][_$[:alnum:]]*))?\s* + \b(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s*(\*))?(?:(?:\s+|(?<=\*))([_$[:alpha:]][_$[:alnum:]]*))?\s* name meta.function.overload.tsx @@ -2305,7 +2337,7 @@ method-declaration begin - (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) + (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|((?:(\*)\s*)?((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) beginCaptures 1 @@ -2373,6 +2405,18 @@ (?=\(|\<) patterns + + captures + + 1 + + name + keyword.generator.asterisk.tsx + + + match + (\*)\s* + include #string @@ -2410,7 +2454,7 @@ method-overload-declaration begin - (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|(((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) + (?:\b(abstract)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?=((\bnew)|(?:\b(constructor)\b)|((?:(\*)\s*)?((?:\b[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[[^\]]*\]))\s*(\??)))?\s*[\(\<]) beginCaptures 1 @@ -4033,7 +4077,7 @@ (?=$)|(>) endCaptures - 2 + 1 name punctuation.definition.typeparameters.end.tsx diff --git a/tests/baselines/Comments.baseline.txt b/tests/baselines/Comments.baseline.txt index 5ead59d7..f8553f29 100644 --- a/tests/baselines/Comments.baseline.txt +++ b/tests/baselines/Comments.baseline.txt @@ -1417,7 +1417,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts ^^^^^^^ @@ -1439,7 +1439,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ @@ -1480,7 +1480,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^^ source.ts meta.declaration.object.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -1504,7 +1504,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ @@ -1545,7 +1545,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts ^^^^^^^ @@ -1569,7 +1569,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ @@ -1610,7 +1610,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts ^^^^^^^ @@ -1636,7 +1636,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.heritage.ts ^ @@ -1677,7 +1677,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts ^^^^^^^ @@ -1699,7 +1699,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.heritage.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^^ source.ts meta.declaration.object.ts meta.object.heritage.ts comment.block.ts punctuation.definition.comment.ts ^^ @@ -1757,7 +1757,7 @@ var x = new ^^/* comments */ String(); ^^^^^^^^ source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts ^ @@ -1780,7 +1780,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ @@ -1830,7 +1830,7 @@ var x = new ^^/* comments */ String(); ^^^^^^^^ source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts ^ @@ -1853,7 +1853,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ @@ -1903,7 +1903,7 @@ var x = new ^^/* comments */ String(); ^^^^^^^^ source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts ^ @@ -1926,7 +1926,7 @@ var x = new ^^/* comments */ String(); ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts ^ diff --git a/tests/baselines/FunctionMethodParameters.baseline.txt b/tests/baselines/FunctionMethodParameters.baseline.txt index a2818e07..8e8015ab 100644 --- a/tests/baselines/FunctionMethodParameters.baseline.txt +++ b/tests/baselines/FunctionMethodParameters.baseline.txt @@ -219,7 +219,7 @@ class testClass { ^^^^^^ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^^ source.ts meta.function.ts meta.parameters.ts > m8: [number, number], @@ -557,7 +557,7 @@ class testClass { ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts > m8: [number, number], diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt index e90ec3f6..ff599c2e 100644 --- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -308,7 +308,7 @@ class TestClass { ^ source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -1170,7 +1170,7 @@ class TestClass { ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts ^ diff --git a/tests/baselines/Issue146.baseline.txt b/tests/baselines/Issue146.baseline.txt new file mode 100644 index 00000000..7d7e1fef --- /dev/null +++ b/tests/baselines/Issue146.baseline.txt @@ -0,0 +1,110 @@ +original file +----------------------------------- +function foo() { + return 'bar'; +} + +function* foo() { + yield 'bar'; + yield* ['bar']; +} +----------------------------------- + +>function foo() { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts + ^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts +> return 'bar'; + ^^^^ + source.ts meta.function.ts meta.block.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^ + source.ts meta.function.ts meta.block.ts string.quoted.single.ts + ^ + source.ts meta.function.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>function* foo() { + ^^^^^^^^ + source.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.function.ts keyword.generator.asterisk.ts + ^ + source.ts meta.function.ts + ^^^ + source.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.function.ts + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.function.ts meta.block.ts +> yield 'bar'; + ^^^^ + source.ts meta.function.ts meta.block.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^ + source.ts meta.function.ts meta.block.ts string.quoted.single.ts + ^ + source.ts meta.function.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^^^ + source.ts meta.function.ts meta.block.ts +> yield* ['bar']; + ^^^^ + source.ts meta.function.ts meta.block.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts keyword.control.flow.ts + ^ + source.ts meta.function.ts meta.block.ts keyword.generator.asterisk.ts + ^ + source.ts meta.function.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts string.quoted.single.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts + ^^^ + source.ts meta.function.ts meta.block.ts +>} + ^ + source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index e91d978c..0ae963f5 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -78,7 +78,7 @@ class Thing<^^T, ^^U> { ^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ @@ -204,7 +204,7 @@ class Thing<^^T, ^^U> { ^ source.ts meta.declaration.object.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.declaration.object.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts ^ @@ -254,7 +254,7 @@ class Thing<^^T, ^^U> { ^^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue208.baseline.txt b/tests/baselines/Issue208.baseline.txt index 40e713c3..23985fdd 100644 --- a/tests/baselines/Issue208.baseline.txt +++ b/tests/baselines/Issue208.baseline.txt @@ -40,7 +40,7 @@ class MyClass { ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ @@ -77,7 +77,7 @@ class MyClass { ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ @@ -134,7 +134,7 @@ class MyClass { ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts ^ @@ -173,7 +173,7 @@ class MyClass { ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts ^ @@ -215,7 +215,7 @@ class MyClass { ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts ^ @@ -250,7 +250,7 @@ class MyClass { ^^^^^^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts + source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue63.baseline.txt b/tests/baselines/Issue63.baseline.txt index d4b75b0a..ff8e514b 100644 --- a/tests/baselines/Issue63.baseline.txt +++ b/tests/baselines/Issue63.baseline.txt @@ -30,7 +30,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.parameters.ts entity.name.type.ts ^ - source.ts meta.type.declaration.ts meta.type.parameters.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.type.declaration.ts ^^ @@ -78,7 +78,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.parameters.ts ^ - source.ts meta.type.declaration.ts meta.type.parameters.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.type.declaration.ts ^^ @@ -196,7 +196,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^^^^ source.ts meta.type.declaration.ts meta.type.parameters.ts meta.type.function.return.ts support.type.primitive.ts ^ - source.ts meta.type.declaration.ts meta.type.parameters.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.type.declaration.ts ^^ @@ -248,7 +248,7 @@ type Callback = ^^(error: Error, value: T) => ^^any ^ source.ts meta.type.declaration.ts meta.type.parameters.ts ^ - source.ts meta.type.declaration.ts meta.type.parameters.ts + source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.type.declaration.ts ^^ diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index 5c2e1a26..7dc557b4 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -83,7 +83,7 @@ var e =
^^^^^ source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx entity.name.type.tsx ^ - source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx + source.tsx meta.declaration.object.tsx meta.object.heritage.tsx meta.type.parameters.tsx punctuation.definition.typeparameters.end.tsx ^ source.tsx meta.declaration.object.tsx meta.object.body.tsx punctuation.definition.block.tsx > render() { diff --git a/tests/baselines/generator.baseline.txt b/tests/baselines/generator.baseline.txt new file mode 100644 index 00000000..00885830 --- /dev/null +++ b/tests/baselines/generator.baseline.txt @@ -0,0 +1,424 @@ +original file +----------------------------------- +module M { + function* f(s: string): Iterable + function* f(s: number): Iterable + function* f(s: any): Iterable { } +} + +const a = 10, b = 10; +class c { + *method() { + } + *[a*b]() { + } + *'some*string'() { + } + * overload(s: string): string + * overload(n: number): number + * overload(sn: T): T { + return sn; + } +} +----------------------------------- + +>module M { + ^^^^^^ + source.ts meta.namespace.declaration.ts storage.type.namespace.ts + ^ + source.ts meta.namespace.declaration.ts + ^ + source.ts meta.namespace.declaration.ts entity.name.type.module.ts + ^ + source.ts meta.namespace.declaration.ts + ^ + source.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.block.ts +> function* f(s: string): Iterable + ^^^^ + source.ts meta.block.ts + ^^^^^^^^ + source.ts meta.block.ts meta.function.ts storage.type.function.ts + ^ + source.ts meta.block.ts meta.function.ts keyword.generator.asterisk.ts + ^ + source.ts meta.block.ts meta.function.ts + ^ + source.ts meta.block.ts meta.function.ts entity.name.function.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts + ^^^^^^^^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts + ^^^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts support.type.primitive.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts +> function* f(s: number): Iterable + ^^^^ + source.ts meta.block.ts meta.function.ts + ^^^^^^^^ + source.ts meta.block.ts meta.function.ts meta.function.overload.ts storage.type.function.ts + ^ + source.ts meta.block.ts meta.function.ts meta.function.overload.ts keyword.generator.asterisk.ts + ^ + source.ts meta.block.ts meta.function.ts meta.function.overload.ts + ^ + source.ts meta.block.ts meta.function.ts meta.function.overload.ts entity.name.function.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts + ^^^^^^^^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts + ^^^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts support.type.primitive.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts +> function* f(s: any): Iterable { } + ^^^^ + source.ts meta.block.ts meta.function.ts + ^^^^^^^^ + source.ts meta.block.ts meta.function.ts meta.function.overload.ts storage.type.function.ts + ^ + source.ts meta.block.ts meta.function.ts meta.function.overload.ts keyword.generator.asterisk.ts + ^ + source.ts meta.block.ts meta.function.ts meta.function.overload.ts + ^ + source.ts meta.block.ts meta.function.ts meta.function.overload.ts entity.name.function.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts + ^^^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.block.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts + ^^^^^^^^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts + ^^^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts support.type.primitive.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts + ^ + source.ts meta.block.ts meta.function.ts meta.return.type.ts + ^ + source.ts meta.block.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^ + source.ts meta.block.ts meta.function.ts meta.block.ts + ^ + source.ts meta.block.ts meta.function.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.block.ts +>} + ^ + source.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts +> + ^^ + source.ts +>const a = 10, b = 10; + ^^^^^ + source.ts meta.var.expr.ts storage.type.ts + ^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^ + source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts + ^^^ + source.ts +>class c { + ^^^^^ + source.ts meta.declaration.object.ts storage.type.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts + ^ + source.ts meta.declaration.object.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> *method() { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts keyword.generator.asterisk.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> *[a*b]() { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts keyword.generator.asterisk.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts keyword.operator.arithmetic.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.array.literal.ts meta.brace.square.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> *'some*string'() { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts keyword.generator.asterisk.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts + ^^^^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts string.quoted.single.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +> * overload(s: string): string + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts keyword.generator.asterisk.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts +> * overload(n: number): number + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts keyword.generator.asterisk.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts +> * overload(sn: T): T { + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts keyword.generator.asterisk.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.method.overload.declaration.ts entity.name.function.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts + ^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts storage.modifier.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.brace.round.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts keyword.operator.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts support.type.primitive.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts meta.type.paren.cover.ts meta.brace.round.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts entity.name.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> return sn; + ^^^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts + ^^^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts +> } + ^^^^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts + ^^ + source.ts meta.declaration.object.ts meta.object.body.ts +>} + ^ + source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts \ No newline at end of file diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index 92cf345f..4be7e695 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -205,7 +205,7 @@ class Test { ^^^^^^^ source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts + source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.function.ts meta.return.type.ts ^ @@ -300,7 +300,7 @@ class Test { ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^^^^^^^^^^ @@ -347,7 +347,7 @@ class Test { ^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^^^^^^^^^^^ diff --git a/tests/cases/Issue146.ts b/tests/cases/Issue146.ts new file mode 100644 index 00000000..e0ba6757 --- /dev/null +++ b/tests/cases/Issue146.ts @@ -0,0 +1,8 @@ +function foo() { + return 'bar'; +} + +function* foo() { + yield 'bar'; + yield* ['bar']; +} \ No newline at end of file diff --git a/tests/cases/generator.ts b/tests/cases/generator.ts new file mode 100644 index 00000000..7eaf5bd5 --- /dev/null +++ b/tests/cases/generator.ts @@ -0,0 +1,20 @@ +module M { + function* f(s: string): Iterable + function* f(s: number): Iterable + function* f(s: any): Iterable { } +} + +const a = 10, b = 10; +class c { + *method() { + } + *[a*b]() { + } + *'some*string'() { + } + * overload(s: string): string + * overload(n: number): number + * overload(sn: T): T { + return sn; + } +} \ No newline at end of file From 6222a1872ffa73c51a6778dd397891f026f1630c Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 31 Aug 2016 12:11:14 -0700 Subject: [PATCH 46/77] Fix how jsx tag and children are scoped Fixes #161 --- TypeScriptReact.YAML-tmLanguage | 60 +++++---- TypeScriptReact.tmLanguage | 158 +++++++++++++++++------- tests/baselines/Issue161.baseline.txt | 102 +++++++++++++++ tests/baselines/TsxSamples.baseline.txt | 18 +-- tests/baselines/TsxSamples.txt | 6 +- tests/cases/Issue161.tsx | 6 + 6 files changed, 260 insertions(+), 90 deletions(-) create mode 100644 tests/baselines/Issue161.baseline.txt create mode 100644 tests/cases/Issue161.tsx diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 14c187f0..3365d028 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -1368,35 +1368,39 @@ repository: patterns: - include: '#jsx-children' - jsx-tag-open: - name: meta.tag.open.tsx + jsx-tag: begin: >- (?x) (<) ([_$a-zA-Z][-$\w.]*(?) - end: (/?>) beginCaptures: - '1': {name: punctuation.definition.tag.begin.tsx} - '2': {name: entity.name.tag.tsx} + '0': { name: meta.tag.open.tsx } + '1': { name: punctuation.definition.tag.begin.tsx } + '2': { name: entity.name.tag.tsx } + end: (/>)|(?:()) endCaptures: - '1': {name: punctuation.definition.tag.end.tsx} - patterns: - - include: '#comment' - - include: '#jsx-tag-attributes' - - include: '#jsx-tag-attributes-illegal' - - jsx-tag-close: - name: meta.tag.close.tsx - begin: () - beginCaptures: - '1': {name: punctuation.definition.tag.begin.tsx} - '2': {name: entity.name.tag.tsx} - endCaptures: - '1': {name: punctuation.definition.tag.end.tsx} - patterns: - - include: '#comment' + '0': { name: meta.tag.close.tsx } + '1': { name: punctuation.definition.tag.end.tsx } + '2': { name: punctuation.definition.tag.begin.tsx } + '3': { name: entity.name.tag.tsx } + '4': { name: punctuation.definition.tag.end.tsx } + patterns: + - name: meta.tag.open.tsx + begin: \G + end: (?=[/]?>) + patterns: + - include: '#comment' + - include: '#jsx-tag-attributes' + - include: '#jsx-tag-attributes-illegal' + - begin: (>) + beginCaptures: + '0': { name: meta.tag.open.tsx } + '1': { name: punctuation.definition.tag.end.tsx } + end: (?=) - end: (?= include - #jsx-tag-open - - - include - #jsx-tag-close + #jsx-tag include #jsx-tag-invalid - - begin - (?<=(?:'|"|})>) - end - (?=</) - name - meta.jsx.children.tsx - patterns - - - include - #jsx-children - - - jsx-attributeValue-entities @@ -1945,11 +1926,7 @@ include - #jsx-tag-open - - - include - #jsx-tag-close + #jsx-tag include @@ -2092,6 +2069,116 @@ + jsx-tag + + begin + (?x) + (<) + ([_$a-zA-Z][-$\w.]*(?<!\.|-)) + (?=\s+(?!\?)|/?>) + beginCaptures + + 0 + + name + meta.tag.open.tsx + + 1 + + name + punctuation.definition.tag.begin.tsx + + 2 + + name + entity.name.tag.tsx + + + end + (/>)|(?:(</)([_$a-zA-Z][-$\w.]*(?<!\.|-))\s*(>)) + endCaptures + + 0 + + name + meta.tag.close.tsx + + 1 + + name + punctuation.definition.tag.end.tsx + + 2 + + name + punctuation.definition.tag.begin.tsx + + 3 + + name + entity.name.tag.tsx + + 4 + + name + punctuation.definition.tag.end.tsx + + + patterns + + + begin + \G + end + (?=[/]?>) + name + meta.tag.open.tsx + patterns + + + include + #comment + + + include + #jsx-tag-attributes + + + include + #jsx-tag-attributes-illegal + + + + + begin + (>) + beginCaptures + + 0 + + name + meta.tag.open.tsx + + 1 + + name + punctuation.definition.tag.end.tsx + + + contentName + meta.jsx.children.tsx + end + (?=</) + patterns + + + include + #jsx-children + + + + + jsx-tag-attribute-assignment match @@ -2201,29 +2288,8 @@ (<) ([_$a-zA-Z][-$\w.]*(?<!\.|-)) (?=\s+(?!\?)|/?>) - beginCaptures - - 1 - - name - punctuation.definition.tag.begin.tsx - - 2 - - name - entity.name.tag.tsx - - end (/?>) - endCaptures - - 1 - - name - punctuation.definition.tag.end.tsx - - name meta.tag.open.tsx patterns diff --git a/tests/baselines/Issue161.baseline.txt b/tests/baselines/Issue161.baseline.txt new file mode 100644 index 00000000..6cf16463 --- /dev/null +++ b/tests/baselines/Issue161.baseline.txt @@ -0,0 +1,102 @@ +original file +----------------------------------- +let root: React.ReactElement<{}>; +let page: PageName; +if (isViaPage) { + root = ; + page = 'via'; +} +----------------------------------- + +>let root: React.ReactElement<{}>; + ^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.type.annotation.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.type.annotation.tsx + ^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.type.annotation.tsx entity.name.type.module.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.type.annotation.tsx punctuation.accessor.tsx + ^^^^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.type.annotation.tsx meta.type.parameters.tsx entity.name.type.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.type.annotation.tsx meta.type.parameters.tsx punctuation.definition.typeparameters.begin.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.type.annotation.tsx meta.type.parameters.tsx meta.object.type.tsx punctuation.definition.block.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.type.annotation.tsx meta.type.parameters.tsx meta.object.type.tsx punctuation.definition.block.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.type.annotation.tsx meta.type.parameters.tsx punctuation.definition.typeparameters.end.tsx + ^^^ + source.tsx +>let page: PageName; + ^^^ + source.tsx meta.var.expr.tsx storage.type.tsx + ^ + source.tsx meta.var.expr.tsx + ^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.type.annotation.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.type.annotation.tsx + ^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.type.annotation.tsx entity.name.type.tsx + ^^^ + source.tsx +>if (isViaPage) { + ^^ + source.tsx keyword.control.conditional.tsx + ^ + source.tsx + ^ + source.tsx meta.brace.round.tsx + ^^^^^^^^^ + source.tsx + ^ + source.tsx meta.brace.round.tsx + ^ + source.tsx + ^ + source.tsx meta.block.tsx punctuation.definition.block.tsx + ^^ + source.tsx meta.block.tsx +> root = ; + ^^^^^^^ + source.tsx meta.block.tsx + ^ + source.tsx meta.block.tsx keyword.operator.assignment.tsx + ^ + source.tsx meta.block.tsx + ^ + source.tsx meta.block.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx + ^^^^^^^ + source.tsx meta.block.tsx meta.tag.open.tsx entity.name.tag.tsx + ^^ + source.tsx meta.block.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx + ^^^ + source.tsx meta.block.tsx +> page = 'via'; + ^^^^^^^ + source.tsx meta.block.tsx + ^ + source.tsx meta.block.tsx keyword.operator.assignment.tsx + ^ + source.tsx meta.block.tsx + ^ + source.tsx meta.block.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx + ^^^ + source.tsx meta.block.tsx string.quoted.single.tsx + ^ + source.tsx meta.block.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx + ^^^ + source.tsx meta.block.tsx +>} + ^ + source.tsx meta.block.tsx punctuation.definition.block.tsx \ No newline at end of file diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index 7dc557b4..28db5ccd 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -218,7 +218,7 @@ var e =
^ source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx ^^ - source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx > ^^^^^^^^^^^^ source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx @@ -241,7 +241,7 @@ var e =
^ source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx ^^ - source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx > ^^^^^^^^ source.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx @@ -318,7 +318,7 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx > ^^^^^^^^^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx @@ -341,7 +341,7 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx > ^^^^^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.without-attributes.tsx @@ -438,7 +438,7 @@ var e =
^^^^^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx > ^^^^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx @@ -527,7 +527,7 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx ^^ source.tsx > @@ -608,7 +608,7 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx > ^ source.tsx @@ -831,7 +831,7 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx >var e =
^^^ source.tsx meta.var.expr.tsx storage.type.tsx @@ -864,7 +864,7 @@ var e =
^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx ^^ - source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx > ^ source.tsx \ No newline at end of file diff --git a/tests/baselines/TsxSamples.txt b/tests/baselines/TsxSamples.txt index aa9c139e..e9ea0bf2 100644 --- a/tests/baselines/TsxSamples.txt +++ b/tests/baselines/TsxSamples.txt @@ -174,7 +174,7 @@ var e =
[31, 23]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx meta.brace.curly.tsx > /> ^^ - [32, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx + [32, 9]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx > ^^ [33, 5]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx @@ -193,7 +193,7 @@ var e =
^^^^^^^^ [41, 29]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx ^^ - [41, 39]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx + [41, 39]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx > >var props2 = { foo: 'default' } >var component2 = @@ -204,7 +204,7 @@ var e =
^^^^^^^^ [44, 30]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx meta.brace.curly.tsx ^^ - [44, 57]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx + [44, 57]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx > >// JSX Gotchas >// http://facebook.github.io/react/docs/jsx-gotchas.html diff --git a/tests/cases/Issue161.tsx b/tests/cases/Issue161.tsx new file mode 100644 index 00000000..257dc901 --- /dev/null +++ b/tests/cases/Issue161.tsx @@ -0,0 +1,6 @@ +let root: React.ReactElement<{}>; +let page: PageName; +if (isViaPage) { + root = ; + page = 'via'; +} \ No newline at end of file From 7dcc1eeaec3c2f447027e974e4bb17dbcc400de3 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 31 Aug 2016 12:20:03 -0700 Subject: [PATCH 47/77] Remove scopes meta.tag.open.tsx and meta.tag.close.tsx and use meta.tag.tsx instead --- TypeScriptReact.YAML-tmLanguage | 7 +- TypeScriptReact.tmLanguage | 83 +------- TypeScriptReact.tmTheme | 2 +- tests/baselines/Issue161.baseline.txt | 6 +- tests/baselines/TsxSamples.baseline.txt | 250 ++++++++++++------------ tests/baselines/TsxSamples.txt | 74 +++---- 6 files changed, 170 insertions(+), 252 deletions(-) diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 3365d028..0cc8c65c 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -1369,25 +1369,23 @@ repository: - include: '#jsx-children' jsx-tag: + name: meta.tag.tsx begin: >- (?x) (<) ([_$a-zA-Z][-$\w.]*(?) beginCaptures: - '0': { name: meta.tag.open.tsx } '1': { name: punctuation.definition.tag.begin.tsx } '2': { name: entity.name.tag.tsx } end: (/>)|(?:()) endCaptures: - '0': { name: meta.tag.close.tsx } '1': { name: punctuation.definition.tag.end.tsx } '2': { name: punctuation.definition.tag.begin.tsx } '3': { name: entity.name.tag.tsx } '4': { name: punctuation.definition.tag.end.tsx } patterns: - - name: meta.tag.open.tsx - begin: \G + - begin: \G end: (?=[/]?>) patterns: - include: '#comment' @@ -1395,7 +1393,6 @@ repository: - include: '#jsx-tag-attributes-illegal' - begin: (>) beginCaptures: - '0': { name: meta.tag.open.tsx } '1': { name: punctuation.definition.tag.end.tsx } end: (?= beginCaptures - 0 - - name - meta.tag.open.tsx - 1 name @@ -2098,11 +2093,6 @@ (/>)|(?:(</)([_$a-zA-Z][-$\w.]*(?<!\.|-))\s*(>)) endCaptures - 0 - - name - meta.tag.close.tsx - 1 name @@ -2124,6 +2114,8 @@ punctuation.definition.tag.end.tsx + name + meta.tag.tsx patterns @@ -2131,8 +2123,6 @@ \G end (?=[/]?>) - name - meta.tag.open.tsx patterns @@ -2154,11 +2144,6 @@ (>) beginCaptures - 0 - - name - meta.tag.open.tsx - 1 name @@ -2237,43 +2222,6 @@ name invalid.illegal.attribute.tsx - jsx-tag-close - - begin - (</)([_$a-zA-Z][-$\w.]*(?<!\.|-)) - beginCaptures - - 1 - - name - punctuation.definition.tag.begin.tsx - - 2 - - name - entity.name.tag.tsx - - - end - (>) - endCaptures - - 1 - - name - punctuation.definition.tag.end.tsx - - - name - meta.tag.close.tsx - patterns - - - include - #comment - - - jsx-tag-invalid match @@ -2281,33 +2229,6 @@ name invalid.illegal.tag.incomplete.tsx - jsx-tag-open - - begin - (?x) - (<) - ([_$a-zA-Z][-$\w.]*(?<!\.|-)) - (?=\s+(?!\?)|/?>) - end - (/?>) - name - meta.tag.open.tsx - patterns - - - include - #comment - - - include - #jsx-tag-attributes - - - include - #jsx-tag-attributes-illegal - - - jsx-tag-without-attributes begin diff --git a/TypeScriptReact.tmTheme b/TypeScriptReact.tmTheme index c2ed099e..d7a39b93 100644 --- a/TypeScriptReact.tmTheme +++ b/TypeScriptReact.tmTheme @@ -163,7 +163,7 @@