();
^^^^
- [13, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [13, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
^^^^^^^
- [13, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts
+ [13, 28]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.parameters.ts support.type.primitive.ts
^
- [13, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
+ [13, 37]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
> this.store = new Data();
^^^^
- [14, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts
+ [14, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
^^^^
- [14, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts new.expr.ts entity.name.type.ts
+ [14, 26]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts
> gaze(path.join(this.content, "**/*.json"), (err, watch) => {
^^^^^^^^^^^^
- [15, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ [15, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^^^^^^^
- [15, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.double.ts
+ [15, 39]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.double.ts
^
- [15, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts
+ [15, 49]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
> process.stuout.write(`Watching for changes in:`);
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- [16, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts
+ [16, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts
^^^^^^^^^^^^^^^^^^^^^^^^
- [16, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts string.template.ts
+ [16, 35]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts string.template.ts
^
- [16, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts meta.brace.round.ts
+ [16, 60]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.brace.round.ts
> })
> };
>}
diff --git a/tests/baselines/Issue200.baseline.txt b/tests/baselines/Issue200.baseline.txt
index 365c324..4874a1e 100644
--- a/tests/baselines/Issue200.baseline.txt
+++ b/tests/baselines/Issue200.baseline.txt
@@ -32,20 +32,20 @@ original file
^
source.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
> import alias = lool.clutz.goog.i18n.NumberFormatSymbols_en_TT;
^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^^^^^^
- source.ts meta.decl.block.ts keyword.control.import.ts
+ source.ts meta.block.ts keyword.control.import.ts
^^^^^^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^
- source.ts meta.decl.block.ts keyword.operator.assignment.ts
+ source.ts meta.block.ts keyword.operator.assignment.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
> export default alias;
^^
source.ts meta.block.ts
@@ -59,4 +59,4 @@ original file
source.ts meta.decl.block.ts
>}
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
\ No newline at end of file
+ source.ts meta.block.ts punctuation.definition.block.ts
\ No newline at end of file
diff --git a/tests/baselines/Issue241.baseline.txt b/tests/baselines/Issue241.baseline.txt
index 2a50d33..fee0b7b 100644
--- a/tests/baselines/Issue241.baseline.txt
+++ b/tests/baselines/Issue241.baseline.txt
@@ -47,31 +47,31 @@ function foo2(): [number, () => { x: number }] {
^
source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
> const x = 0;
^^^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^^^^^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts storage.type.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
^^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
>}
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
^^
source.ts
>function foo(): [number, () => number] {
@@ -114,31 +114,31 @@ function foo2(): [number, () => { x: number }] {
^
source.ts meta.function.ts meta.return.type.ts
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
> const x = 0;
^^^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^^^^^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts storage.type.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
^^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
>}
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
^^
source.ts
>function f(): () => number {
@@ -171,31 +171,31 @@ function foo2(): [number, () => { x: number }] {
^
source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
> const x = 0;
^^^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^^^^^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts storage.type.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
^^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
>}
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
^^
source.ts
>function f2(): () => {x: number }{
@@ -238,31 +238,31 @@ function foo2(): [number, () => { x: number }] {
^
source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts punctuation.definition.block.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
> const x = 0;
^^^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^^^^^
- source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts
+ source.ts meta.block.ts meta.var.expr.ts storage.type.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts
+ source.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
^^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
>}
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^^
source.ts
>function foo2(): [number, () => { x: number }] {
@@ -319,28 +319,28 @@ function foo2(): [number, () => { x: number }] {
^
source.ts meta.function.ts meta.return.type.ts
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
> const x = 0;
^^^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^^^^^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts storage.type.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
^^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
>}
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
\ No newline at end of file
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
\ No newline at end of file
diff --git a/tests/baselines/Issue262.baseline.txt b/tests/baselines/Issue262.baseline.txt
index d85be8d..966ed51 100644
--- a/tests/baselines/Issue262.baseline.txt
+++ b/tests/baselines/Issue262.baseline.txt
@@ -45,52 +45,52 @@ for (^^let a = 1; a ^^< 10; a++) {
^
source.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
> for (let b = 1; b < a; b++) {
^^^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^^^
- source.ts meta.decl.block.ts keyword.control.loop.ts
+ source.ts meta.block.ts keyword.control.loop.ts
^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^
- source.ts meta.decl.block.ts meta.brace.round.ts
+ source.ts meta.block.ts meta.brace.round.ts
^^^
- source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts
+ source.ts meta.block.ts meta.var.expr.ts storage.type.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts
+ source.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.decimal.ts
^^^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^
- source.ts meta.decl.block.ts keyword.operator.relational.ts
+ source.ts meta.block.ts keyword.operator.relational.ts
^^^^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^^
- source.ts meta.decl.block.ts keyword.operator.increment.ts
+ source.ts meta.block.ts keyword.operator.increment.ts
^
- source.ts meta.decl.block.ts meta.brace.round.ts
+ source.ts meta.block.ts meta.brace.round.ts
^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^
- source.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts
>
^^^^^^^^^
- source.ts meta.decl.block.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.block.ts
> }
^^^^
- source.ts meta.decl.block.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.block.ts
^
- source.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts meta.block.ts punctuation.definition.block.ts
>}
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
\ No newline at end of file
+ source.ts meta.block.ts punctuation.definition.block.ts
\ No newline at end of file
diff --git a/tests/baselines/Issue262.txt b/tests/baselines/Issue262.txt
index be75d6b..3ecb412 100644
--- a/tests/baselines/Issue262.txt
+++ b/tests/baselines/Issue262.txt
@@ -14,11 +14,11 @@ for (^^let a = 1; a ^^< 10; a++) {
[1, 19]: source.ts keyword.operator.relational.ts
> for (let b = 1; b < a; b++) {
^^^
- [2, 5]: source.ts meta.decl.block.ts keyword.control.loop.ts
+ [2, 5]: source.ts meta.block.ts keyword.control.loop.ts
^^^
- [2, 10]: source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts
+ [2, 10]: source.ts meta.block.ts meta.var.expr.ts storage.type.ts
>
^^^^^^^^^
- [3, 9]: source.ts meta.decl.block.ts meta.decl.block.ts
+ [3, 9]: source.ts meta.block.ts meta.block.ts
> }
>}
\ No newline at end of file
diff --git a/tests/baselines/Issue288.baseline.txt b/tests/baselines/Issue288.baseline.txt
index 127a1fa..0fc4c84 100644
--- a/tests/baselines/Issue288.baseline.txt
+++ b/tests/baselines/Issue288.baseline.txt
@@ -51,10 +51,10 @@ return^^Name+=1;
^
source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
>}
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
>var AnotherName = function(){
^^^
source.ts meta.var.expr.ts storage.type.ts
@@ -75,10 +75,10 @@ return^^Name+=1;
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
>}
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
>
^
source.ts
@@ -98,10 +98,10 @@ return^^Name+=1;
^
source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
>}
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
>export var eAnotherName = function(){
^^^^^^
source.ts meta.var.expr.ts keyword.control.export.ts
@@ -126,10 +126,10 @@ return^^Name+=1;
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
>}
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
>
^
source.ts
diff --git a/tests/baselines/Issue32.baseline.txt b/tests/baselines/Issue32.baseline.txt
index 230b4d2..0e62938 100644
--- a/tests/baselines/Issue32.baseline.txt
+++ b/tests/baselines/Issue32.baseline.txt
@@ -133,23 +133,23 @@ original file
^
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> this.currentData = d;
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
^^^^^^^^^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts
^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
> }
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> constructor(m: number, n: string){}
^
source.ts meta.declaration.object.ts meta.object.body.ts
@@ -180,9 +180,9 @@ original file
^
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
>}
^
source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts
diff --git a/tests/baselines/Issue32.txt b/tests/baselines/Issue32.txt
index d7675c7..7f10a03 100644
--- a/tests/baselines/Issue32.txt
+++ b/tests/baselines/Issue32.txt
@@ -52,7 +52,7 @@ original file
[13, 2]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts
> this.currentData = d;
^^^^
- [14, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts
+ [14, 3]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
> }
> constructor(m: number, n: string){}
^^^^^^^^^^^
diff --git a/tests/baselines/Issue335.baseline.txt b/tests/baselines/Issue335.baseline.txt
index ffbaabf..b562259 100644
--- a/tests/baselines/Issue335.baseline.txt
+++ b/tests/baselines/Issue335.baseline.txt
@@ -76,34 +76,34 @@ class A4 {
^
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> let d;
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts storage.type.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
> d.default = 1;
^^^^^^^^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
> }
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
>
^
source.ts meta.declaration.object.ts meta.object.body.ts
@@ -127,12 +127,12 @@ class A4 {
^
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> }
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
>}
^
source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts
@@ -162,32 +162,32 @@ class A4 {
^
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> let d;
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts storage.type.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
> d.case = 1
^^^^^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts
> }
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
>
^
source.ts meta.declaration.object.ts meta.object.body.ts
@@ -211,12 +211,12 @@ class A4 {
^
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> }
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
>}
^
source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts
@@ -246,88 +246,88 @@ class A4 {
^
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> let d
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts storage.type.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
> d.default = 1
^^^^^^^^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts
> switch (d.default) {
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
^^^^^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts
> case 1:
^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
> case 2:
^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
> default:
^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^^^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
> break;
^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
> }
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts punctuation.definition.block.ts
> }
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
>
^
source.ts meta.declaration.object.ts meta.object.body.ts
@@ -351,12 +351,12 @@ class A4 {
^
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> }
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
>}
^
source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts
@@ -386,88 +386,88 @@ class A4 {
^
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> let d
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts storage.type.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
> d.case = 1
^^^^^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts constant.numeric.decimal.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts
> switch (d.default) {
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
^^^^^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts
> case 1:
^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
> case 2:
^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
> default:
^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^^^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
> break;
^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
> }
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts punctuation.definition.block.ts
> }
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
>
^
source.ts meta.declaration.object.ts meta.object.body.ts
@@ -491,12 +491,12 @@ class A4 {
^
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> }
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
>}
^
source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts
\ No newline at end of file
diff --git a/tests/baselines/Issue335.txt b/tests/baselines/Issue335.txt
index 92c52f6..52ab51e 100644
--- a/tests/baselines/Issue335.txt
+++ b/tests/baselines/Issue335.txt
@@ -58,7 +58,7 @@ class A4 {
> let d;
> d.default = 1;
^^^^^^^^^^^^
- [4, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ [4, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
> }
>
> private static c() {
@@ -74,7 +74,7 @@ class A4 {
> let d;
> d.case = 1
^^^^^^^^^
- [14, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ [14, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
> }
>
> private static c() {
@@ -90,19 +90,19 @@ class A4 {
> let d
> d.default = 1
^^^^^^^^^^^^
- [24, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ [24, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
> switch (d.default) {
^^^^^^^^^
- [25, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts
+ [25, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts
> case 1:
^^^^
- [26, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ [26, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
> case 2:
^^^^
- [27, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ [27, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
> default:
^^^^^^^
- [28, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ [28, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
> break;
> }
> }
@@ -120,19 +120,19 @@ class A4 {
> let d
> d.case = 1
^^^^^^^^^
- [40, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ [40, 5]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
> switch (d.default) {
^^^^^^^^^
- [41, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts
+ [41, 13]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts
> case 1:
^^^^
- [42, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ [42, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
> case 2:
^^^^
- [43, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ [43, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
> default:
^^^^^^^
- [44, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ [44, 4]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
> break;
> }
> }
diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt
index 504eea3..2bb5858 100644
--- a/tests/baselines/Issue37.baseline.txt
+++ b/tests/baselines/Issue37.baseline.txt
@@ -107,11 +107,11 @@ var j: I = {}
^
source.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^^^^^^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^
source.ts
^^^^
@@ -151,10 +151,10 @@ var j: I = {}
^
source.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
>}
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
>
^
source.ts
@@ -183,15 +183,15 @@ var j: I = {}
^
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
>
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
> }
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
>}
^
source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts
@@ -250,111 +250,111 @@ var j: I = {}
^
source.ts meta.brace.round.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
>
^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
> var c = a + b;
^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^^^
- source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts
+ source.ts meta.block.ts meta.var.expr.ts storage.type.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts
+ source.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
^^^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
^^
- source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
>
^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
> switch (someNum) {
^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^^^^^^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
^^^^^^^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts meta.brace.round.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts punctuation.definition.block.ts
> case 1: break;
^^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^^^^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^^^^^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts
^^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
> case 2: break;
^^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^^^^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts constant.numeric.decimal.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^^^^^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts
^^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
> default: break;
^^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^^^^^^^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^^^^^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts keyword.control.loop.ts
^^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
> }
^
- source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts
+ source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts
^
- source.ts meta.decl.block.ts switch-statement.expr.ts punctuation.definition.block.ts
+ source.ts meta.block.ts switch-statement.expr.ts punctuation.definition.block.ts
^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
>
^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
>}
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
>
^
source.ts
@@ -378,51 +378,51 @@ var j: I = {}
^^^
source.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
> export function myFun(x: number) {
^^^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^^^^^^
- source.ts meta.decl.block.ts meta.function.ts keyword.control.export.ts
+ source.ts meta.block.ts meta.function.ts keyword.control.export.ts
^
- source.ts meta.decl.block.ts meta.function.ts
+ source.ts meta.block.ts meta.function.ts
^^^^^^^^
- source.ts meta.decl.block.ts meta.function.ts storage.type.function.ts
+ source.ts meta.block.ts meta.function.ts storage.type.function.ts
^
- source.ts meta.decl.block.ts meta.function.ts
+ source.ts meta.block.ts meta.function.ts
^^^^^
- source.ts meta.decl.block.ts meta.function.ts entity.name.function.ts
+ source.ts meta.block.ts meta.function.ts entity.name.function.ts
^
- source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts
+ source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts
^
- source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts
+ source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts
^
- source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts
+ source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts
^
- source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts
+ source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts
^^^^^^
- source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts
+ source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts
^
- source.ts meta.decl.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
+ source.ts meta.block.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
^
- source.ts meta.decl.block.ts meta.function.ts
+ source.ts meta.block.ts meta.function.ts
^
- source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
> return x;
^^^^^^^^
- source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.function.ts meta.block.ts
^^^^^^
- source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts
+ source.ts meta.block.ts meta.function.ts meta.block.ts keyword.control.flow.ts
^^^^
- source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.function.ts meta.block.ts
> }
^^^^
- source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.function.ts meta.block.ts
^
- source.ts meta.decl.block.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
>}
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
>
^
source.ts
@@ -570,136 +570,136 @@ var j: I = {}
^^^^^^
source.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
> export class Cell {
^^^^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts keyword.control.export.ts
+ source.ts meta.block.ts meta.declaration.object.ts keyword.control.export.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts
+ source.ts meta.block.ts meta.declaration.object.ts
^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts storage.type.class.ts
+ source.ts meta.block.ts meta.declaration.object.ts storage.type.class.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts
+ source.ts meta.block.ts meta.declaration.object.ts
^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts
+ source.ts meta.block.ts meta.declaration.object.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts
> public parent: Cell;
^^^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts
^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts
^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts
^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts
^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts
>
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts
> constructor(parent: Cell) {
^^^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts
^^^^^^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts
^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts
^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> this.parent = parent;
^^^^^^^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
^^^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.assignment.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.assignment.ts
^^^^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
> if (typeof parent === 'object' || parent instanceof Error) {
^^^^^^^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.conditional.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.typeof.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.typeof.ts
^^^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts
^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.end.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.logical.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.logical.ts
^^^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^^^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.instanceof.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.instanceof.ts
^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.brace.round.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts
>
^^^^^^^^^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts
> }
^^^^^^^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts punctuation.definition.block.ts
> }
^^^^^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> }
^^^^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts
^
- source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts
+ source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts
>}
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
>
^
source.ts
diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt
index e375546..4bdd18d 100644
--- a/tests/baselines/Issue37.txt
+++ b/tests/baselines/Issue37.txt
@@ -124,22 +124,22 @@ var j: I = {}
>
> var c = a + b;
^^^
- [21, 2]: source.ts meta.decl.block.ts meta.var.expr.ts storage.type.ts
+ [21, 2]: source.ts meta.block.ts meta.var.expr.ts storage.type.ts
^
- [21, 12]: source.ts meta.decl.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
+ [21, 12]: source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.arithmetic.ts
>
> switch (someNum) {
^^^^^^
- [23, 2]: source.ts meta.decl.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts
+ [23, 2]: source.ts meta.block.ts switch-statement.expr.ts switch-expression.expr.ts keyword.control.switch.ts
> case 1: break;
^^^^
- [24, 3]: source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ [24, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
> case 2: break;
^^^^
- [25, 3]: source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ [25, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
> default: break;
^^^^^^^
- [26, 3]: source.ts meta.decl.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
+ [26, 3]: source.ts meta.block.ts switch-statement.expr.ts switch-block.expr.ts case-clause.expr.ts keyword.control.switch.ts
> }
>
>}
@@ -153,7 +153,7 @@ var j: I = {}
[35, 1]: source.ts storage.type.ts
> export function myFun(x: number) {
^^^^^^
- [36, 5]: source.ts meta.decl.block.ts meta.function.ts keyword.control.export.ts
+ [36, 5]: source.ts meta.block.ts meta.function.ts keyword.control.export.ts
> return x;
> }
>}
@@ -181,49 +181,49 @@ var j: I = {}
[51, 8]: source.ts
> export class Cell {
^^^^^^
- [52, 5]: source.ts meta.decl.block.ts meta.declaration.object.ts keyword.control.export.ts
+ [52, 5]: source.ts meta.block.ts meta.declaration.object.ts keyword.control.export.ts
^^^^^
- [52, 12]: source.ts meta.decl.block.ts meta.declaration.object.ts storage.type.class.ts
+ [52, 12]: source.ts meta.block.ts meta.declaration.object.ts storage.type.class.ts
^^^^
- [52, 18]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
+ [52, 18]: source.ts meta.block.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
> public parent: Cell;
^^^^^^
- [53, 9]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts
+ [53, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts storage.modifier.ts
^^^^^^
- [53, 16]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts
+ [53, 16]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts
^^^^
- [53, 24]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts
+ [53, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts
>
> constructor(parent: Cell) {
^^^^^^^^^^^
- [55, 9]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts
+ [55, 9]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts storage.type.ts
^^^^^^
- [55, 21]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts
+ [55, 21]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts variable.parameter.ts
^^^^
- [55, 29]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts
+ [55, 29]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts meta.type.annotation.ts entity.name.type.ts
> this.parent = parent;
^^^^
- [56, 13]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts
+ [56, 13]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
^^^^^^^^^
- [56, 27]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ [56, 27]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
> if (typeof parent === 'object' || parent instanceof Error) {
^^^^^^
- [57, 17]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.typeof.ts
+ [57, 17]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.typeof.ts
^^^^^^^^
- [57, 24]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ [57, 24]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^
- [57, 31]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.comparison.ts
+ [57, 31]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.comparison.ts
^
- [57, 35]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts
+ [57, 35]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts
^^^^^^^^
- [57, 47]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ [57, 47]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^^^^^^^^
- [57, 54]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.instanceof.ts
+ [57, 54]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.instanceof.ts
^^^^^^
- [57, 65]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ [57, 65]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
>
^^^^^^^^^^^^^^
- [58, 14]: source.ts meta.decl.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts meta.decl.block.ts
+ [58, 14]: source.ts meta.block.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts meta.block.ts
> }
> }
> }
diff --git a/tests/baselines/Issue77.baseline.txt b/tests/baselines/Issue77.baseline.txt
index 2f61d83..daf7c28 100644
--- a/tests/baselines/Issue77.baseline.txt
+++ b/tests/baselines/Issue77.baseline.txt
@@ -105,11 +105,11 @@ function foo() { }
^
source.ts meta.function.ts meta.return.type.ts
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
^^
source.ts
>
@@ -191,8 +191,8 @@ function foo() { }
^
source.ts meta.function.ts
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
\ No newline at end of file
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
\ No newline at end of file
diff --git a/tests/baselines/Issue82.baseline.txt b/tests/baselines/Issue82.baseline.txt
index 454ece2..83d22ad 100644
--- a/tests/baselines/Issue82.baseline.txt
+++ b/tests/baselines/Issue82.baseline.txt
@@ -80,15 +80,15 @@ class Foo {
^
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
>
^^^^^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
> }
^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
>}
^
source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts
\ No newline at end of file
diff --git a/tests/baselines/Issue82.txt b/tests/baselines/Issue82.txt
index 73536bd..8b59cd5 100644
--- a/tests/baselines/Issue82.txt
+++ b/tests/baselines/Issue82.txt
@@ -29,6 +29,6 @@ class Foo {
> ) {
>
^^^^^^^^^
- [6, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ [6, 9]: source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
> }
>}
\ No newline at end of file
diff --git a/tests/baselines/Issue96.baseline.txt b/tests/baselines/Issue96.baseline.txt
index 15c13f5..fb0171e 100644
--- a/tests/baselines/Issue96.baseline.txt
+++ b/tests/baselines/Issue96.baseline.txt
@@ -86,11 +86,11 @@ const^^able^^ += " Royal, I say!";
^
source.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
>
^
source.ts
diff --git a/tests/baselines/ParameterProperties.baseline.txt b/tests/baselines/ParameterProperties.baseline.txt
index b1d41c4..6f2d58e 100644
--- a/tests/baselines/ParameterProperties.baseline.txt
+++ b/tests/baselines/ParameterProperties.baseline.txt
@@ -76,12 +76,12 @@ class A {
^
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> }
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> foo() {
^
source.ts meta.declaration.object.ts meta.object.body.ts
@@ -94,39 +94,39 @@ class A {
^
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
> return this.a + this.b + this.c;
^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.control.flow.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.arithmetic.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.arithmetic.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts keyword.operator.arithmetic.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts keyword.operator.arithmetic.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts variable.language.this.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
^^^^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
> }
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts
^
- source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
>}
^
source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts
\ No newline at end of file
diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt
index 82c546f..cd4abad 100644
--- a/tests/baselines/TsxSamples.baseline.txt
+++ b/tests/baselines/TsxSamples.baseline.txt
@@ -98,59 +98,59 @@ var e =
^
source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx
^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx punctuation.definition.block.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx punctuation.definition.block.tsx
> return
^^^^^^^^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx
^^^^^^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx keyword.control.flow.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx keyword.control.flow.tsx
^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx
^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx
^^^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx entity.name.tag.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx entity.name.tag.tsx
^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx
^^^^^^^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx
^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx keyword.operator.assignment.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx keyword.operator.assignment.tsx
^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx
^^^^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx variable.language.this.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.brace.curly.tsx variable.language.this.tsx
^^^^^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.brace.curly.tsx
^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx
^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx punctuation.definition.tag.end.tsx
> This is a test: {this.state.count}
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.jsx.children.tsx
^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx
^^^^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx variable.language.this.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx variable.language.this.tsx
^^^^^^^^^^^^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx
^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.jsx.children.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx
>
^^^^^^^^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.jsx.children.tsx
^^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.close.tsx punctuation.definition.tag.begin.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.close.tsx punctuation.definition.tag.begin.tsx
^^^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.close.tsx entity.name.tag.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.close.tsx entity.name.tag.tsx
^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx
> }
^^^^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx
^
- source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx punctuation.definition.block.tsx
+ source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx punctuation.definition.block.tsx
>}
^
source.tsx meta.declaration.object.tsx meta.object.body.tsx punctuation.definition.block.tsx
diff --git a/tests/baselines/TsxSamples.txt b/tests/baselines/TsxSamples.txt
index 31f8a0f..aa9c139 100644
--- a/tests/baselines/TsxSamples.txt
+++ b/tests/baselines/TsxSamples.txt
@@ -59,16 +59,16 @@ var e =
> render() {
> return
^
- [3, 16]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx
+ [3, 16]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx
^^^
- [3, 17]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx entity.name.tag.tsx
+ [3, 17]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx entity.name.tag.tsx
^^^^^^^
- [3, 21]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx
+ [3, 21]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx
^^^^
- [3, 30]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.tag.open.tsx meta.brace.curly.tsx variable.language.this.tsx
+ [3, 30]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.tag.open.tsx meta.brace.curly.tsx variable.language.this.tsx
> This is a test: {this.state.count}
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- [4, 13]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.decl.block.tsx meta.jsx.children.tsx
+ [4, 13]: source.tsx meta.declaration.object.tsx meta.object.body.tsx meta.method.declaration.tsx meta.block.tsx meta.jsx.children.tsx
>
> }
>}
diff --git a/tests/baselines/docComments.baseline.txt b/tests/baselines/docComments.baseline.txt
index ee927be..d0fe6af 100644
--- a/tests/baselines/docComments.baseline.txt
+++ b/tests/baselines/docComments.baseline.txt
@@ -96,9 +96,9 @@ function foo(param1: string, param2: number) {
^
source.ts meta.function.ts
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
>}
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
\ No newline at end of file
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
\ No newline at end of file
diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt
index 91bef8e..5a1f33b 100644
--- a/tests/baselines/multipleVariableDeclaration.baseline.txt
+++ b/tests/baselines/multipleVariableDeclaration.baseline.txt
@@ -61,19 +61,19 @@ var ^^obj = {
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts
^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts keyword.control.flow.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts constant.numeric.decimal.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts constant.numeric.decimal.ts
^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
^^
source.ts meta.var.expr.ts
^^
@@ -150,25 +150,25 @@ var ^^obj = {
^^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts storage.type.function.arrow.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts
^^^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts meta.brace.round.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.round.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.begin.ts
^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts string.quoted.double.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts string.quoted.double.ts punctuation.definition.string.end.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts string.quoted.double.ts punctuation.definition.string.end.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts meta.brace.round.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts meta.brace.round.ts
^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.block.ts punctuation.definition.block.ts
^^
source.ts meta.var.expr.ts
^^
diff --git a/tests/baselines/namespaceAndModule.baseline.txt b/tests/baselines/namespaceAndModule.baseline.txt
index 9fc26ea..4bf0560 100644
--- a/tests/baselines/namespaceAndModule.baseline.txt
+++ b/tests/baselines/namespaceAndModule.baseline.txt
@@ -13,11 +13,11 @@ declare ^^module "x" {}
^^^^
source.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^^
source.ts
>module ts { }
@@ -26,11 +26,11 @@ declare ^^module "x" {}
^^^^
source.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^
- source.ts meta.decl.block.ts
+ source.ts meta.block.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^^
source.ts
>declare namespace ts {}
@@ -43,9 +43,9 @@ declare ^^module "x" {}
^^^^
source.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^^
source.ts
>declare module ts {}
@@ -58,9 +58,9 @@ declare ^^module "x" {}
^^^^
source.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^^
source.ts
>declare module "x" {}
@@ -81,6 +81,6 @@ declare ^^module "x" {}
^
source.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.block.ts punctuation.definition.block.ts
^
- source.ts meta.decl.block.ts punctuation.definition.block.ts
\ No newline at end of file
+ source.ts meta.block.ts punctuation.definition.block.ts
\ No newline at end of file
diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt
index a5b15d3..ed9fcb4 100644
--- a/tests/baselines/pr48_noSemiColon.baseline.txt
+++ b/tests/baselines/pr48_noSemiColon.baseline.txt
@@ -205,53 +205,53 @@ class Test {
^
source.ts meta.function.ts meta.return.type.ts
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
> return stat(path).then(stat => stat.isFile(), () => false)
^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^^^^^^
- source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts
+ source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
^^^^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts
+ source.ts meta.function.ts meta.block.ts meta.brace.round.ts
^^^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts
+ source.ts meta.function.ts meta.block.ts meta.brace.round.ts
^^^^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts
+ source.ts meta.function.ts meta.block.ts meta.brace.round.ts
^^^^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^^
- source.ts meta.function.ts meta.decl.block.ts storage.type.function.arrow.ts
+ source.ts meta.function.ts meta.block.ts storage.type.function.arrow.ts
^^^^^^^^^^^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts
+ source.ts meta.function.ts meta.block.ts meta.brace.round.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts
+ source.ts meta.function.ts meta.block.ts meta.brace.round.ts
^^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts
+ source.ts meta.function.ts meta.block.ts meta.brace.round.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts
+ source.ts meta.function.ts meta.block.ts meta.brace.round.ts
^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^^
- source.ts meta.function.ts meta.decl.block.ts storage.type.function.arrow.ts
+ source.ts meta.function.ts meta.block.ts storage.type.function.arrow.ts
^
- source.ts meta.function.ts meta.decl.block.ts
+ source.ts meta.function.ts meta.block.ts
^^^^^
- source.ts meta.function.ts meta.decl.block.ts constant.language.boolean.false.ts
+ source.ts meta.function.ts meta.block.ts constant.language.boolean.false.ts
^
- source.ts meta.function.ts meta.decl.block.ts meta.brace.round.ts
+ source.ts meta.function.ts meta.block.ts meta.brace.round.ts
>}
^
- source.ts meta.function.ts meta.decl.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
>
^
source.ts
diff --git a/tests/baselines/pr48_noSemiColon.txt b/tests/baselines/pr48_noSemiColon.txt
index d48f63f..a1f0d7a 100644
--- a/tests/baselines/pr48_noSemiColon.txt
+++ b/tests/baselines/pr48_noSemiColon.txt
@@ -68,7 +68,7 @@ class Test {
[13, 39]: source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts
> return stat(path).then(stat => stat.isFile(), () => false)
^^^^^^
- [14, 2]: source.ts meta.function.ts meta.decl.block.ts keyword.control.flow.ts
+ [14, 2]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
>}
>
>