From 87aa92a02da6fd64bbaecce5e6066742254da868 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 15 Sep 2016 16:03:59 -0700 Subject: [PATCH] Scope function names from function calls and add scoping for , --- TypeScript.YAML-tmLanguage | 44 ++++-- TypeScript.tmLanguage | 92 +++++++++--- TypeScriptReact.YAML-tmLanguage | 44 ++++-- TypeScriptReact.tmLanguage | 92 +++++++++--- tests/baselines/Abstracts.baseline.txt | 4 +- ...owFunctionInsideTypeAssertion.baseline.txt | 10 +- tests/baselines/Comments.baseline.txt | 48 ++++--- .../FunctionMethodOverloads.baseline.txt | 8 +- .../FunctionMethodParameters.baseline.txt | 124 +++++++++------- .../FunctionMethodReturnTypes.baseline.txt | 68 +++++---- tests/baselines/Issue10.baseline.txt | 14 +- tests/baselines/Issue110.baseline.txt | 6 +- tests/baselines/Issue112.baseline.txt | 22 ++- tests/baselines/Issue115.baseline.txt | 16 ++- tests/baselines/Issue131.baseline.txt | 6 +- tests/baselines/Issue139.baseline.txt | 10 +- tests/baselines/Issue142.baseline.txt | 20 ++- tests/baselines/Issue143.baseline.txt | 48 +++++-- tests/baselines/Issue148.baseline.txt | 22 +-- tests/baselines/Issue153.baseline.txt | 72 ++++++++-- tests/baselines/Issue154.baseline.txt | 8 +- tests/baselines/Issue155.baseline.txt | 34 +++-- tests/baselines/Issue156.baseline.txt | 2 +- tests/baselines/Issue157.baseline.txt | 10 +- tests/baselines/Issue178.baseline.txt | 2 +- tests/baselines/Issue180.baseline.txt | 26 ++-- tests/baselines/Issue186.baseline.txt | 28 ++-- tests/baselines/Issue187.baseline.txt | 16 ++- tests/baselines/Issue191.baseline.txt | 54 ++++--- tests/baselines/Issue191.txt | 12 +- tests/baselines/Issue198.baseline.txt | 12 +- tests/baselines/Issue203.baseline.txt | 16 ++- tests/baselines/Issue208.baseline.txt | 42 ++++-- tests/baselines/Issue208.txt | 6 +- tests/baselines/Issue212.baseline.txt | 2 +- tests/baselines/Issue216.baseline.txt | 4 +- tests/baselines/Issue217.baseline.txt | 16 ++- tests/baselines/Issue218.baseline.txt | 4 +- tests/baselines/Issue22.baseline.txt | 8 +- tests/baselines/Issue230.baseline.txt | 50 +++++-- tests/baselines/Issue232.baseline.txt | 4 +- tests/baselines/Issue235.baseline.txt | 10 +- tests/baselines/Issue241.baseline.txt | 4 +- tests/baselines/Issue243.baseline.txt | 132 +++++++++++++----- tests/baselines/Issue244.baseline.txt | 28 +++- tests/baselines/Issue247.baseline.txt | 2 +- tests/baselines/Issue249.baseline.txt | 4 +- tests/baselines/Issue250.baseline.txt | 30 +++- tests/baselines/Issue251.baseline.txt | 28 ++-- tests/baselines/Issue252.baseline.txt | 2 +- tests/baselines/Issue32.baseline.txt | 2 +- tests/baselines/Issue37.baseline.txt | 14 +- tests/baselines/Issue37.txt | 8 +- tests/baselines/Issue42.baseline.txt | 8 +- tests/baselines/Issue43.baseline.txt | 8 +- tests/baselines/Issue63.baseline.txt | 4 +- tests/baselines/Issue64.baseline.txt | 14 +- tests/baselines/Issue77.baseline.txt | 4 +- tests/baselines/Issue82.baseline.txt | 6 +- tests/baselines/Issue87.baseline.txt | 8 +- .../ParameterProperties.baseline.txt | 4 +- tests/baselines/TsxSamples.baseline.txt | 22 ++- tests/baselines/TsxSamples.txt | 2 +- tests/baselines/arrowInsideCall.baseline.txt | 20 ++- tests/baselines/docComments.baseline.txt | 2 +- tests/baselines/generator.baseline.txt | 6 +- .../multipleVariableDeclaration.baseline.txt | 46 ++++-- .../parameterBindingPattern.baseline.txt | 72 +++++++--- tests/baselines/pr48_noSemiColon.baseline.txt | 46 ++++-- tests/baselines/readonly.baseline.txt | 2 +- .../variableBindingPattern.baseline.txt | 72 +++++++--- 71 files changed, 1208 insertions(+), 528 deletions(-) diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage index cee48a1..a6be095 100644 --- a/TypeScript.YAML-tmLanguage +++ b/TypeScript.YAML-tmLanguage @@ -36,6 +36,7 @@ repository: - include: '#destructuring-variable' - include: '#var-single-variable' - include: '#comment' + - include: '#punctuation-comma' var-single-variable: name: meta.var-single-variable.expr.ts @@ -168,13 +169,14 @@ repository: - include: '#class-or-interface-declaration' - include: '#arrow-function' - include: '#cast' - - include: '#paren-expression' - include: '#ternary-expression' - include: '#new-expr' - include: '#object-literal' - include: '#expression-operator' - include: '#operators' - include: '#function-call' + - include: '#paren-expression' + - include: '#punctuation-comma' control-statement: # TODO: convert this to actual statements instead @@ -450,6 +452,7 @@ repository: - include: '#method-declaration' - include: '#indexer-declaration' - include: '#type-annotation' + - include: '#punctuation-comma' field-declaration: name: meta.field.declaration.ts @@ -736,6 +739,8 @@ repository: - include: '#parameter-name' - include: '#type-annotation' - include: '#variable-initializer' + - name: punctuation.separator.parameter.ts + match: ',' type-primitive: name: support.type.primitive.ts @@ -797,6 +802,7 @@ repository: '0': { name: meta.brace.square.ts } patterns: - include: '#type' + - include: '#punctuation-comma' type-name: patterns: @@ -820,6 +826,7 @@ repository: - name: storage.modifier.ts match: '(?]+)|(\<[^<>]+\>))+>\s*\() + # But this takes really long time and sometimes infinite time to parse negative cases like below: + # if (this.PListCells.length]*(\<[^<>]+\>)*[^<>]*(\<[^<>]+\>)*[^<>]*>\s*)?\()' + beginCaptures: + '1': { name: entity.name.function.ts } + end: (?=\() patterns: + - include: '#comment' - name: meta.type.parameters.ts - # Ideal expression that can give us arbitary number of another level of type argument allowed is: - # (<)(?=(([^<>]+)|(\<[^<>]+\>))+>\s*\() - # But this takes really long time and sometimes infinite time to parse negative cases like below: - # if (this.PListCells.length]*(\<[^<>]+\>)*[^<>]*(\<[^<>]+\>)*[^<>]*>\s*\()' + begin: \< beginCaptures: - '1': { name: entity.name.function.ts } - '2': { name: punctuation.definition.typeparameters.begin.ts } - end: '(>)' + '0': { name: punctuation.definition.typeparameters.begin.ts } + end: \> endCaptures: - '1': { name: punctuation.definition.typeparameters.end.ts } + '0': { name: punctuation.definition.typeparameters.end.ts } patterns: - include: '#type' - #TODO: Scope function names and method names - #TODO: Scope function call arguments better? - - include: '#paren-expression' + - include: '#punctuation-comma' cast: name: cast.expr.ts @@ -970,6 +979,7 @@ repository: match: ([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\}) captures: '1': { name: variable.other.readwrite.ts } + - include: '#punctuation-comma' expression-operator: patterns: @@ -1060,6 +1070,10 @@ repository: - include: '#type-predicate-operator' - include: '#type' + punctuation-comma: + name: punctuation.separator.comma.ts + match: ',' + paren-expression: begin: \( beginCaptures: @@ -1069,6 +1083,7 @@ repository: '0': {name: meta.brace.round.ts } patterns: - include: '#expression' + - include: '#punctuation-comma' qstring-double: name: string.quoted.double.ts @@ -1265,6 +1280,7 @@ repository: '0': { name: meta.brace.square.ts } patterns: - include: '#expression' + - include: '#punctuation-comma' numeric-literal: patterns: diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage index d210c0f..8e38d22 100644 --- a/TypeScript.tmLanguage +++ b/TypeScript.tmLanguage @@ -146,6 +146,10 @@ include #expression + + include + #punctuation-comma + arrow-function @@ -1200,10 +1204,6 @@ include #cast - - include - #paren-expression - include #ternary-expression @@ -1228,6 +1228,14 @@ include #function-call + + include + #paren-expression + + + include + #punctuation-comma + expression-operator @@ -1393,31 +1401,40 @@ function-call - name - functioncall.expr.ts + begin + ([_$[:alpha:]][_$[:alnum:]]*)\s*(?=(<[^<>]*(\<[^<>]+\>)*[^<>]*(\<[^<>]+\>)*[^<>]*>\s*)?\() + beginCaptures + + 1 + + name + entity.name.function.ts + + + end + (?=\() patterns + + include + #comment + begin - ([_$[:alpha:]][_$[:alnum:]]*)\s*(<)(?=[^<>]*(\<[^<>]+\>)*[^<>]*(\<[^<>]+\>)*[^<>]*>\s*\() + \< beginCaptures - 1 - - name - entity.name.function.ts - - 2 + 0 name punctuation.definition.typeparameters.begin.ts end - (>) + \> endCaptures - 1 + 0 name punctuation.definition.typeparameters.end.ts @@ -1431,12 +1448,12 @@ include #type + + include + #punctuation-comma + - - include - #paren-expression - function-declaration @@ -1588,6 +1605,12 @@ include #variable-initializer + + match + , + name + punctuation.separator.parameter.ts + import-declaration @@ -2560,6 +2583,10 @@ name meta.object.member.ts + + include + #punctuation-comma + operators @@ -2832,6 +2859,10 @@ include #expression + + include + #punctuation-comma + property-accessor @@ -2841,6 +2872,13 @@ name storage.type.property.ts + punctuation-comma + + match + , + name + punctuation.separator.comma.ts + qstring-double begin @@ -3819,6 +3857,10 @@ include #type-annotation + + include + #punctuation-comma + type-operator @@ -3868,6 +3910,10 @@ include #type + + include + #punctuation-comma + type-paren-or-function-parameters @@ -3955,6 +4001,10 @@ include #type + + include + #punctuation-comma + typeof-operator @@ -4006,6 +4056,10 @@ include #comment + + include + #punctuation-comma + var-single-variable diff --git a/TypeScriptReact.YAML-tmLanguage b/TypeScriptReact.YAML-tmLanguage index 5dd8b59..2c2d19f 100644 --- a/TypeScriptReact.YAML-tmLanguage +++ b/TypeScriptReact.YAML-tmLanguage @@ -40,6 +40,7 @@ repository: - include: '#destructuring-variable' - include: '#var-single-variable' - include: '#comment' + - include: '#punctuation-comma' var-single-variable: name: meta.var-single-variable.expr.tsx @@ -172,13 +173,14 @@ repository: - include: '#function-declaration' - include: '#class-or-interface-declaration' - include: '#arrow-function' - - include: '#paren-expression' - include: '#ternary-expression' - include: '#new-expr' - include: '#object-literal' - include: '#expression-operator' - include: '#operators' - include: '#function-call' + - include: '#paren-expression' + - include: '#punctuation-comma' control-statement: # TODO: convert this to actual statements instead @@ -454,6 +456,7 @@ repository: - include: '#method-declaration' - include: '#indexer-declaration' - include: '#type-annotation' + - include: '#punctuation-comma' field-declaration: name: meta.field.declaration.tsx @@ -740,6 +743,8 @@ repository: - include: '#parameter-name' - include: '#type-annotation' - include: '#variable-initializer' + - name: punctuation.separator.parameter.tsx + match: ',' type-primitive: name: support.type.primitive.tsx @@ -801,6 +806,7 @@ repository: '0': { name: meta.brace.square.tsx } patterns: - include: '#type' + - include: '#punctuation-comma' type-name: patterns: @@ -824,6 +830,7 @@ repository: - name: storage.modifier.tsx match: '(?]+)|(\<[^<>]+\>))+>\s*\() + # But this takes really long time and sometimes infinite time to parse negative cases like below: + # if (this.PListCells.length]*(\<[^<>]+\>)*[^<>]*(\<[^<>]+\>)*[^<>]*>\s*)?\()' + beginCaptures: + '1': { name: entity.name.function.tsx } + end: (?=\() patterns: + - include: '#comment' - name: meta.type.parameters.tsx - # Ideal expression that can give us arbitary number of another level of type argument allowed is: - # (<)(?=(([^<>]+)|(\<[^<>]+\>))+>\s*\() - # But this takes really long time and sometimes infinite time to parse negative cases like below: - # if (this.PListCells.length]*(\<[^<>]+\>)*[^<>]*(\<[^<>]+\>)*[^<>]*>\s*\()' + begin: \< beginCaptures: - '1': { name: entity.name.function.tsx } - '2': { name: punctuation.definition.typeparameters.begin.tsx } - end: '(>)' + '0': { name: punctuation.definition.typeparameters.begin.tsx } + end: \> endCaptures: - '1': { name: punctuation.definition.typeparameters.end.tsx } + '0': { name: punctuation.definition.typeparameters.end.tsx } patterns: - include: '#type' - #TODO: Scope function names and method names - #TODO: Scope function call arguments better? - - include: '#paren-expression' + - include: '#punctuation-comma' new-expr: name: new.expr.tsx @@ -959,6 +968,7 @@ repository: match: ([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\}) captures: '1': { name: variable.other.readwrite.tsx } + - include: '#punctuation-comma' expression-operator: patterns: @@ -1049,6 +1059,10 @@ repository: - include: '#type-predicate-operator' - include: '#type' + punctuation-comma: + name: punctuation.separator.comma.tsx + match: ',' + paren-expression: begin: \( beginCaptures: @@ -1058,6 +1072,7 @@ repository: '0': {name: meta.brace.round.tsx } patterns: - include: '#expression' + - include: '#punctuation-comma' qstring-double: name: string.quoted.double.tsx @@ -1254,6 +1269,7 @@ repository: '0': { name: meta.brace.square.tsx } patterns: - include: '#expression' + - include: '#punctuation-comma' numeric-literal: patterns: diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage index a24749b..444ebb5 100644 --- a/TypeScriptReact.tmLanguage +++ b/TypeScriptReact.tmLanguage @@ -146,6 +146,10 @@ include #expression + + include + #punctuation-comma + arrow-function @@ -1168,10 +1172,6 @@ include #arrow-function - - include - #paren-expression - include #ternary-expression @@ -1196,6 +1196,14 @@ include #function-call + + include + #paren-expression + + + include + #punctuation-comma + expression-operator @@ -1361,31 +1369,40 @@ function-call - name - functioncall.expr.tsx + begin + ([_$[:alpha:]][_$[:alnum:]]*)\s*(?=(<[^<>]*(\<[^<>]+\>)*[^<>]*(\<[^<>]+\>)*[^<>]*>\s*)?\() + beginCaptures + + 1 + + name + entity.name.function.tsx + + + end + (?=\() patterns + + include + #comment + begin - ([_$[:alpha:]][_$[:alnum:]]*)\s*(<)(?=[^<>]*(\<[^<>]+\>)*[^<>]*(\<[^<>]+\>)*[^<>]*>\s*\() + \< beginCaptures - 1 - - name - entity.name.function.tsx - - 2 + 0 name punctuation.definition.typeparameters.begin.tsx end - (>) + \> endCaptures - 1 + 0 name punctuation.definition.typeparameters.end.tsx @@ -1399,12 +1416,12 @@ include #type + + include + #punctuation-comma + - - include - #paren-expression - function-declaration @@ -1556,6 +1573,12 @@ include #variable-initializer + + match + , + name + punctuation.separator.parameter.tsx + import-declaration @@ -2946,6 +2969,10 @@ name meta.object.member.tsx + + include + #punctuation-comma + operators @@ -3218,6 +3245,10 @@ include #expression + + include + #punctuation-comma + property-accessor @@ -3227,6 +3258,13 @@ name storage.type.property.tsx + punctuation-comma + + match + , + name + punctuation.separator.comma.tsx + qstring-double begin @@ -4209,6 +4247,10 @@ include #type-annotation + + include + #punctuation-comma + type-operator @@ -4258,6 +4300,10 @@ include #type + + include + #punctuation-comma + type-paren-or-function-parameters @@ -4345,6 +4391,10 @@ include #type + + include + #punctuation-comma + typeof-operator @@ -4396,6 +4446,10 @@ include #comment + + include + #punctuation-comma + var-single-variable diff --git a/tests/baselines/Abstracts.baseline.txt b/tests/baselines/Abstracts.baseline.txt index 0360708..d9d1a32 100644 --- a/tests/baselines/Abstracts.baseline.txt +++ b/tests/baselines/Abstracts.baseline.txt @@ -248,8 +248,10 @@ cow.makeSound(); ^^ source.ts >cow.makeSound(); - ^^^^^^^^^^^^^ + ^^^^ source.ts + ^^^^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt index 107cc90..8a6c888 100644 --- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt +++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt @@ -88,8 +88,8 @@ 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 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 constant.language.null.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.separator.comma.ts > setDisplay: (domNode: HTMLElement, desiredValue: string) => { ^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts @@ -110,7 +110,7 @@ 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 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 punctuation.separator.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 ^^^^^^^^^^^^ @@ -324,8 +324,10 @@ function f(x: string | ((value: string) => number)) { source.ts meta.function.ts meta.block.ts meta.block.ts ^^^^^^ source.ts meta.function.ts meta.block.ts meta.block.ts keyword.control.flow.ts - ^^ + ^ source.ts meta.function.ts meta.block.ts meta.block.ts + ^ + source.ts meta.function.ts meta.block.ts meta.block.ts entity.name.function.ts ^ source.ts meta.function.ts meta.block.ts meta.block.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Comments.baseline.txt b/tests/baselines/Comments.baseline.txt index 2b7acc4..b3d10c5 100644 --- a/tests/baselines/Comments.baseline.txt +++ b/tests/baselines/Comments.baseline.txt @@ -1412,8 +1412,10 @@ var x = new ^^/* comments */ String(); source.ts meta.class.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts - ^^ - source.ts meta.class.ts meta.type.parameters.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts ^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts ^ @@ -1475,8 +1477,10 @@ var x = new ^^/* comments */ String(); source.ts meta.class.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts - ^^ - source.ts meta.class.ts meta.type.parameters.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts ^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts ^ @@ -1540,8 +1544,10 @@ var x = new ^^/* comments */ String(); source.ts meta.class.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts - ^^ - source.ts meta.class.ts meta.type.parameters.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts ^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts ^ @@ -1605,8 +1611,10 @@ var x = new ^^/* comments */ String(); source.ts meta.class.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts - ^^ - source.ts meta.class.ts meta.type.parameters.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts ^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts ^ @@ -1672,8 +1680,10 @@ var x = new ^^/* comments */ String(); source.ts meta.class.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts - ^^ - source.ts meta.class.ts meta.type.parameters.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts ^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts ^ @@ -1744,8 +1754,10 @@ var x = new ^^/* comments */ String(); source.ts meta.class.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts - ^^ - source.ts meta.class.ts meta.type.parameters.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts ^^^^^^^^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts ^ @@ -1815,8 +1827,10 @@ var x = new ^^/* comments */ String(); source.ts meta.class.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts - ^^ - source.ts meta.class.ts meta.type.parameters.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts ^^^^^^^^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts ^^ @@ -1888,8 +1902,10 @@ var x = new ^^/* comments */ String(); source.ts meta.class.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^^^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts - ^^ - source.ts meta.class.ts meta.type.parameters.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts ^^^^^^^^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts ^ diff --git a/tests/baselines/FunctionMethodOverloads.baseline.txt b/tests/baselines/FunctionMethodOverloads.baseline.txt index ecb661e..d6b968f 100644 --- a/tests/baselines/FunctionMethodOverloads.baseline.txt +++ b/tests/baselines/FunctionMethodOverloads.baseline.txt @@ -207,7 +207,7 @@ abstract class C { ^ 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.parameters.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 punctuation.separator.comma.ts ^ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -464,7 +464,7 @@ abstract class C { ^ 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.parameters.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 punctuation.separator.comma.ts ^ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -730,7 +730,7 @@ abstract class C { ^ source.ts meta.class.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.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.separator.comma.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -977,7 +977,7 @@ abstract class C { ^ source.ts meta.class.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.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.separator.comma.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ diff --git a/tests/baselines/FunctionMethodParameters.baseline.txt b/tests/baselines/FunctionMethodParameters.baseline.txt index b8877c2..03712c4 100644 --- a/tests/baselines/FunctionMethodParameters.baseline.txt +++ b/tests/baselines/FunctionMethodParameters.baseline.txt @@ -60,8 +60,10 @@ class testClass { 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 + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts + ^^ + source.ts meta.function.ts meta.parameters.ts > m2: {}, ^^^^ source.ts meta.function.ts meta.parameters.ts @@ -75,8 +77,8 @@ class testClass { 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.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts - ^^ - source.ts meta.function.ts meta.parameters.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts > m3: any [], ^^^^ source.ts meta.function.ts meta.parameters.ts @@ -94,8 +96,8 @@ class testClass { 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.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts - ^^ - source.ts meta.function.ts meta.parameters.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts > m4: {a: A, b: B}, ^^^^ source.ts meta.function.ts meta.parameters.ts @@ -116,7 +118,7 @@ class testClass { ^ 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.parameters.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 punctuation.separator.comma.ts ^ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -129,8 +131,8 @@ class testClass { 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.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts - ^^ - source.ts meta.function.ts meta.parameters.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts > m5: () => void, ^^^^ source.ts meta.function.ts meta.parameters.ts @@ -152,8 +154,8 @@ class testClass { source.ts meta.function.ts meta.parameters.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 support.type.primitive.ts - ^^ - source.ts meta.function.ts meta.parameters.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts > m6: (x:(string), y:[number, string]) => number, ^^^^ source.ts meta.function.ts meta.parameters.ts @@ -185,8 +187,10 @@ class testClass { 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.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.parameters.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 punctuation.separator.comma.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.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts support.type.primitive.ts ^ @@ -201,8 +205,8 @@ class testClass { source.ts meta.function.ts meta.parameters.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 support.type.primitive.ts - ^^ - source.ts meta.function.ts meta.parameters.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts > m7: Array, ^^^^ source.ts meta.function.ts meta.parameters.ts @@ -220,8 +224,8 @@ 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 punctuation.definition.typeparameters.end.ts - ^^ - source.ts meta.function.ts meta.parameters.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts > m8: [number, number], ^^^^ source.ts meta.function.ts meta.parameters.ts @@ -235,14 +239,16 @@ class testClass { 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.parameters.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 + ^ + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts punctuation.separator.comma.ts + ^ + source.ts meta.function.ts meta.parameters.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 support.type.primitive.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.parameters.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts > m9: {a: A, b: B} | [number, number], ^^^^ source.ts meta.function.ts meta.parameters.ts @@ -263,7 +269,7 @@ class testClass { ^ 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.parameters.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 punctuation.separator.comma.ts ^ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -286,14 +292,18 @@ class testClass { 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.parameters.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 + ^ + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts punctuation.separator.comma.ts + ^ + source.ts meta.function.ts meta.parameters.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 support.type.primitive.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.parameters.ts + ^ + source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts + ^^ + source.ts meta.function.ts meta.parameters.ts > m10: (() => void) | string[]): number { ^^^^ source.ts meta.function.ts meta.parameters.ts @@ -398,8 +408,10 @@ class testClass { source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts - ^^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts + ^^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts > m2: {}, ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts @@ -413,8 +425,8 @@ class testClass { source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts - ^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts > m3: any [], ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts @@ -432,8 +444,8 @@ class testClass { source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts - ^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts > m4: {a: A, b: B}, ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts @@ -454,7 +466,7 @@ class testClass { ^ source.ts meta.class.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.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.separator.comma.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -467,8 +479,8 @@ class testClass { source.ts meta.class.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.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts - ^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts > m5: () => void, ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts @@ -490,8 +502,8 @@ class testClass { source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts - ^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts > m6: (x:(string), y:[number, string]) => number, ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts @@ -523,8 +535,10 @@ class testClass { source.ts meta.class.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.class.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.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.tuple.ts ^^^^^^ source.ts meta.class.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 ^ @@ -539,8 +553,8 @@ class testClass { source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.function.return.ts support.type.primitive.ts - ^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts > m7: Array, ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts @@ -558,8 +572,8 @@ class testClass { source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts support.type.primitive.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts - ^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts > m8: [number, number], ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts @@ -573,14 +587,16 @@ class testClass { source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts - ^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts - ^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts > m9: {a: A, b: B} | [number, number], ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts @@ -601,7 +617,7 @@ class testClass { ^ source.ts meta.class.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.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.separator.comma.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -624,14 +640,18 @@ class testClass { source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts - ^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts - ^^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts + ^^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts > m10: (() => void) | string[]): number { ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt index 1bcfe7f..571fd2b 100644 --- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt +++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt @@ -160,7 +160,7 @@ class TestClass { ^ 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 punctuation.separator.comma.ts ^ source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -207,8 +207,10 @@ class TestClass { 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 + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts punctuation.separator.comma.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 meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts ^ @@ -260,8 +262,10 @@ 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 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 punctuation.separator.comma.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 support.type.primitive.ts ^ @@ -280,8 +284,10 @@ class TestClass { 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 constant.numeric.decimal.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 punctuation.separator.comma.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 constant.numeric.decimal.ts ^ @@ -663,7 +669,7 @@ class TestClass { ^ 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 punctuation.separator.comma.ts ^ source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -718,8 +724,10 @@ class TestClass { 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.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 + ^ + source.ts meta.function.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.separator.comma.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 meta.object-literal.key.ts entity.name.type.attribute-name.ts ^ @@ -865,8 +873,10 @@ 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 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 punctuation.separator.comma.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 support.type.primitive.ts ^ @@ -1044,7 +1054,7 @@ class TestClass { ^ source.ts meta.class.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.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts + source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts punctuation.separator.comma.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -1091,8 +1101,10 @@ class TestClass { source.ts meta.class.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.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts ^ @@ -1142,8 +1154,10 @@ class TestClass { source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts support.type.primitive.ts - ^^ - source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts support.type.primitive.ts ^ @@ -1162,8 +1176,10 @@ class TestClass { source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts constant.numeric.decimal.ts - ^^ - source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts constant.numeric.decimal.ts ^ @@ -1533,7 +1549,7 @@ class TestClass { ^ source.ts meta.class.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.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts + source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts punctuation.separator.comma.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts ^ @@ -1588,8 +1604,10 @@ class TestClass { source.ts meta.class.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.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts ^ @@ -1729,8 +1747,10 @@ class TestClass { source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts support.type.primitive.ts - ^^ - source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts support.type.primitive.ts ^ diff --git a/tests/baselines/Issue10.baseline.txt b/tests/baselines/Issue10.baseline.txt index dd534e6..ffdf90b 100644 --- a/tests/baselines/Issue10.baseline.txt +++ b/tests/baselines/Issue10.baseline.txt @@ -32,8 +32,12 @@ class World { ^^ source.ts meta.block.ts > A, - ^^^^^^^^ + ^^^^^ source.ts meta.block.ts + ^ + source.ts meta.block.ts punctuation.separator.comma.ts + ^^ + source.ts meta.block.ts > B ^^^^^^^ source.ts meta.block.ts @@ -93,8 +97,10 @@ class World { ^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts > console.log("hello"); - ^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^^^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ @@ -156,8 +162,10 @@ class World { ^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts > console.log("hello"); - ^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^^^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue110.baseline.txt b/tests/baselines/Issue110.baseline.txt index 6aa7ce5..c88e6b2 100644 --- a/tests/baselines/Issue110.baseline.txt +++ b/tests/baselines/Issue110.baseline.txt @@ -315,8 +315,10 @@ 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.decimal.ts - ^^ - source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts punctuation.separator.comma.ts + ^ + source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ diff --git a/tests/baselines/Issue112.baseline.txt b/tests/baselines/Issue112.baseline.txt index 09392f6..d874749 100644 --- a/tests/baselines/Issue112.baseline.txt +++ b/tests/baselines/Issue112.baseline.txt @@ -23,15 +23,25 @@ this._waitingConnections.delete(connection); source.ts new.expr.ts entity.name.type.ts ^ source.ts meta.brace.round.ts - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^ source.ts + ^ + source.ts punctuation.separator.comma.ts + ^^^^^^^^^^^^^ + source.ts + ^ + source.ts punctuation.separator.comma.ts + ^^^^^^^^^^^^^^^^^^^ + source.ts ^ source.ts meta.brace.round.ts ^^^ source.ts >angular.module('app') - ^^^^^^^^^^^^^^ + ^^^^^^^^ source.ts + ^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ @@ -47,8 +57,10 @@ this._waitingConnections.delete(connection); >this._connections.delete(connection.id); ^^^^ source.ts variable.language.this.ts - ^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^ source.ts + ^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^^^^^^^^^^^^^ @@ -60,8 +72,10 @@ this._waitingConnections.delete(connection); >this._waitingConnections.delete(connection); ^^^^ source.ts variable.language.this.ts - ^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^^^^^^ source.ts + ^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^^^^^^^^^^ diff --git a/tests/baselines/Issue115.baseline.txt b/tests/baselines/Issue115.baseline.txt index 1ba306b..e353915 100644 --- a/tests/baselines/Issue115.baseline.txt +++ b/tests/baselines/Issue115.baseline.txt @@ -45,7 +45,7 @@ const qux = { ^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts ^ @@ -94,7 +94,7 @@ const qux = { ^^^ 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 punctuation.separator.parameter.ts ^ source.ts meta.function.ts meta.parameters.ts ^ @@ -148,7 +148,7 @@ const qux = { ^^^ 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 punctuation.separator.parameter.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.parameters.ts ^ @@ -198,7 +198,7 @@ const qux = { ^^^ 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 punctuation.separator.parameter.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts ^ @@ -261,7 +261,7 @@ const qux = { ^^^ 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 punctuation.separator.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 ^ @@ -282,8 +282,10 @@ const qux = { 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.separator.comma.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 diff --git a/tests/baselines/Issue131.baseline.txt b/tests/baselines/Issue131.baseline.txt index d9e1aca..0b2a145 100644 --- a/tests/baselines/Issue131.baseline.txt +++ b/tests/baselines/Issue131.baseline.txt @@ -20,8 +20,10 @@ 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 + ^ + source.ts meta.var.expr.ts punctuation.separator.comma.ts + ^ + source.ts meta.var.expr.ts ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^^^ diff --git a/tests/baselines/Issue139.baseline.txt b/tests/baselines/Issue139.baseline.txt index 22e6ff4..2f8f5bd 100644 --- a/tests/baselines/Issue139.baseline.txt +++ b/tests/baselines/Issue139.baseline.txt @@ -35,8 +35,10 @@ new new Proxy(function fn() { ^^ source.ts meta.function.ts meta.block.ts > console.log(this.constructor.name); - ^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^ source.ts meta.function.ts meta.block.ts + ^^^ + source.ts meta.function.ts meta.block.ts entity.name.function.ts ^ source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^^^ @@ -50,8 +52,10 @@ new new Proxy(function fn() { >}, {}); ^ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts - ^^ - source.ts + ^ + source.ts punctuation.separator.comma.ts + ^ + source.ts ^ source.ts meta.object-literal.ts punctuation.definition.block.ts ^ diff --git a/tests/baselines/Issue142.baseline.txt b/tests/baselines/Issue142.baseline.txt index 3e155cb..c3ca252 100644 --- a/tests/baselines/Issue142.baseline.txt +++ b/tests/baselines/Issue142.baseline.txt @@ -46,14 +46,18 @@ class x { source.ts meta.class.ts meta.field.declaration.ts meta.arrow.ts ^^^^ source.ts meta.class.ts meta.field.declaration.ts variable.language.this.ts - ^^^^^ + ^ source.ts meta.class.ts meta.field.declaration.ts + ^^^^ + source.ts meta.class.ts meta.field.declaration.ts entity.name.function.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.brace.round.ts ^^^^ source.ts meta.class.ts meta.field.declaration.ts variable.language.this.ts - ^^^^^^^^^^^ + ^^^^^ source.ts meta.class.ts meta.field.declaration.ts + ^^^^^^ + source.ts meta.class.ts meta.field.declaration.ts entity.name.function.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.brace.round.ts ^ @@ -64,16 +68,20 @@ class x { source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts - ^^ - source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^ source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts - ^^ - source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^^^^^ diff --git a/tests/baselines/Issue143.baseline.txt b/tests/baselines/Issue143.baseline.txt index e6825a5..2bc2bc4 100644 --- a/tests/baselines/Issue143.baseline.txt +++ b/tests/baselines/Issue143.baseline.txt @@ -63,7 +63,7 @@ export class AppComponent { ^ source.ts meta.decorator.ts punctuation.decorator.ts ^^^^^^^^^ - source.ts meta.decorator.ts + source.ts meta.decorator.ts entity.name.function.ts ^ source.ts meta.decorator.ts meta.brace.round.ts ^ @@ -120,7 +120,7 @@ export class AppComponent { ^ source.ts meta.class.ts meta.decorator.ts punctuation.decorator.ts ^^^^^^^^^^^^ - source.ts meta.class.ts meta.decorator.ts + source.ts meta.class.ts meta.decorator.ts entity.name.function.ts ^ source.ts meta.class.ts meta.decorator.ts meta.brace.round.ts ^ @@ -129,8 +129,10 @@ export class AppComponent { source.ts meta.class.ts meta.decorator.ts string.quoted.single.ts ^ source.ts meta.class.ts meta.decorator.ts string.quoted.single.ts punctuation.definition.string.end.ts - ^^ - source.ts meta.class.ts meta.decorator.ts + ^ + source.ts meta.class.ts meta.decorator.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.decorator.ts ^ source.ts meta.class.ts meta.decorator.ts meta.array.literal.ts meta.brace.square.ts ^ @@ -160,8 +162,10 @@ export class AppComponent { ^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts > console.log("button", btn, "number of clicks:", this.numberOfClicks++); - ^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^^^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ @@ -170,16 +174,24 @@ export class AppComponent { source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts - ^^^^^^^ - source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.separator.comma.ts + ^^^^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts - ^^ - source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts ^^^^^^^^^^^^^^^ @@ -206,7 +218,7 @@ export class AppComponent { ^ source.ts meta.decorator.ts punctuation.decorator.ts ^^^^^^^^^ - source.ts meta.decorator.ts + source.ts meta.decorator.ts entity.name.function.ts ^ source.ts meta.decorator.ts meta.brace.round.ts ^ @@ -228,8 +240,10 @@ export class AppComponent { 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 + ^ + source.ts meta.decorator.ts meta.object-literal.ts punctuation.separator.comma.ts + ^^ + source.ts meta.decorator.ts meta.object-literal.ts > template: ``, ^^ source.ts meta.decorator.ts meta.object-literal.ts @@ -245,8 +259,10 @@ export class AppComponent { 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 + ^ + source.ts meta.decorator.ts meta.object-literal.ts punctuation.separator.comma.ts + ^^ + source.ts meta.decorator.ts meta.object-literal.ts > directives: [CountClicks] ^^ source.ts meta.decorator.ts meta.object-literal.ts @@ -301,8 +317,10 @@ export class AppComponent { source.ts meta.class.ts meta.method.declaration.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts - ^^^^^^^^^^^^^^ + ^^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^^^^^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue148.baseline.txt b/tests/baselines/Issue148.baseline.txt index c4c9c5c..0edb94d 100644 --- a/tests/baselines/Issue148.baseline.txt +++ b/tests/baselines/Issue148.baseline.txt @@ -53,15 +53,17 @@ class Test { source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts - ^^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts + ^^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts > @inject("test") private test2: string, ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts punctuation.decorator.ts ^^^^^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts meta.brace.round.ts ^ @@ -86,15 +88,17 @@ class Test { source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts - ^^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts + ^^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts > @inject("test") test3: string, ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts punctuation.decorator.ts ^^^^^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.decorator.ts meta.brace.round.ts ^ @@ -115,8 +119,10 @@ class Test { source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts - ^^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts + ^^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts > public test4: string ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts diff --git a/tests/baselines/Issue153.baseline.txt b/tests/baselines/Issue153.baseline.txt index 0dcf8a3..6792c03 100644 --- a/tests/baselines/Issue153.baseline.txt +++ b/tests/baselines/Issue153.baseline.txt @@ -446,12 +446,20 @@ class Matrix { source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts - ^^^^^^ + ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts - ^^^^^^ + ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^ @@ -510,12 +518,20 @@ class Matrix { source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts - ^^^^^^ + ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts - ^^^^^^ + ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^ @@ -574,12 +590,20 @@ class Matrix { source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts - ^^^^^^ + ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts - ^^^^^^ + ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^ @@ -782,12 +806,20 @@ class Matrix { source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts - ^^^^^^ + ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts - ^^^^^^ + ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^ @@ -846,12 +878,20 @@ class Matrix { source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts - ^^^^^^ + ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts - ^^^^^^ + ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^ @@ -910,12 +950,20 @@ class Matrix { source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts - ^^^^^^ + ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts - ^^^^^^ + ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts variable.language.this.ts ^^^^ diff --git a/tests/baselines/Issue154.baseline.txt b/tests/baselines/Issue154.baseline.txt index 8ba5895..8c3c9d4 100644 --- a/tests/baselines/Issue154.baseline.txt +++ b/tests/baselines/Issue154.baseline.txt @@ -54,8 +54,10 @@ class TestCase2 { source.ts meta.class.ts meta.method.declaration.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts - ^^^^^^^^^^^^^^^^^^ + ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^^^^^^^^^^^^^^^^^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ @@ -116,8 +118,10 @@ class TestCase2 { source.ts meta.class.ts meta.method.declaration.ts meta.block.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts - ^^^^^^^^^^^^^^^^^^ + ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^^^^^^^^^^^^^^^^^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue155.baseline.txt b/tests/baselines/Issue155.baseline.txt index 0df612b..58ab9dd 100644 --- a/tests/baselines/Issue155.baseline.txt +++ b/tests/baselines/Issue155.baseline.txt @@ -17,14 +17,18 @@ matchQuery.find().then(function (results) { ----------------------------------- >matchQuery.find().then(function (results) { - ^^^^^^^^^^^^^^^ + ^^^^^^^^^^^ source.ts + ^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ source.ts meta.brace.round.ts - ^^^^^ + ^ source.ts + ^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^^^^^^^^ @@ -73,14 +77,18 @@ matchQuery.find().then(function (results) { ^^ source.ts meta.function.ts meta.block.ts meta.block.ts > notificationQuery.find().then(function (notifications){ - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts meta.block.ts meta.block.ts + ^^^^ + source.ts meta.function.ts meta.block.ts meta.block.ts entity.name.function.ts ^ source.ts meta.function.ts meta.block.ts meta.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.block.ts meta.block.ts + ^^^^ + source.ts meta.function.ts meta.block.ts meta.block.ts entity.name.function.ts ^ source.ts meta.function.ts meta.block.ts meta.block.ts meta.brace.round.ts ^^^^^^^^ @@ -138,8 +146,10 @@ matchQuery.find().then(function (results) { ^^ source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts > console.log('safeDeleteRoute notification result'+j); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts + ^^^ + source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts entity.name.function.ts ^ source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts meta.brace.round.ts ^ @@ -165,8 +175,10 @@ matchQuery.find().then(function (results) { source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts meta.array.literal.ts ^ source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts meta.array.literal.ts meta.brace.square.ts - ^^^^^^^^ + ^ source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts + ^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts entity.name.function.ts ^ source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.block.ts meta.brace.round.ts ^ @@ -181,8 +193,10 @@ matchQuery.find().then(function (results) { ^^ source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts > res.destroy(); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^^^^^ source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts + ^^^^^^^ + source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts entity.name.function.ts ^ source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.brace.round.ts ^ @@ -211,7 +225,7 @@ matchQuery.find().then(function (results) { ^ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts ^ - source.ts + source.ts punctuation.separator.comma.ts ^^^^^^^^ source.ts meta.function.ts storage.type.function.ts ^ @@ -225,8 +239,10 @@ matchQuery.find().then(function (results) { ^^ source.ts meta.function.ts meta.block.ts > alert("Error: "+error.code + " " + error.message); - ^^^^^^^^^^^^^ + ^^^^^^^^ source.ts meta.function.ts meta.block.ts + ^^^^^ + source.ts meta.function.ts meta.block.ts entity.name.function.ts ^ source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue156.baseline.txt b/tests/baselines/Issue156.baseline.txt index 9ef9dbc..5b35cca 100644 --- a/tests/baselines/Issue156.baseline.txt +++ b/tests/baselines/Issue156.baseline.txt @@ -45,7 +45,7 @@ class Test { ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts ^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts ^^ diff --git a/tests/baselines/Issue157.baseline.txt b/tests/baselines/Issue157.baseline.txt index 7643cdb..7e763b2 100644 --- a/tests/baselines/Issue157.baseline.txt +++ b/tests/baselines/Issue157.baseline.txt @@ -41,8 +41,10 @@ items.delete('foo'); source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts string.quoted.single.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts - ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts punctuation.separator.comma.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.begin.ts ^^^ @@ -58,8 +60,10 @@ items.delete('foo'); ^^^ source.ts >items.delete('foo'); - ^^^^^^^^^^^^ + ^^^^^^ source.ts + ^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue178.baseline.txt b/tests/baselines/Issue178.baseline.txt index d469cbc..4cf553a 100644 --- a/tests/baselines/Issue178.baseline.txt +++ b/tests/baselines/Issue178.baseline.txt @@ -100,7 +100,7 @@ const e: any = null; ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts meta.type.annotation.ts meta.type.tuple.ts support.type.primitive.ts ^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts meta.type.annotation.ts meta.type.tuple.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts meta.type.annotation.ts meta.type.tuple.ts punctuation.separator.comma.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts meta.type.annotation.ts meta.type.tuple.ts meta.type.paren.cover.ts ^ diff --git a/tests/baselines/Issue180.baseline.txt b/tests/baselines/Issue180.baseline.txt index 8d13829..b154b8d 100644 --- a/tests/baselines/Issue180.baseline.txt +++ b/tests/baselines/Issue180.baseline.txt @@ -82,8 +82,10 @@ for ( i=0, iLen=oSettings.aoPreSearchCols.length ; i $('input', n[i]).val( '' ); - ^^^^^^^^^ + ^^^^^^^^ source.ts meta.block.ts meta.block.ts + ^ + source.ts meta.block.ts meta.block.ts entity.name.function.ts ^ source.ts meta.block.ts meta.block.ts meta.brace.round.ts ^ @@ -118,8 +122,10 @@ for ( i=0, iLen=oSettings.aoPreSearchCols.length ; i console.log(param1); - ^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^ 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.arrow.ts meta.block.ts entity.name.function.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 ^^^^^^ @@ -99,8 +101,10 @@ 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 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 entity.name.function.ts ^ source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^^^^^ @@ -110,8 +114,10 @@ function myFunction(param1, param2, number, string, boolean) { ^^ 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 entity.name.function.ts ^ source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^^^^^^ @@ -125,8 +131,10 @@ function myFunction(param1, param2, number, string, boolean) { ^^ 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 entity.name.function.ts ^ source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^^^^^ @@ -136,8 +144,10 @@ function myFunction(param1, param2, number, string, boolean) { ^^ 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 entity.name.function.ts ^ source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^^^^^^ diff --git a/tests/baselines/Issue187.baseline.txt b/tests/baselines/Issue187.baseline.txt index 75ca339..9286ea2 100644 --- a/tests/baselines/Issue187.baseline.txt +++ b/tests/baselines/Issue187.baseline.txt @@ -32,12 +32,16 @@ const trim = module.exports = function(str) { 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.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 entity.name.function.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 entity.name.function.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^^ @@ -87,12 +91,16 @@ const trim = module.exports = function(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 entity.name.function.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 entity.name.function.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^^ diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt index 5cd7302..38c56c2 100644 --- a/tests/baselines/Issue191.baseline.txt +++ b/tests/baselines/Issue191.baseline.txt @@ -72,7 +72,7 @@ class Thing<^^T, ^^U> { ^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ - source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.function.ts + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts ^ source.ts meta.class.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 ^^^^^^^ @@ -109,18 +109,26 @@ class Thing<^^T, ^^U> { ^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts > gaze(path.join(this.content, "**/*.json"), (err, watch) => { - ^^^^^^^^^^^^ + ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^^^^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts - ^^^^^^^^^ + ^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^^^^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts - ^^^^^^^^^^ + ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^ @@ -130,7 +138,7 @@ class Thing<^^T, ^^U> { ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.separator.comma.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts ^ @@ -138,7 +146,7 @@ class Thing<^^T, ^^U> { ^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts punctuation.separator.parameter.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts ^^^^^ @@ -154,8 +162,10 @@ class Thing<^^T, ^^U> { ^ source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts + ^^^^^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^ @@ -199,8 +209,10 @@ class Thing<^^T, ^^U> { source.ts meta.class.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts - ^^ - source.ts meta.class.ts meta.type.parameters.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.type.parameters.ts ^ source.ts meta.class.ts meta.type.parameters.ts entity.name.type.ts ^ @@ -248,7 +260,7 @@ class Thing<^^T, ^^U> { ^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^^^^^ - source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts entity.name.function.ts + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts ^ source.ts meta.class.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 ^^^^^^^ @@ -285,18 +297,26 @@ class Thing<^^T, ^^U> { ^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts > gaze(path.join(this.content, "**/*.json"), (err, watch) => { - ^^^^^^^^^^^^ + ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^^^^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts - ^^^^^^^^^ + ^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^^^^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts - ^^^^^^^^^^ + ^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^ @@ -306,7 +326,7 @@ class Thing<^^T, ^^U> { ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ - source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.separator.comma.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts ^ @@ -314,7 +334,7 @@ class Thing<^^T, ^^U> { ^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts punctuation.separator.parameter.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.parameters.ts ^^^^^ @@ -330,8 +350,10 @@ class Thing<^^T, ^^U> { ^ source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts + ^^^^^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue191.txt b/tests/baselines/Issue191.txt index 480e12b..a0cd7e1 100644 --- a/tests/baselines/Issue191.txt +++ b/tests/baselines/Issue191.txt @@ -45,14 +45,14 @@ class Thing<^^T, ^^U> { ^^^^ [4, 26]: source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts + ^^^^ + [5, 9]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts ^^^^^^^^^ [5, 39]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts ^ [5, 49]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts > process.stuout.write(`Watching for changes in:`); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^^^^^^^^^^^^ [6, 13]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts ^^^^^^^^^^^^^^^^^^^^^^^^ [6, 35]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts string.template.ts @@ -89,14 +89,14 @@ class Thing<^^T, ^^U> { ^^^^ [14, 26]: source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts + ^^^^ + [15, 9]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts ^^^^^^^^^ [15, 39]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts ^ [15, 49]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts > process.stuout.write(`Watching for changes in:`); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^^^^^^^^^^^^ [16, 13]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts ^^^^^^^^^^^^^^^^^^^^^^^^ [16, 35]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts string.template.ts diff --git a/tests/baselines/Issue198.baseline.txt b/tests/baselines/Issue198.baseline.txt index 7830dce..931a1c2 100644 --- a/tests/baselines/Issue198.baseline.txt +++ b/tests/baselines/Issue198.baseline.txt @@ -23,8 +23,10 @@ let value2 = a / b / c * a + b / a / b / c; 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 punctuation.separator.comma.ts + ^ + source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ @@ -35,8 +37,10 @@ let value2 = a / b / c * a + b / a / b / c; 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 punctuation.separator.comma.ts + ^ + source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ diff --git a/tests/baselines/Issue203.baseline.txt b/tests/baselines/Issue203.baseline.txt index 5fae31f..c8850e6 100644 --- a/tests/baselines/Issue203.baseline.txt +++ b/tests/baselines/Issue203.baseline.txt @@ -29,8 +29,10 @@ while { while() {} } source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts string.quoted.single.ts ^ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts string.quoted.single.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.brace.round.ts ^ @@ -44,8 +46,10 @@ while { while() {} } ^^^ source.ts >console.log('hello'); - ^^^^^^^^^^^ + ^^^^^^^^ source.ts + ^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ @@ -82,8 +86,10 @@ while { while() {} } source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts string.quoted.single.ts ^ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts string.quoted.single.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.brace.round.ts ^ @@ -97,8 +103,10 @@ while { while() {} } ^^^ source.ts >console.log('hello'); - ^^^^^^^^^^^ + ^^^^^^^^ source.ts + ^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue208.baseline.txt b/tests/baselines/Issue208.baseline.txt index dc75581..3bdfd19 100644 --- a/tests/baselines/Issue208.baseline.txt +++ b/tests/baselines/Issue208.baseline.txt @@ -35,8 +35,10 @@ 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 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.separator.comma.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 support.type.primitive.ts ^ @@ -67,13 +69,15 @@ class MyClass { ^ 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.function.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.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 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.separator.comma.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 support.type.primitive.ts ^ @@ -129,8 +133,10 @@ class MyClass { source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts - ^^ - source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts ^^^^^^ source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ @@ -163,13 +169,15 @@ class MyClass { ^ source.ts meta.class.ts meta.field.declaration.ts ^^^^^^^^^ - source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.function.ts + source.ts meta.class.ts meta.field.declaration.ts entity.name.function.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts - ^^ - source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts ^^^^^^ source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts ^ @@ -210,8 +218,10 @@ class MyClass { source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts - ^^ - source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts ^^^^^^ source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts ^ @@ -240,13 +250,15 @@ class MyClass { ^ source.ts meta.class.ts meta.field.declaration.ts ^^^^^^^^^ - source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.function.ts + source.ts meta.class.ts meta.field.declaration.ts entity.name.function.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts - ^^ - source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts ^^^^^^ source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts ^ diff --git a/tests/baselines/Issue208.txt b/tests/baselines/Issue208.txt index 119cfe0..8425eb9 100644 --- a/tests/baselines/Issue208.txt +++ b/tests/baselines/Issue208.txt @@ -27,7 +27,7 @@ class MyClass { [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.function.ts + [2, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts ^^^^^^ [2, 25]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts ^^^^^^ @@ -51,7 +51,7 @@ class MyClass { ^^^^^^^^ [6, 12]: source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts ^^^^^^^^^ - [6, 23]: source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.function.ts + [6, 23]: source.ts meta.class.ts meta.field.declaration.ts entity.name.function.ts ^^^^^^ [6, 33]: source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts ^^^^^^ @@ -66,7 +66,7 @@ class MyClass { [8, 34]: source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts > someProp = makeThing('data'); ^^^^^^^^^ - [9, 16]: source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts entity.name.function.ts + [9, 16]: source.ts meta.class.ts meta.field.declaration.ts entity.name.function.ts ^^^^^^ [9, 26]: source.ts meta.class.ts meta.field.declaration.ts meta.type.parameters.ts support.type.primitive.ts ^^^^^^ diff --git a/tests/baselines/Issue212.baseline.txt b/tests/baselines/Issue212.baseline.txt index d868b08..d49646f 100644 --- a/tests/baselines/Issue212.baseline.txt +++ b/tests/baselines/Issue212.baseline.txt @@ -56,7 +56,7 @@ t.of = 4; // `of` is in blue but should be the same color as the above (1) ^^^ 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 punctuation.separator.parameter.ts ^ source.ts meta.arrow.ts meta.parameters.ts ^^^^ diff --git a/tests/baselines/Issue216.baseline.txt b/tests/baselines/Issue216.baseline.txt index 4af810f..b99bcc6 100644 --- a/tests/baselines/Issue216.baseline.txt +++ b/tests/baselines/Issue216.baseline.txt @@ -90,8 +90,10 @@ class MyType ^^^ source.ts meta.class.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts > console.log("Hello there!"); - ^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^ source.ts meta.class.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts + ^^^ + source.ts meta.class.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue217.baseline.txt b/tests/baselines/Issue217.baseline.txt index 7d379b0..0536f2a 100644 --- a/tests/baselines/Issue217.baseline.txt +++ b/tests/baselines/Issue217.baseline.txt @@ -34,7 +34,7 @@ export class StatusSelector2 { ^ source.ts meta.class.ts meta.decorator.ts punctuation.decorator.ts ^^^^^^ - source.ts meta.class.ts meta.decorator.ts + source.ts meta.class.ts meta.decorator.ts entity.name.function.ts ^ source.ts meta.class.ts meta.decorator.ts meta.brace.round.ts ^ @@ -80,8 +80,10 @@ export class StatusSelector2 { source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts - ^^ - source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^ @@ -123,7 +125,7 @@ export class StatusSelector2 { ^ source.ts meta.class.ts meta.decorator.ts punctuation.decorator.ts ^^^^^^ - source.ts meta.class.ts meta.decorator.ts + source.ts meta.class.ts meta.decorator.ts entity.name.function.ts ^ source.ts meta.class.ts meta.decorator.ts meta.brace.round.ts ^ @@ -169,8 +171,10 @@ export class StatusSelector2 { source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.end.ts - ^^ - source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^ diff --git a/tests/baselines/Issue218.baseline.txt b/tests/baselines/Issue218.baseline.txt index 57a42f7..76849f6 100644 --- a/tests/baselines/Issue218.baseline.txt +++ b/tests/baselines/Issue218.baseline.txt @@ -31,7 +31,7 @@ class A { ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts ^ @@ -65,7 +65,7 @@ class A { ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts ^ diff --git a/tests/baselines/Issue22.baseline.txt b/tests/baselines/Issue22.baseline.txt index e056b24..14a6b5e 100644 --- a/tests/baselines/Issue22.baseline.txt +++ b/tests/baselines/Issue22.baseline.txt @@ -5,8 +5,10 @@ app.get('/test/', (req, res) => { ----------------------------------- >app.get('/test/', (req, res) => { - ^^^^^^^ + ^^^^ source.ts + ^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ @@ -16,7 +18,7 @@ app.get('/test/', (req, res) => { ^ source.ts string.quoted.single.ts punctuation.definition.string.end.ts ^ - source.ts + source.ts punctuation.separator.comma.ts ^ source.ts meta.arrow.ts ^ @@ -24,7 +26,7 @@ app.get('/test/', (req, res) => { ^^^ 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 punctuation.separator.parameter.ts ^ source.ts meta.arrow.ts meta.parameters.ts ^^^ diff --git a/tests/baselines/Issue230.baseline.txt b/tests/baselines/Issue230.baseline.txt index 0a5c190..7733441 100644 --- a/tests/baselines/Issue230.baseline.txt +++ b/tests/baselines/Issue230.baseline.txt @@ -14,8 +14,10 @@ ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) = ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.ts comment.line.double-slash.ts >ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) => input.filter((value, index, array) => { - ^^^^^^^^^^^ + ^^^^^ source.ts + ^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ @@ -25,7 +27,7 @@ ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) = ^ source.ts string.quoted.double.ts punctuation.definition.string.end.ts ^ - source.ts + source.ts punctuation.separator.comma.ts ^ source.ts meta.arrow.ts ^ @@ -57,7 +59,7 @@ ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) = ^ source.ts meta.arrow.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.brace.square.ts ^ - source.ts meta.arrow.ts meta.arrow.ts meta.parameters.ts + source.ts meta.arrow.ts meta.arrow.ts meta.parameters.ts punctuation.separator.parameter.ts ^ source.ts meta.arrow.ts meta.arrow.ts meta.parameters.ts ^^^^ @@ -88,8 +90,10 @@ ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) = source.ts meta.arrow.ts storage.type.function.arrow.ts ^ source.ts meta.arrow.ts - ^^^^^^^^^^^^ + ^^^^^^ source.ts + ^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ @@ -97,13 +101,13 @@ ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) = ^^^^^ 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 punctuation.separator.parameter.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 + source.ts meta.arrow.ts meta.parameters.ts punctuation.separator.parameter.ts ^ source.ts meta.arrow.ts meta.parameters.ts ^^^^^ @@ -149,8 +153,10 @@ ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) = source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts - ^^^^^^^ + ^ source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^ + source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts ^ source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ @@ -171,8 +177,10 @@ ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) = source.ts meta.arrow.ts meta.block.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.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.template.ts punctuation.definition.string.template.end.ts - ^^ - source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.separator.comma.ts + ^ + source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.double.ts punctuation.definition.string.begin.ts ^^^^^^^^^^^^^^^^ @@ -181,8 +189,10 @@ ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) = source.ts meta.arrow.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.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts - ^^^^^^^ + ^ source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^ + source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts ^ source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ @@ -191,8 +201,10 @@ ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) = source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts ^ source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.ternary.ts - ^^^^^^^^^^ + ^ source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^^^^^^^^^ + source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.ts ^ source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^^^^^^^^^ @@ -209,16 +221,20 @@ ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) = source.ts meta.arrow.ts meta.block.ts ^^^^^^ source.ts meta.arrow.ts meta.block.ts keyword.control.flow.ts - ^^^^^^^ + ^ source.ts meta.arrow.ts meta.block.ts + ^^^^^^ + source.ts meta.arrow.ts meta.block.ts entity.name.function.ts ^ source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^^^^ source.ts meta.arrow.ts meta.block.ts ^ source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts - ^^^^^^^ + ^ source.ts meta.arrow.ts meta.block.ts + ^^^^^^ + source.ts meta.arrow.ts meta.block.ts entity.name.function.ts ^ source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^ @@ -233,16 +249,20 @@ ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) = source.ts meta.arrow.ts meta.block.ts ^^^ source.ts meta.arrow.ts meta.block.ts keyword.operator.comparison.ts - ^^^^^^^ + ^ source.ts meta.arrow.ts meta.block.ts + ^^^^^^ + source.ts meta.arrow.ts meta.block.ts entity.name.function.ts ^ source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^^^^^ source.ts meta.arrow.ts meta.block.ts ^ source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts - ^^^^^^^ + ^ source.ts meta.arrow.ts meta.block.ts + ^^^^^^ + source.ts meta.arrow.ts meta.block.ts entity.name.function.ts ^ source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue232.baseline.txt b/tests/baselines/Issue232.baseline.txt index c5a64f7..ebaf6c7 100644 --- a/tests/baselines/Issue232.baseline.txt +++ b/tests/baselines/Issue232.baseline.txt @@ -57,8 +57,10 @@ for( let [k, component] of this.components){ 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.assignment.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 entity.name.function.ts ^ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue235.baseline.txt b/tests/baselines/Issue235.baseline.txt index 211c088..2ec4fd2 100644 --- a/tests/baselines/Issue235.baseline.txt +++ b/tests/baselines/Issue235.baseline.txt @@ -26,8 +26,10 @@ class A { source.ts meta.class.ts ^ source.ts meta.class.ts meta.decorator.ts punctuation.decorator.ts - ^^^^^^^^^ + ^^^^^^ source.ts meta.class.ts meta.decorator.ts + ^^^ + source.ts meta.class.ts meta.decorator.ts entity.name.function.ts ^ source.ts meta.class.ts meta.decorator.ts meta.brace.round.ts ^ @@ -56,7 +58,7 @@ class A { ^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts ^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts ^ @@ -82,8 +84,10 @@ class A { ^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts > s.sendFile(); - ^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts + ^^^^^^^^ + source.ts meta.class.ts meta.method.declaration.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue241.baseline.txt b/tests/baselines/Issue241.baseline.txt index 9bacbe8..4f43329 100644 --- a/tests/baselines/Issue241.baseline.txt +++ b/tests/baselines/Issue241.baseline.txt @@ -94,7 +94,7 @@ function foo2(): [number, () => { x: number }] { ^^^^^^ 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 punctuation.separator.comma.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.paren.cover.ts ^ @@ -285,7 +285,7 @@ function foo2(): [number, () => { x: number }] { ^^^^^^ 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 punctuation.separator.comma.ts ^ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.paren.cover.ts ^ diff --git a/tests/baselines/Issue243.baseline.txt b/tests/baselines/Issue243.baseline.txt index ef8aa74..9ea17c4 100644 --- a/tests/baselines/Issue243.baseline.txt +++ b/tests/baselines/Issue243.baseline.txt @@ -239,8 +239,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -302,8 +304,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -365,8 +369,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -428,8 +434,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -491,8 +499,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -554,8 +564,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -617,8 +629,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -680,8 +694,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -743,8 +759,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -806,8 +824,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -869,8 +889,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -932,8 +954,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -995,8 +1019,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1058,8 +1084,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1121,8 +1149,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1184,8 +1214,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1247,8 +1279,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1310,8 +1344,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1373,8 +1409,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1436,8 +1474,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1499,8 +1539,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1562,8 +1604,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1625,8 +1669,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1688,8 +1734,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1751,8 +1799,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1814,8 +1864,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1877,8 +1929,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -1940,8 +1994,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -2003,8 +2059,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -2066,8 +2124,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -2129,8 +2189,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -2192,8 +2254,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ @@ -2255,8 +2319,10 @@ original file source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts keyword.operator.quantifier.regexp ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts string.regex.ts punctuation.definition.string.end.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 entity.name.function.ts ^ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts meta.brace.round.ts ^^^^^^ diff --git a/tests/baselines/Issue244.baseline.txt b/tests/baselines/Issue244.baseline.txt index 570e39a..5f2dd44 100644 --- a/tests/baselines/Issue244.baseline.txt +++ b/tests/baselines/Issue244.baseline.txt @@ -10,8 +10,10 @@ const targetY = targetSideObs('y'); ----------------------------------- >a.withLatestFrom(axis === 'x' ? initialX : initialY) - ^^^^^^^^^^^^^^^^ + ^^ source.ts + ^^^^^^^^^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^^^^^ @@ -41,8 +43,10 @@ const targetY = targetSideObs('y'); ^^ source.ts > .map(x => undefined) - ^^^^^ + ^^ source.ts + ^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ @@ -60,8 +64,10 @@ const targetY = targetSideObs('y'); ^^ source.ts > .switch() - ^^^^^^^^ + ^^ source.ts + ^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ @@ -69,14 +75,18 @@ const targetY = targetSideObs('y'); ^^ source.ts > .publish().refCount(); - ^^^^^^^^^ + ^^ source.ts + ^^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ source.ts meta.brace.round.ts - ^^^^^^^^^ + ^ source.ts + ^^^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ @@ -97,8 +107,10 @@ const targetY = targetSideObs('y'); 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 entity.name.function.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ @@ -122,8 +134,10 @@ const targetY = targetSideObs('y'); 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 entity.name.function.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue247.baseline.txt b/tests/baselines/Issue247.baseline.txt index 8a9744e..18d15af 100644 --- a/tests/baselines/Issue247.baseline.txt +++ b/tests/baselines/Issue247.baseline.txt @@ -10,7 +10,7 @@ class Test { ^ source.tsx meta.decorator.tsx punctuation.decorator.tsx ^^^ - source.tsx meta.decorator.tsx meta.type.parameters.tsx entity.name.function.tsx + source.tsx meta.decorator.tsx entity.name.function.tsx ^ source.tsx meta.decorator.tsx meta.type.parameters.tsx punctuation.definition.typeparameters.begin.tsx ^ diff --git a/tests/baselines/Issue249.baseline.txt b/tests/baselines/Issue249.baseline.txt index 9235509..322be7c 100644 --- a/tests/baselines/Issue249.baseline.txt +++ b/tests/baselines/Issue249.baseline.txt @@ -33,7 +33,7 @@ function selectDictionary(dictionaries: StoredDictionaries, lang:string) { ^^^^^^^^^^^^^^^^^^ 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 punctuation.separator.parameter.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.parameters.ts ^^^^ @@ -83,7 +83,7 @@ function selectDictionary(dictionaries: StoredDictionaries, lang:string) { ^^^^^^^^^^^^^^^^^^ 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 punctuation.separator.parameter.ts ^ source.ts meta.function.ts meta.parameters.ts ^^^^ diff --git a/tests/baselines/Issue250.baseline.txt b/tests/baselines/Issue250.baseline.txt index bcecad6..0c66fc7 100644 --- a/tests/baselines/Issue250.baseline.txt +++ b/tests/baselines/Issue250.baseline.txt @@ -135,12 +135,18 @@ export class FormType extends Type { ^^^^^^^^^^^^^^^^^^^^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts comment.line.double-slash.ts > type.defineField(DesignID.Embed, new BooleanAtom(false)); - ^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts + ^^^^^^^^^^^ + source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.brace.round.ts - ^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts ^^^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ @@ -168,12 +174,18 @@ export class FormType extends Type { ^^^^^^^^^^^^^^^^^^^^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts comment.line.double-slash.ts > type.defineField(DesignID.Plan, PlanChoice.Original); - ^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts + ^^^^^^^^^^^ + source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.brace.round.ts - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.separator.comma.ts + ^^^^^^^^^^^^^^^^^^^^ + source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^^ @@ -204,12 +216,18 @@ export class FormType extends Type { ^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts > type.defineField(DesignID.Fields, new Ordering(new FieldDesign)); - ^^^^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts + ^^^^^^^^^^^ + source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts entity.name.function.ts ^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.brace.round.ts - ^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.separator.comma.ts + ^ + source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts ^^^ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts new.expr.ts keyword.operator.new.ts ^ diff --git a/tests/baselines/Issue251.baseline.txt b/tests/baselines/Issue251.baseline.txt index 85bdbf4..a4816b8 100644 --- a/tests/baselines/Issue251.baseline.txt +++ b/tests/baselines/Issue251.baseline.txt @@ -107,8 +107,10 @@ for(var j=0; (j output.push( {h, w, x: k*w, y: h*j, file: file.file}); - ^^^^^^^^^^^^^^^ + ^^^^^^^^^^^ source.ts meta.block.ts meta.block.ts + ^^^^ + source.ts meta.block.ts meta.block.ts entity.name.function.ts ^ source.ts meta.block.ts meta.block.ts meta.brace.round.ts ^ @@ -117,12 +119,16 @@ for(var j=0; (jvoid newFunctionName(){ ^^^^ source.ts keyword.operator.void.ts - ^^^^^^^^^^^^^^^^ + ^ source.ts + ^^^^^^^^^^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ @@ -487,8 +491,10 @@ var j: I = {} 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 - ^^ - source.ts meta.var.expr.ts meta.var-single-variable.expr.ts + ^ + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts punctuation.separator.comma.ts + ^ + 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 ^ diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt index e5b29a5..144cf05 100644 --- a/tests/baselines/Issue37.txt +++ b/tests/baselines/Issue37.txt @@ -86,8 +86,8 @@ var j: I = {} >if (object.instanceof(ClassNew)) { ^^ [6, 1]: source.ts keyword.control.conditional.ts - ^^^^^^^^^^^^^^^^^ - [6, 12]: source.ts + ^^^^^^^^^^ + [6, 12]: source.ts entity.name.function.ts >} > >class class1(){ @@ -119,8 +119,8 @@ var j: I = {} >void newFunctionName(){ ^^^^ [19, 1]: source.ts keyword.operator.void.ts - ^^^^^^^^^^^^^^^^ - [19, 6]: source.ts + ^^^^^^^^^^^^^^^ + [19, 6]: source.ts entity.name.function.ts > > var c = a + b; ^^^ diff --git a/tests/baselines/Issue42.baseline.txt b/tests/baselines/Issue42.baseline.txt index f6d5b3c..f10f4f3 100644 --- a/tests/baselines/Issue42.baseline.txt +++ b/tests/baselines/Issue42.baseline.txt @@ -15,8 +15,10 @@ original file source.ts ^^^^ source.ts variable.language.this.ts - ^^^^^^^^^^^^ + ^ source.ts + ^^^^^^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ @@ -46,8 +48,10 @@ original file source.ts meta.arrow.ts meta.block.ts ^ source.ts meta.arrow.ts meta.block.ts keyword.operator.assignment.ts - ^^^^^^^^^^^^ + ^^^^^^ source.ts meta.arrow.ts meta.block.ts + ^^^^^^ + source.ts meta.arrow.ts meta.block.ts entity.name.function.ts ^ source.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue43.baseline.txt b/tests/baselines/Issue43.baseline.txt index 6fd87ee..1edb1b3 100644 --- a/tests/baselines/Issue43.baseline.txt +++ b/tests/baselines/Issue43.baseline.txt @@ -15,8 +15,10 @@ $this.addClass("hehe"); 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 entity.name.function.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^^^ @@ -26,8 +28,10 @@ $this.addClass("hehe"); ^^^ source.ts >$this.addClass("hehe"); - ^^^^^^^^^^^^^^ + ^^^^^^ source.ts + ^^^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ diff --git a/tests/baselines/Issue63.baseline.txt b/tests/baselines/Issue63.baseline.txt index ff8e514..df8b38d 100644 --- a/tests/baselines/Issue63.baseline.txt +++ b/tests/baselines/Issue63.baseline.txt @@ -269,8 +269,8 @@ type Callback = ^^(error: Error, value: T) => ^^any 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 + ^ + source.ts meta.type.declaration.ts meta.object.type.ts punctuation.separator.comma.ts > bar: number ^ source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts diff --git a/tests/baselines/Issue64.baseline.txt b/tests/baselines/Issue64.baseline.txt index e91559e..f29aa8b 100644 --- a/tests/baselines/Issue64.baseline.txt +++ b/tests/baselines/Issue64.baseline.txt @@ -15,12 +15,18 @@ res.download = function download(path, filename, fn) { source.ts ^ source.ts keyword.operator.assignment.ts - ^^^^^^^^^^^^^^^^^^^ + ^^^^^^^^^^^ source.ts + ^^^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts - ^^^^^^^^^^^^^^^ + ^^^^^^^^^^^^ source.ts + ^ + source.ts punctuation.separator.comma.ts + ^^ + source.ts > 'res.sendfile: Use res.sendFile instead'); ^^ source.ts @@ -63,13 +69,13 @@ res.download = function download(path, filename, fn) { ^^^^ source.ts meta.function.ts meta.parameters.ts variable.parameter.ts ^ - source.ts meta.function.ts meta.parameters.ts + source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.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 + source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts ^ source.ts meta.function.ts meta.parameters.ts ^^ diff --git a/tests/baselines/Issue77.baseline.txt b/tests/baselines/Issue77.baseline.txt index fb099a4..5005d86 100644 --- a/tests/baselines/Issue77.baseline.txt +++ b/tests/baselines/Issue77.baseline.txt @@ -27,7 +27,7 @@ function foo() { } ^^^^ source.ts constant.language.null.ts ^ - source.ts + source.ts punctuation.separator.comma.ts ^ source.ts cast.expr.ts ^ @@ -119,7 +119,7 @@ function foo() { } ^^^^ source.ts constant.language.null.ts ^ - source.ts + source.ts punctuation.separator.comma.ts ^ source.ts cast.expr.ts ^ diff --git a/tests/baselines/Issue82.baseline.txt b/tests/baselines/Issue82.baseline.txt index a384125..2fdde81 100644 --- a/tests/baselines/Issue82.baseline.txt +++ b/tests/baselines/Issue82.baseline.txt @@ -39,8 +39,10 @@ class Foo { source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts - ^^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts + ^ + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts ^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts comment.line.double-slash.ts punctuation.definition.comment.ts ^^^^^^^^^ diff --git a/tests/baselines/Issue87.baseline.txt b/tests/baselines/Issue87.baseline.txt index eba6eed..83a693e 100644 --- a/tests/baselines/Issue87.baseline.txt +++ b/tests/baselines/Issue87.baseline.txt @@ -37,16 +37,20 @@ if (!req.body.new) { source.ts meta.block.ts ^^^^^^ source.ts meta.block.ts keyword.control.flow.ts - ^^^^^^^^^^^ + ^^^^^ source.ts meta.block.ts + ^^^^^^ + source.ts meta.block.ts entity.name.function.ts ^ source.ts meta.block.ts meta.brace.round.ts ^^^ source.ts meta.block.ts constant.numeric.decimal.ts ^ source.ts meta.block.ts meta.brace.round.ts - ^^^^^ + ^ source.ts meta.block.ts + ^^^^ + source.ts meta.block.ts entity.name.function.ts ^ source.ts meta.block.ts meta.brace.round.ts ^ diff --git a/tests/baselines/ParameterProperties.baseline.txt b/tests/baselines/ParameterProperties.baseline.txt index 740ac20..55e8c1a 100644 --- a/tests/baselines/ParameterProperties.baseline.txt +++ b/tests/baselines/ParameterProperties.baseline.txt @@ -40,7 +40,7 @@ class A { ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts ^^^^^^^^^ @@ -56,7 +56,7 @@ class A { ^^^^^^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts + source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.separator.parameter.ts ^ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts ^^^^^^ diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt index a3c119d..d4583bf 100644 --- a/tests/baselines/TsxSamples.baseline.txt +++ b/tests/baselines/TsxSamples.baseline.txt @@ -78,8 +78,10 @@ var e =
source.tsx meta.class.tsx meta.type.parameters.tsx punctuation.definition.typeparameters.begin.tsx ^^^^^ source.tsx meta.class.tsx meta.type.parameters.tsx entity.name.type.tsx - ^^ - source.tsx meta.class.tsx meta.type.parameters.tsx + ^ + source.tsx meta.class.tsx meta.type.parameters.tsx punctuation.separator.comma.tsx + ^ + source.tsx meta.class.tsx meta.type.parameters.tsx ^^^^^ source.tsx meta.class.tsx meta.type.parameters.tsx entity.name.type.tsx ^ @@ -694,8 +696,10 @@ var e =
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.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.jsx.children.tsx meta.brace.curly.tsx + ^^^^^^^^^^^^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx entity.name.function.tsx ^ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx meta.brace.round.tsx ^^^ @@ -751,8 +755,10 @@ var e =
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.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.jsx.children.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.jsx.children.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.jsx.children.tsx meta.brace.curly.tsx meta.array.literal.tsx punctuation.separator.comma.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.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.jsx.children.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx ^^^^ @@ -771,8 +777,10 @@ var e =
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.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 meta.tag.without-attributes.tsx meta.jsx.children.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 meta.tag.without-attributes.tsx meta.jsx.children.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.jsx.children.tsx meta.brace.curly.tsx meta.array.literal.tsx punctuation.separator.comma.tsx + ^ + source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.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.jsx.children.tsx meta.brace.curly.tsx meta.array.literal.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx ^^^^^^^ diff --git a/tests/baselines/TsxSamples.txt b/tests/baselines/TsxSamples.txt index 96ed53b..675c355 100644 --- a/tests/baselines/TsxSamples.txt +++ b/tests/baselines/TsxSamples.txt @@ -212,7 +212,7 @@ var e =
^ [48, 15]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.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 meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx >var c =
{['First ', ·, ' Second']}
^ diff --git a/tests/baselines/arrowInsideCall.baseline.txt b/tests/baselines/arrowInsideCall.baseline.txt index 05f3455..998bf47 100644 --- a/tests/baselines/arrowInsideCall.baseline.txt +++ b/tests/baselines/arrowInsideCall.baseline.txt @@ -4,8 +4,10 @@ optsList.sort((a, b) => compareValues(a.name.toLowerCase(), b.name.toLow ----------------------------------- >optsList.sort((a, b) => compareValues(a.name.toLowerCase(), b.name.toLowerCase())); - ^^^^^^^^^^^^^ + ^^^^^^^^^ source.ts + ^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ @@ -13,7 +15,7 @@ optsList.sort((a, b) => compareValues(a.name.toLowerCase(), b.name.toLow ^ 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 punctuation.separator.parameter.ts ^ source.ts meta.arrow.ts meta.parameters.ts ^ @@ -27,7 +29,7 @@ optsList.sort((a, b) => compareValues(a.name.toLowerCase(), b.name.toLow ^ source.ts meta.arrow.ts ^^^^^^^^^^^^^ - source.ts meta.type.parameters.ts entity.name.function.ts + source.ts entity.name.function.ts ^ source.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts ^^^^^^ @@ -36,14 +38,20 @@ optsList.sort((a, b) => compareValues(a.name.toLowerCase(), b.name.toLow source.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts ^ source.ts meta.brace.round.ts - ^^^^^^^^^^^^^^^^^^ + ^^^^^^^ source.ts + ^^^^^^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ source.ts meta.brace.round.ts - ^^^^^^^^^^^^^^^^^^^^ - source.ts + ^ + source.ts punctuation.separator.comma.ts + ^^^^^^^^ + source.ts + ^^^^^^^^^^^ + source.ts entity.name.function.ts ^ source.ts meta.brace.round.ts ^ diff --git a/tests/baselines/docComments.baseline.txt b/tests/baselines/docComments.baseline.txt index c664a08..4f3ee6e 100644 --- a/tests/baselines/docComments.baseline.txt +++ b/tests/baselines/docComments.baseline.txt @@ -80,7 +80,7 @@ function foo(param1: string, param2: number) { ^^^^^^ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts ^ - source.ts meta.function.ts meta.parameters.ts + source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts ^ source.ts meta.function.ts meta.parameters.ts ^^^^^^ diff --git a/tests/baselines/generator.baseline.txt b/tests/baselines/generator.baseline.txt index f38929c..c2fe773 100644 --- a/tests/baselines/generator.baseline.txt +++ b/tests/baselines/generator.baseline.txt @@ -177,8 +177,10 @@ class c { 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 punctuation.separator.comma.ts + ^ + source.ts meta.var.expr.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt index 747928e..f47c9c1 100644 --- a/tests/baselines/multipleVariableDeclaration.baseline.txt +++ b/tests/baselines/multipleVariableDeclaration.baseline.txt @@ -15,12 +15,16 @@ 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 + ^ + source.ts meta.var.expr.ts punctuation.separator.comma.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 + ^ + source.ts meta.var.expr.ts punctuation.separator.comma.ts + ^ + source.ts meta.var.expr.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" @@ -38,8 +42,10 @@ 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.decimal.ts - ^^ - source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts punctuation.separator.comma.ts + ^ + source.ts meta.var.expr.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ @@ -74,8 +80,10 @@ var ^^obj = { 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 + ^ + source.ts meta.var.expr.ts punctuation.separator.comma.ts + ^ + source.ts meta.var.expr.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ @@ -115,8 +123,10 @@ var ^^obj = { 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 meta.var.expr.ts + ^ + source.ts meta.var.expr.ts punctuation.separator.comma.ts + ^ + source.ts meta.var.expr.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ @@ -153,8 +163,10 @@ var ^^obj = { 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.block.ts punctuation.definition.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.arrow.ts meta.block.ts entity.name.function.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.arrow.ts meta.block.ts meta.brace.round.ts ^ @@ -169,8 +181,10 @@ var ^^obj = { 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.arrow.ts meta.block.ts punctuation.definition.block.ts - ^^ - source.ts meta.var.expr.ts + ^ + source.ts meta.var.expr.ts punctuation.separator.comma.ts + ^ + source.ts meta.var.expr.ts ^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ @@ -222,8 +236,10 @@ var ^^obj = { >}, other = 10; ^ 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 + ^ + source.ts meta.var.expr.ts punctuation.separator.comma.ts + ^ + source.ts meta.var.expr.ts ^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts ^ diff --git a/tests/baselines/parameterBindingPattern.baseline.txt b/tests/baselines/parameterBindingPattern.baseline.txt index b0f8a70..0da00d2 100644 --- a/tests/baselines/parameterBindingPattern.baseline.txt +++ b/tests/baselines/parameterBindingPattern.baseline.txt @@ -93,8 +93,10 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { 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 + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.separator.comma.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 @@ -113,8 +115,10 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { 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 + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts punctuation.separator.comma.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 @@ -143,8 +147,10 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { 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 + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.separator.comma.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 @@ -167,8 +173,10 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { 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 + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts punctuation.separator.comma.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 @@ -184,8 +192,10 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { 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 punctuation.separator.comma.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 ^ @@ -210,8 +220,10 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { 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 punctuation.separator.comma.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 ^ @@ -338,8 +350,10 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { source.ts meta.function.ts meta.parameters.ts ^ source.ts meta.function.ts meta.parameters.ts keyword.operator.assignment.ts - ^^^^ + ^ source.ts meta.function.ts meta.parameters.ts + ^^^ + source.ts meta.function.ts meta.parameters.ts entity.name.function.ts ^ source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts ^ @@ -553,8 +567,10 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { 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.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.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.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts punctuation.separator.comma.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.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 ^^ @@ -588,8 +604,10 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ source.ts meta.function.ts meta.parameters.ts keyword.operator.assignment.ts - ^^^^ + ^ source.ts meta.function.ts meta.parameters.ts + ^^^ + source.ts meta.function.ts meta.parameters.ts entity.name.function.ts ^ source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts ^ @@ -655,7 +673,7 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { ^ 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 punctuation.separator.comma.ts ^^^^^^ source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts support.type.primitive.ts ^ @@ -684,8 +702,10 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { 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 punctuation.separator.comma.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 ^^^^^ @@ -733,8 +753,10 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { source.ts meta.function.ts meta.parameters.ts ^ source.ts meta.function.ts meta.parameters.ts keyword.operator.assignment.ts - ^^^^ + ^ source.ts meta.function.ts meta.parameters.ts + ^^^ + source.ts meta.function.ts meta.parameters.ts entity.name.function.ts ^ source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts ^ @@ -799,8 +821,10 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { 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.parameters.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 + ^ + source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts punctuation.separator.comma.ts + ^ + source.ts meta.function.ts meta.parameters.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 support.type.primitive.ts ^ @@ -809,8 +833,10 @@ function bar3([{hello}, world]: [{ hello: string }, string] = bar()) { source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts ^ source.ts meta.function.ts meta.parameters.ts keyword.operator.assignment.ts - ^^^^ + ^ source.ts meta.function.ts meta.parameters.ts + ^^^ + source.ts meta.function.ts meta.parameters.ts entity.name.function.ts ^ source.ts meta.function.ts meta.parameters.ts meta.brace.round.ts ^ diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt index bf06483..3a640f3 100644 --- a/tests/baselines/pr48_noSemiColon.baseline.txt +++ b/tests/baselines/pr48_noSemiColon.baseline.txt @@ -149,8 +149,10 @@ class Test { 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 entity.name.function.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts ^^^ @@ -215,16 +217,20 @@ class Test { 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 entity.name.function.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 + ^^^^ + source.ts meta.function.ts meta.block.ts entity.name.function.ts ^ source.ts meta.function.ts meta.block.ts meta.brace.round.ts ^^^^ @@ -235,14 +241,16 @@ 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 meta.arrow.ts - ^^^^^^^^^^^ + ^^^^^ source.ts meta.function.ts meta.block.ts + ^^^^^^ + source.ts meta.function.ts meta.block.ts entity.name.function.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 punctuation.separator.comma.ts ^ source.ts meta.function.ts meta.block.ts meta.arrow.ts ^ @@ -286,17 +294,21 @@ class Test { ^ 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.function.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.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 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.separator.comma.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 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.separator.comma.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 support.type.primitive.ts ^ @@ -325,13 +337,15 @@ class Test { ^ 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.function.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts entity.name.function.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 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.separator.comma.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 support.type.primitive.ts ^ @@ -342,8 +356,10 @@ 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 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 punctuation.separator.comma.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 support.type.primitive.ts ^ diff --git a/tests/baselines/readonly.baseline.txt b/tests/baselines/readonly.baseline.txt index 8c1ee48..a4f4eae 100644 --- a/tests/baselines/readonly.baseline.txt +++ b/tests/baselines/readonly.baseline.txt @@ -156,7 +156,7 @@ let xx: { readonly [x: string]: string }; ^^^^^^ source.ts meta.var.expr.ts meta.var-single-variable.expr.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.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts + source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts punctuation.separator.comma.ts ^ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts ^ diff --git a/tests/baselines/variableBindingPattern.baseline.txt b/tests/baselines/variableBindingPattern.baseline.txt index 9b49ffb..8b0270a 100644 --- a/tests/baselines/variableBindingPattern.baseline.txt +++ b/tests/baselines/variableBindingPattern.baseline.txt @@ -89,8 +89,10 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); 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 + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.separator.comma.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 @@ -109,8 +111,10 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); 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 + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts punctuation.separator.comma.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 @@ -139,8 +143,10 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); 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 + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.ts punctuation.separator.comma.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 @@ -163,8 +169,10 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); 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 + ^ + source.ts meta.function.ts meta.block.ts meta.object-literal.ts punctuation.separator.comma.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 @@ -180,8 +188,10 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); 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 punctuation.separator.comma.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 ^ @@ -206,8 +216,10 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); 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 punctuation.separator.comma.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 ^ @@ -330,8 +342,10 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); 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 entity.name.function.ts ^ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.brace.round.ts ^ @@ -530,8 +544,10 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); 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 punctuation.separator.comma.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 ^^ @@ -565,8 +581,10 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); 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 entity.name.function.ts ^ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.brace.round.ts ^ @@ -621,7 +639,7 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); ^ 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 punctuation.separator.comma.ts ^^^^^^ source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts support.type.primitive.ts ^ @@ -650,8 +668,10 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); 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 punctuation.separator.comma.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 ^^^^^ @@ -695,8 +715,10 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); 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 entity.name.function.ts ^ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.brace.round.ts ^ @@ -746,8 +768,10 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); 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 punctuation.separator.comma.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 ^ @@ -756,8 +780,10 @@ var [{hello}, world]: [{ hello: string }, string] = bar(); 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 entity.name.function.ts ^ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.brace.round.ts ^