diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
index 3f90994..9726c2d 100644
--- a/TypeScript.YAML-tmLanguage
+++ b/TypeScript.YAML-tmLanguage
@@ -44,7 +44,7 @@ repository:
name: meta.var-single-variable.expr.ts
begin: ([_$[:alpha:]][_$[:alnum:]]*)
beginCaptures:
- '1': { name: variable.other.readwrite.ts }
+ '1': { name: meta.definition.variable.ts variable.other.readwrite.ts }
end: (?=$|[;,=}]|(\s+(of|in)\s+))
patterns:
- include: '#type-annotation'
@@ -79,7 +79,7 @@ repository:
patterns:
- include: '#object-binding-pattern'
- include: '#array-binding-pattern'
- - name: variable.other.readwrite.ts
+ - name: meta.definition.variable.ts variable.other.readwrite.ts
match: ([_$[:alpha:]][_$[:alnum:]]*)
- include: '#variable-initializer'
- include: '#object-binding-pattern'
@@ -100,7 +100,7 @@ repository:
match: (?:(\.\.\.)\s*)?([_$[:alpha:]][_$[:alnum:]]*)
captures:
'1': { name: keyword.operator.rest.ts }
- '2': { name: variable.other.readwrite.ts }
+ '2': { name: meta.definition.variable.ts variable.other.readwrite.ts }
object-binding-pattern:
begin: (?:(\.\.\.)\s*)?(\{)
@@ -489,7 +489,7 @@ repository:
- include: '#string'
- include: '#array-literal'
- include: '#comment'
- - name: variable.object.property.ts
+ - name: meta.definition.property.ts variable.object.property.ts
match: '[_$[:alpha:]][_$[:alnum:]]*'
- name: keyword.operator.optional.ts
match: \?
@@ -535,7 +535,7 @@ repository:
patterns:
- include: '#string'
- include: '#array-literal'
- - name: entity.name.function.ts
+ - name: meta.definition.method.ts entity.name.function.ts
match: '[_$[:alpha:]][_$[:alnum:]]*'
- name: keyword.operator.optional.ts
match: \?
@@ -562,7 +562,7 @@ repository:
'2': { name: storage.modifier.async.ts }
'3': { name: storage.type.function.ts }
'4': { name: keyword.generator.asterisk.ts }
- '5': { name: entity.name.function.ts }
+ '5': { name: meta.definition.function.ts entity.name.function.ts }
end: (?=;|\})|(?<=\})
patterns:
- include: '#comment'
@@ -580,7 +580,7 @@ repository:
'2': { name: storage.modifier.async.ts }
'3': { name: storage.type.function.ts }
'4': { name: keyword.generator.asterisk.ts }
- '5': { name: entity.name.function.ts }
+ '5': { name: meta.definition.function.ts entity.name.function.ts }
object-literal:
name: meta.object-literal.ts
diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage
index 2df0047..3c841a3 100644
--- a/TypeScript.tmLanguage
+++ b/TypeScript.tmLanguage
@@ -135,7 +135,7 @@
1
name
- variable.other.readwrite.ts
+ meta.definition.variable.ts variable.other.readwrite.ts
end
@@ -246,7 +246,7 @@
name
- variable.other.readwrite.ts
+ meta.definition.variable.ts variable.other.readwrite.ts
match
([_$[:alpha:]][_$[:alnum:]]*)
@@ -318,7 +318,7 @@
2
name
- variable.other.readwrite.ts
+ meta.definition.variable.ts variable.other.readwrite.ts
@@ -1610,7 +1610,7 @@
name
- variable.object.property.ts
+ meta.definition.property.ts variable.object.property.ts
match
[_$[:alpha:]][_$[:alnum:]]*
@@ -1772,7 +1772,7 @@
name
- entity.name.function.ts
+ meta.definition.method.ts entity.name.function.ts
match
[_$[:alpha:]][_$[:alnum:]]*
@@ -1862,7 +1862,7 @@
5
name
- entity.name.function.ts
+ meta.definition.function.ts entity.name.function.ts
end
@@ -1926,7 +1926,7 @@
5
name
- entity.name.function.ts
+ meta.definition.function.ts entity.name.function.ts
diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage
index ffebbb3..8e631cf 100644
--- a/TypeScriptReact.tmLanguage
+++ b/TypeScriptReact.tmLanguage
@@ -135,7 +135,7 @@
1
name
- variable.other.readwrite.tsx
+ meta.definition.variable.tsx variable.other.readwrite.tsx
end
@@ -246,7 +246,7 @@
name
- variable.other.readwrite.tsx
+ meta.definition.variable.tsx variable.other.readwrite.tsx
match
([_$[:alpha:]][_$[:alnum:]]*)
@@ -318,7 +318,7 @@
2
name
- variable.other.readwrite.tsx
+ meta.definition.variable.tsx variable.other.readwrite.tsx
@@ -1614,7 +1614,7 @@
name
- variable.object.property.tsx
+ meta.definition.property.tsx variable.object.property.tsx
match
[_$[:alpha:]][_$[:alnum:]]*
@@ -1776,7 +1776,7 @@
name
- entity.name.function.tsx
+ meta.definition.method.tsx entity.name.function.tsx
match
[_$[:alpha:]][_$[:alnum:]]*
@@ -1866,7 +1866,7 @@
5
name
- entity.name.function.tsx
+ meta.definition.function.tsx entity.name.function.tsx
end
@@ -1930,7 +1930,7 @@
5
name
- entity.name.function.tsx
+ meta.definition.function.tsx entity.name.function.tsx
diff --git a/tests/baselines/Abstracts.baseline.txt b/tests/baselines/Abstracts.baseline.txt
index 19ad208..2194a40 100644
--- a/tests/baselines/Abstracts.baseline.txt
+++ b/tests/baselines/Abstracts.baseline.txt
@@ -43,7 +43,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -60,7 +60,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -103,7 +103,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -145,7 +145,7 @@ Grammar: TypeScript.tmLanguage
^^^
source.ts meta.class.ts
^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -201,7 +201,7 @@ Grammar: TypeScript.tmLanguage
^^^
source.ts meta.class.ts
^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -240,7 +240,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt
index 5dcff4a..0a805ae 100644
--- a/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt
+++ b/tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt
@@ -46,7 +46,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -223,7 +223,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -336,7 +336,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Comments.baseline.txt b/tests/baselines/Comments.baseline.txt
index 284a580..db41e86 100644
--- a/tests/baselines/Comments.baseline.txt
+++ b/tests/baselines/Comments.baseline.txt
@@ -112,7 +112,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -139,7 +139,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^^
@@ -174,7 +174,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -209,7 +209,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -244,7 +244,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -279,7 +279,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -314,7 +314,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -360,7 +360,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -385,7 +385,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^^
@@ -418,7 +418,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -451,7 +451,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -484,7 +484,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -517,7 +517,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -1822,7 +1822,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
^
@@ -1897,7 +1897,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
^
@@ -1972,7 +1972,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
^
@@ -2019,7 +2019,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts comment.block.ts punctuation.definition.comment.ts
^^^^^^^^
@@ -2046,7 +2046,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts keyword.operator.assignment.ts
^^
@@ -2073,7 +2073,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts keyword.operator.assignment.ts
^
@@ -2103,7 +2103,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^^
@@ -2136,7 +2136,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -2169,7 +2169,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/FunctionMethodOverloads.baseline.txt b/tests/baselines/FunctionMethodOverloads.baseline.txt
index ddf0353..9dc8f93 100644
--- a/tests/baselines/FunctionMethodOverloads.baseline.txt
+++ b/tests/baselines/FunctionMethodOverloads.baseline.txt
@@ -71,7 +71,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -112,7 +112,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.function.overload.ts
^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -135,7 +135,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.function.overload.ts
^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -164,7 +164,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.function.overload.ts
^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -189,7 +189,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.function.overload.ts
^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -201,7 +201,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -213,7 +213,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -246,7 +246,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.function.overload.ts
^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -318,7 +318,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -363,7 +363,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -388,7 +388,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -417,7 +417,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -444,7 +444,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -458,7 +458,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -470,7 +470,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -507,7 +507,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -602,7 +602,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -641,7 +641,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -662,7 +662,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -689,7 +689,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -712,7 +712,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -724,7 +724,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts
^
- source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -736,7 +736,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -767,7 +767,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -839,7 +839,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -882,7 +882,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -905,7 +905,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -932,7 +932,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -957,7 +957,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -971,7 +971,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -983,7 +983,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -1018,7 +1018,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1102,7 +1102,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1117,7 +1117,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts meta.method.declaration.ts
^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1159,7 +1159,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1172,7 +1172,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/FunctionMethodOverloads.txt b/tests/baselines/FunctionMethodOverloads.txt
index e5b015f..6270238 100644
--- a/tests/baselines/FunctionMethodOverloads.txt
+++ b/tests/baselines/FunctionMethodOverloads.txt
@@ -59,32 +59,32 @@ Grammar: TypeScript.tmLanguage
^^^^^^
[2, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^
- [2, 17]: source.ts meta.function.ts entity.name.function.ts
+ [2, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
>export function testFunctionOverload(p: string)
^^^^^^
[3, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^
- [3, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ [3, 17]: source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
>export function testFunctionOverload(p: string [])
^^^^^^
[4, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^
- [4, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ [4, 17]: source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
>export function testFunctionOverload(p: {})
^^^^^^
[5, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^
- [5, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ [5, 17]: source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
>export function testFunctionOverload(p: {a: A, b:B} | string [])
^^^^^^
[6, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^
- [6, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ [6, 17]: source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
>export function testFunctionOverload(p: any): new() => any {
^^^^^^
[7, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^
- [7, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ [7, 17]: source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
> throw new Error("")
^^^^^
[8, 5]: source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts
@@ -94,32 +94,32 @@ Grammar: TypeScript.tmLanguage
^^^^^^
[11, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- [11, 17]: source.ts meta.function.ts entity.name.function.ts
+ [11, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
>export function testFunctionOverloadWithSemicolon(p: string);
^^^^^^
[12, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- [12, 17]: source.ts meta.function.ts entity.name.function.ts
+ [12, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
>export function testFunctionOverloadWithSemicolon(p: string[]);
^^^^^^
[13, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- [13, 17]: source.ts meta.function.ts entity.name.function.ts
+ [13, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
>export function testFunctionOverloadWithSemicolon(p: {});
^^^^^^
[14, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- [14, 17]: source.ts meta.function.ts entity.name.function.ts
+ [14, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
>export function testFunctionOverloadWithSemicolon(p: { a: A, b: B } | string[]);
^^^^^^
[15, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- [15, 17]: source.ts meta.function.ts entity.name.function.ts
+ [15, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
>export function testFunctionOverloadWithSemicolon(p: any): new () => any {
^^^^^^
[16, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- [16, 17]: source.ts meta.function.ts entity.name.function.ts
+ [16, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
> throw new Error("")
^^^^^
[17, 5]: source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts
@@ -132,32 +132,32 @@ Grammar: TypeScript.tmLanguage
^^^^^^
[23, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^
- [23, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [23, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> public testMethodOverload(p: string)
^^^^^^
[24, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^
- [24, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [24, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> public testMethodOverload(p: string [])
^^^^^^
[25, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^
- [25, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [25, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> public testMethodOverload(p: {})
^^^^^^
[26, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^
- [26, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [26, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> public testMethodOverload(p: {a: A, b:B} | string [])
^^^^^^
[27, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^
- [27, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [27, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> public testMethodOverload(p: any): new() => any {
^^^^^^
[28, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^
- [28, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [28, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> throw new Error("")
^^^^^
[29, 9]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts
@@ -167,32 +167,32 @@ Grammar: TypeScript.tmLanguage
^^^^^^
[32, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- [32, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [32, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> public testMethodOverloadWithSemicolon(p: string);
^^^^^^
[33, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- [33, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [33, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> public testMethodOverloadWithSemicolon(p: string[]);
^^^^^^
[34, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- [34, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [34, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> public testMethodOverloadWithSemicolon(p: {});
^^^^^^
[35, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- [35, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [35, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> public testMethodOverloadWithSemicolon(p: { a: A, b: B } | string[]);
^^^^^^
[36, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- [36, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [36, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> public testMethodOverloadWithSemicolon(p: any): new () => any {
^^^^^^
[37, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- [37, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [37, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> throw new Error("")
^^^^^
[38, 9]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts
@@ -202,10 +202,10 @@ Grammar: TypeScript.tmLanguage
>interface I {
> foo(): number
^^^
- [43, 5]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [43, 5]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> bar(): string;
^^^
- [44, 5]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [44, 5]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
>}
>
>abstract class C {
@@ -213,10 +213,10 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^
[48, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^
- [48, 14]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [48, 14]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> abstract bar()
^^^^^^^^
[49, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^
- [49, 14]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [49, 14]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
>}
\ No newline at end of file
diff --git a/tests/baselines/FunctionMethodParameters.baseline.txt b/tests/baselines/FunctionMethodParameters.baseline.txt
index 5ae5753..d301f18 100644
--- a/tests/baselines/FunctionMethodParameters.baseline.txt
+++ b/tests/baselines/FunctionMethodParameters.baseline.txt
@@ -48,7 +48,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
> m1: string,
@@ -112,7 +112,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -124,7 +124,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -265,7 +265,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -277,7 +277,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -406,7 +406,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
> m1: string,
@@ -470,7 +470,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts
^
- source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -482,7 +482,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -623,7 +623,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts
^
- source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -635,7 +635,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
diff --git a/tests/baselines/FunctionMethodReturnTypes.baseline.txt b/tests/baselines/FunctionMethodReturnTypes.baseline.txt
index 9854df7..fdbe3cb 100644
--- a/tests/baselines/FunctionMethodReturnTypes.baseline.txt
+++ b/tests/baselines/FunctionMethodReturnTypes.baseline.txt
@@ -52,7 +52,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -101,7 +101,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -142,7 +142,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -154,7 +154,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts
^
- source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -166,7 +166,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.return.type.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -251,7 +251,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -308,7 +308,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -371,7 +371,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -436,7 +436,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -501,7 +501,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -572,7 +572,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -659,7 +659,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -671,7 +671,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts
^
- source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -683,7 +683,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.return.type.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -778,7 +778,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -823,7 +823,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -870,7 +870,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -958,7 +958,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1005,7 +1005,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1044,7 +1044,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1056,7 +1056,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts
^
- source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -1068,7 +1068,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts
^
- source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -1151,7 +1151,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1206,7 +1206,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1267,7 +1267,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1330,7 +1330,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1393,7 +1393,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1462,7 +1462,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1547,7 +1547,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1559,7 +1559,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts
^
- source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -1571,7 +1571,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts
^
- source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -1664,7 +1664,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1707,7 +1707,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -1752,7 +1752,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/FunctionMethodReturnTypes.txt b/tests/baselines/FunctionMethodReturnTypes.txt
index 1917b78..74e9978 100644
--- a/tests/baselines/FunctionMethodReturnTypes.txt
+++ b/tests/baselines/FunctionMethodReturnTypes.txt
@@ -40,91 +40,91 @@ Grammar: TypeScript.tmLanguage
^^^^^^
[2, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^
- [2, 17]: source.ts meta.function.ts entity.name.function.ts
+ [2, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^^^^
[2, 56]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
>export function testFunctionReturnType2(): {} { return {} }
^^^^^^
[3, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^
- [3, 17]: source.ts meta.function.ts entity.name.function.ts
+ [3, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^^^^
[3, 49]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
>export function testFunctionReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} }
^^^^^^
[4, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^
- [4, 17]: source.ts meta.function.ts entity.name.function.ts
+ [4, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^^^^
[4, 59]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
>export function testFunctionReturnType4(): [number, number] { return [1, 1] }
^^^^^^
[5, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^
- [5, 17]: source.ts meta.function.ts entity.name.function.ts
+ [5, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^^^^
[5, 63]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
>export function testFunctionReturnType5(): Array { return [{ m: "" }] }
^^^^^^
[6, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^
- [6, 17]: source.ts meta.function.ts entity.name.function.ts
+ [6, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^^^^
[6, 55]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
>export function testFunctionReturnType6(): new () => number { throw new Error(""); }
^^^^^^
[7, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^
- [7, 17]: source.ts meta.function.ts entity.name.function.ts
+ [7, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^^^
[7, 63]: source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts
>export function testFunctionReturnType7(): (() => number) { throw new Error(""); }
^^^^^^
[8, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^
- [8, 17]: source.ts meta.function.ts entity.name.function.ts
+ [8, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^^^
[8, 61]: source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts
>export function testFunctionReturnType8(): (() => number) [] { throw new Error(""); }
^^^^^^
[9, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^
- [9, 17]: source.ts meta.function.ts entity.name.function.ts
+ [9, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^^^
[9, 64]: source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts
>export function testFunctionReturnType9(): (() => number) | (() => string) { throw new Error(""); }
^^^^^^
[10, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^
- [10, 17]: source.ts meta.function.ts entity.name.function.ts
+ [10, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^^^
[10, 78]: source.ts meta.function.ts meta.block.ts keyword.control.trycatch.ts
>export function testFunctionReturnType10(): {a: A, b: B} [] { return [{a: {m: "" }, b: {m1: "" }}] }
^^^^^^
[11, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^^
- [11, 17]: source.ts meta.function.ts entity.name.function.ts
+ [11, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^^^^
[11, 63]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
>export function testFunctionReturnType11(): number | string { return 1 }
^^^^^^
[12, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^^
- [12, 17]: source.ts meta.function.ts entity.name.function.ts
+ [12, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^^^^
[12, 63]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
>export function testFunctionReturnType12(): number | string [] { return }
^^^^^^
[13, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^^
- [13, 17]: source.ts meta.function.ts entity.name.function.ts
+ [13, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^^^^
[13, 66]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
>export function testFunctionReturnType13(): [number, number] | string [] { return [""] }
^^^^^^
[14, 1]: source.ts meta.function.ts keyword.control.export.ts
^^^^^^^^^^^^^^^^^^^^^^^^
- [14, 17]: source.ts meta.function.ts entity.name.function.ts
+ [14, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^^^^
[14, 76]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
>
@@ -134,91 +134,91 @@ Grammar: TypeScript.tmLanguage
^^^^^^
[18, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^
- [18, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [18, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^^^^^
[18, 49]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts
> public testMethodReturnType2(): {} { return {} }
^^^^^^
[19, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^
- [19, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [19, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^^^^^
[19, 42]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts
> public testMethodReturnType3(): {a: A, b: B} { return {a: {m: "" }, b: {m1: "" }} }
^^^^^^
[20, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^
- [20, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [20, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^^^^^
[20, 52]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts
> public testMethodReturnType4(): [number, number] { return [1, 1] }
^^^^^^
[21, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^
- [21, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [21, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^^^^^
[21, 56]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts
> public testMethodReturnType5(): Array { return [{ m: "" }] }
^^^^^^
[22, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^
- [22, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [22, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^^^^^
[22, 48]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts
> public testMethodReturnType6(): new () => number { throw new Error(""); }
^^^^^^
[23, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^
- [23, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [23, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^^^^
[23, 56]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts
> public testMethodReturnType7(): (() => number) { throw new Error(""); }
^^^^^^
[24, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^
- [24, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [24, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^^^^
[24, 54]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts
> public testMethodReturnType8(): (() => number) [] { throw new Error(""); }
^^^^^^
[25, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^
- [25, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [25, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^^^^
[25, 57]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts
> public testMethodReturnType9(): (() => number) | (() => string) { throw new Error(""); }
^^^^^^
[26, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^
- [26, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [26, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^^^^
[26, 71]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.trycatch.ts
> public testMethodReturnType10(): {a: A, b: B} [] { return [{a: {m: "" }, b: {m1: "" }}] }
^^^^^^
[27, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^^
- [27, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [27, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^^^^^
[27, 56]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts
> public testMethodReturnType11(): number | string { return 1 }
^^^^^^
[28, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^^
- [28, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [28, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^^^^^
[28, 56]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts
> public testMethodReturnType12(): number | string [] { return }
^^^^^^
[29, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^^
- [29, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [29, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^^^^^
[29, 59]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts
> public testMethodReturnType13(): [number, number] | string [] { return [""] }
^^^^^^
[30, 5]: source.ts meta.class.ts meta.method.declaration.ts storage.modifier.ts
^^^^^^^^^^^^^^^^^^^^^^
- [30, 12]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [30, 12]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^^^^^
[30, 69]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts
>}
\ No newline at end of file
diff --git a/tests/baselines/Issue10.baseline.txt b/tests/baselines/Issue10.baseline.txt
index 31426db..b0ab079 100644
--- a/tests/baselines/Issue10.baseline.txt
+++ b/tests/baselines/Issue10.baseline.txt
@@ -74,7 +74,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -93,7 +93,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -170,7 +170,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue11.baseline.txt b/tests/baselines/Issue11.baseline.txt
index a283241..461734a 100644
--- a/tests/baselines/Issue11.baseline.txt
+++ b/tests/baselines/Issue11.baseline.txt
@@ -20,7 +20,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts keyword.operator.assignment.ts
^
@@ -59,7 +59,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -80,7 +80,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue110.baseline.txt b/tests/baselines/Issue110.baseline.txt
index 49473be..f0d1613 100644
--- a/tests/baselines/Issue110.baseline.txt
+++ b/tests/baselines/Issue110.baseline.txt
@@ -31,7 +31,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -48,7 +48,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -63,7 +63,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -88,7 +88,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -103,7 +103,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -122,7 +122,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -145,7 +145,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -164,7 +164,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -179,7 +179,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -194,7 +194,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -213,7 +213,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -228,7 +228,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -251,7 +251,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -270,7 +270,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -289,7 +289,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -308,7 +308,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -322,7 +322,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue114.baseline.txt b/tests/baselines/Issue114.baseline.txt
index 9c6c1fc..ab17619 100644
--- a/tests/baselines/Issue114.baseline.txt
+++ b/tests/baselines/Issue114.baseline.txt
@@ -110,7 +110,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts
^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
diff --git a/tests/baselines/Issue115.baseline.txt b/tests/baselines/Issue115.baseline.txt
index 44dd4bd..946fd87 100644
--- a/tests/baselines/Issue115.baseline.txt
+++ b/tests/baselines/Issue115.baseline.txt
@@ -35,7 +35,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -84,7 +84,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -128,7 +128,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -182,7 +182,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -238,7 +238,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -253,7 +253,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.var.expr.ts meta.object-literal.ts
^^^
- source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -298,7 +298,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts
^^^^
- source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue119.baseline.txt b/tests/baselines/Issue119.baseline.txt
index dbc2f9d..4a3b715 100644
--- a/tests/baselines/Issue119.baseline.txt
+++ b/tests/baselines/Issue119.baseline.txt
@@ -32,7 +32,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -58,7 +58,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -84,7 +84,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
diff --git a/tests/baselines/Issue124.baseline.txt b/tests/baselines/Issue124.baseline.txt
index 51dec12..89edf20 100644
--- a/tests/baselines/Issue124.baseline.txt
+++ b/tests/baselines/Issue124.baseline.txt
@@ -41,7 +41,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -76,7 +76,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -117,7 +117,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -175,7 +175,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -227,7 +227,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue124.txt b/tests/baselines/Issue124.txt
index 38824f6..c502a03 100644
--- a/tests/baselines/Issue124.txt
+++ b/tests/baselines/Issue124.txt
@@ -57,7 +57,7 @@ Grammar: TypeScript.tmLanguage
>
>var newVar = a ? (b == `hello`) : true;
^^^^^^
- [10, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [10, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
[10, 14]: source.ts meta.var.expr.ts variable.other.readwrite.ts
^
@@ -69,7 +69,7 @@ Grammar: TypeScript.tmLanguage
>
>var debArch = arch === 'x64' ? 'amd64' : 'i386';
^^^^^^^
- [12, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [12, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^^^^
[12, 15]: source.ts meta.var.expr.ts variable.other.readwrite.ts
^^^
diff --git a/tests/baselines/Issue131.baseline.txt b/tests/baselines/Issue131.baseline.txt
index c5d4594..bd974fd 100644
--- a/tests/baselines/Issue131.baseline.txt
+++ b/tests/baselines/Issue131.baseline.txt
@@ -33,13 +33,13 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts punctuation.separator.comma.ts
^
source.ts meta.var.expr.ts
^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts punctuation.terminator.statement.ts
^^
diff --git a/tests/baselines/Issue133.baseline.txt b/tests/baselines/Issue133.baseline.txt
index 6fedafc..2c1bf72 100644
--- a/tests/baselines/Issue133.baseline.txt
+++ b/tests/baselines/Issue133.baseline.txt
@@ -25,7 +25,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts
^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -40,7 +40,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts
^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
diff --git a/tests/baselines/Issue139.baseline.txt b/tests/baselines/Issue139.baseline.txt
index d4a9559..1c853b4 100644
--- a/tests/baselines/Issue139.baseline.txt
+++ b/tests/baselines/Issue139.baseline.txt
@@ -25,7 +25,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts new.expr.ts meta.function.ts
^^
- source.ts new.expr.ts meta.function.ts entity.name.function.ts
+ source.ts new.expr.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts new.expr.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue142.baseline.txt b/tests/baselines/Issue142.baseline.txt
index 992318d..c2df3da 100644
--- a/tests/baselines/Issue142.baseline.txt
+++ b/tests/baselines/Issue142.baseline.txt
@@ -26,7 +26,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
diff --git a/tests/baselines/Issue143.baseline.txt b/tests/baselines/Issue143.baseline.txt
index 24387c6..25c9705 100644
--- a/tests/baselines/Issue143.baseline.txt
+++ b/tests/baselines/Issue143.baseline.txt
@@ -107,7 +107,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts
^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -154,7 +154,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^^
diff --git a/tests/baselines/Issue146.baseline.txt b/tests/baselines/Issue146.baseline.txt
index 709856f..fb1d7f7 100644
--- a/tests/baselines/Issue146.baseline.txt
+++ b/tests/baselines/Issue146.baseline.txt
@@ -18,7 +18,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -62,7 +62,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue149.baseline.txt b/tests/baselines/Issue149.baseline.txt
index 072e653..e1eba16 100644
--- a/tests/baselines/Issue149.baseline.txt
+++ b/tests/baselines/Issue149.baseline.txt
@@ -27,7 +27,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -68,7 +68,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.function.overload.ts
^^
- source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -91,7 +91,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.function.overload.ts
^^
- source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -114,7 +114,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.function.overload.ts
^^
- source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -160,7 +160,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -205,7 +205,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -230,7 +230,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -255,7 +255,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue149.txt b/tests/baselines/Issue149.txt
index b699b8c..0df62b3 100644
--- a/tests/baselines/Issue149.txt
+++ b/tests/baselines/Issue149.txt
@@ -21,7 +21,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^
[1, 1]: source.ts meta.function.ts keyword.control.export.ts
^^
- [1, 17]: source.ts meta.function.ts entity.name.function.ts
+ [1, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^^^^
[1, 23]: source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
^^^
@@ -32,17 +32,17 @@ Grammar: TypeScript.tmLanguage
^^^^^^
[2, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts
^^
- [2, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ [2, 17]: source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
>export function fn(n: number)
^^^^^^
[3, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts
^^
- [3, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ [3, 17]: source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
>export function fn(s: any) {
^^^^^^
[4, 1]: source.ts meta.function.ts meta.function.overload.ts keyword.control.export.ts
^^
- [4, 17]: source.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ [4, 17]: source.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
> return "";
^^^^^^
[5, 5]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
@@ -52,7 +52,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^
[8, 1]: source.ts meta.function.ts keyword.control.export.ts
^^
- [8, 17]: source.ts meta.function.ts entity.name.function.ts
+ [8, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^^^
[8, 32]: source.ts meta.function.ts meta.return.type.ts meta.type.constructor.ts keyword.control.new.ts
^^^^
@@ -61,17 +61,17 @@ Grammar: TypeScript.tmLanguage
^^^^^^
[9, 1]: source.ts meta.function.ts keyword.control.export.ts
^^
- [9, 17]: source.ts meta.function.ts entity.name.function.ts
+ [9, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
>export function fn(n: number);
^^^^^^
[10, 1]: source.ts meta.function.ts keyword.control.export.ts
^^
- [10, 17]: source.ts meta.function.ts entity.name.function.ts
+ [10, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
>export function fn(s: any) {
^^^^^^
[11, 1]: source.ts meta.function.ts keyword.control.export.ts
^^
- [11, 17]: source.ts meta.function.ts entity.name.function.ts
+ [11, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
> return "";
^^^^^^
[12, 5]: source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
diff --git a/tests/baselines/Issue152.baseline.txt b/tests/baselines/Issue152.baseline.txt
index 179a786..1015b42 100644
--- a/tests/baselines/Issue152.baseline.txt
+++ b/tests/baselines/Issue152.baseline.txt
@@ -18,7 +18,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts punctuation.terminator.statement.ts
^^
@@ -33,7 +33,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts punctuation.terminator.statement.ts
^
diff --git a/tests/baselines/Issue153.baseline.txt b/tests/baselines/Issue153.baseline.txt
index 1ae5e24..45e0a16 100644
--- a/tests/baselines/Issue153.baseline.txt
+++ b/tests/baselines/Issue153.baseline.txt
@@ -150,7 +150,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -171,7 +171,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -192,7 +192,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -213,7 +213,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -234,7 +234,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -255,7 +255,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -276,7 +276,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -297,7 +297,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -318,7 +318,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -395,7 +395,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^^^^
@@ -787,7 +787,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^^^^
diff --git a/tests/baselines/Issue154.baseline.txt b/tests/baselines/Issue154.baseline.txt
index f409f84..f41c800 100644
--- a/tests/baselines/Issue154.baseline.txt
+++ b/tests/baselines/Issue154.baseline.txt
@@ -106,7 +106,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue155.baseline.txt b/tests/baselines/Issue155.baseline.txt
index 5167fd1..1b5616d 100644
--- a/tests/baselines/Issue155.baseline.txt
+++ b/tests/baselines/Issue155.baseline.txt
@@ -131,7 +131,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.block.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
^^
diff --git a/tests/baselines/Issue156.baseline.txt b/tests/baselines/Issue156.baseline.txt
index 0e65422..b16c1aa 100644
--- a/tests/baselines/Issue156.baseline.txt
+++ b/tests/baselines/Issue156.baseline.txt
@@ -25,7 +25,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^
diff --git a/tests/baselines/Issue156.txt b/tests/baselines/Issue156.txt
index c89e1c7..7866a11 100644
--- a/tests/baselines/Issue156.txt
+++ b/tests/baselines/Issue156.txt
@@ -13,7 +13,7 @@ Grammar: TypeScript.tmLanguage
>class Test {
> mmm(p1: string | {}, p2: string)
^^^
- [2, 2]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [2, 2]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^
[2, 6]: source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts
^^^^^^
diff --git a/tests/baselines/Issue157.baseline.txt b/tests/baselines/Issue157.baseline.txt
index 7a29ecb..0fa6132 100644
--- a/tests/baselines/Issue157.baseline.txt
+++ b/tests/baselines/Issue157.baseline.txt
@@ -12,7 +12,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue158.baseline.txt b/tests/baselines/Issue158.baseline.txt
index 879f099..ecfa668 100644
--- a/tests/baselines/Issue158.baseline.txt
+++ b/tests/baselines/Issue158.baseline.txt
@@ -67,7 +67,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^^
- source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts keyword.operator.assignment.ts
^
@@ -126,7 +126,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue161.baseline.txt b/tests/baselines/Issue161.baseline.txt
index 60d633d..7e61fe6 100644
--- a/tests/baselines/Issue161.baseline.txt
+++ b/tests/baselines/Issue161.baseline.txt
@@ -22,7 +22,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^^^^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.type.annotation.tsx keyword.operator.type.annotation.tsx
^
@@ -51,7 +51,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^^^^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.type.annotation.tsx keyword.operator.type.annotation.tsx
^
diff --git a/tests/baselines/Issue163.baseline.txt b/tests/baselines/Issue163.baseline.txt
index 077b792..ec33b0b 100644
--- a/tests/baselines/Issue163.baseline.txt
+++ b/tests/baselines/Issue163.baseline.txt
@@ -15,7 +15,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -34,7 +34,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts
^
- source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue171.baseline.txt b/tests/baselines/Issue171.baseline.txt
index 6939dbb..b0d4244 100644
--- a/tests/baselines/Issue171.baseline.txt
+++ b/tests/baselines/Issue171.baseline.txt
@@ -76,7 +76,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^^^^^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -91,7 +91,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^^^^^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -106,7 +106,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^^^^^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -121,7 +121,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^^^^^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -161,7 +161,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -198,7 +198,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -231,7 +231,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue172.baseline.txt b/tests/baselines/Issue172.baseline.txt
index e43933a..2af78eb 100644
--- a/tests/baselines/Issue172.baseline.txt
+++ b/tests/baselines/Issue172.baseline.txt
@@ -12,7 +12,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -49,7 +49,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue175.baseline.txt b/tests/baselines/Issue175.baseline.txt
index 6237437..c985da8 100644
--- a/tests/baselines/Issue175.baseline.txt
+++ b/tests/baselines/Issue175.baseline.txt
@@ -13,7 +13,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -34,7 +34,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue178.baseline.txt b/tests/baselines/Issue178.baseline.txt
index ed868a9..dddae4b 100644
--- a/tests/baselines/Issue178.baseline.txt
+++ b/tests/baselines/Issue178.baseline.txt
@@ -15,7 +15,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -74,7 +74,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -143,7 +143,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -166,7 +166,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -185,7 +185,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
diff --git a/tests/baselines/Issue180.baseline.txt b/tests/baselines/Issue180.baseline.txt
index 7230c92..3f61bc4 100644
--- a/tests/baselines/Issue180.baseline.txt
+++ b/tests/baselines/Issue180.baseline.txt
@@ -72,7 +72,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue183.baseline.txt b/tests/baselines/Issue183.baseline.txt
index 0c73de5..48f3383 100644
--- a/tests/baselines/Issue183.baseline.txt
+++ b/tests/baselines/Issue183.baseline.txt
@@ -72,7 +72,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -120,7 +120,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -155,7 +155,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts
^
@@ -203,7 +203,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts
^
diff --git a/tests/baselines/Issue186.baseline.txt b/tests/baselines/Issue186.baseline.txt
index 6731ea7..ceff573 100644
--- a/tests/baselines/Issue186.baseline.txt
+++ b/tests/baselines/Issue186.baseline.txt
@@ -20,7 +20,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^^^^^
@@ -63,7 +63,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -190,7 +190,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue187.baseline.txt b/tests/baselines/Issue187.baseline.txt
index 529d94e..16ffc2b 100644
--- a/tests/baselines/Issue187.baseline.txt
+++ b/tests/baselines/Issue187.baseline.txt
@@ -15,7 +15,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -77,7 +77,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue191.baseline.txt b/tests/baselines/Issue191.baseline.txt
index c9c9863..834f1b5 100644
--- a/tests/baselines/Issue191.baseline.txt
+++ b/tests/baselines/Issue191.baseline.txt
@@ -66,7 +66,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^^^^
- source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -274,7 +274,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^^^^
- source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue191.txt b/tests/baselines/Issue191.txt
index decb162..ebc4c11 100644
--- a/tests/baselines/Issue191.txt
+++ b/tests/baselines/Issue191.txt
@@ -36,7 +36,7 @@ Grammar: TypeScript.tmLanguage
[2, 33]: source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
> var prop = Q.defer();
^^^^
- [3, 13]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [3, 13]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^^^^^^^
[3, 28]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.type.parameters.ts support.type.primitive.ts
^
@@ -80,7 +80,7 @@ Grammar: TypeScript.tmLanguage
[12, 33]: source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
> var prop = Q.defer();
^^^^
- [13, 13]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [13, 13]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^^^^^^^
[13, 28]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.type.parameters.ts support.type.primitive.ts
^
diff --git a/tests/baselines/Issue193.baseline.txt b/tests/baselines/Issue193.baseline.txt
index 749913f..0fce80b 100644
--- a/tests/baselines/Issue193.baseline.txt
+++ b/tests/baselines/Issue193.baseline.txt
@@ -22,7 +22,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -56,7 +56,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -90,7 +90,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -113,7 +113,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue197.baseline.txt b/tests/baselines/Issue197.baseline.txt
index 105cd0f..20227cd 100644
--- a/tests/baselines/Issue197.baseline.txt
+++ b/tests/baselines/Issue197.baseline.txt
@@ -45,7 +45,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -94,7 +94,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -119,7 +119,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -144,7 +144,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -266,7 +266,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -291,7 +291,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -316,7 +316,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
diff --git a/tests/baselines/Issue198.baseline.txt b/tests/baselines/Issue198.baseline.txt
index 3092212..5e29bbc 100644
--- a/tests/baselines/Issue198.baseline.txt
+++ b/tests/baselines/Issue198.baseline.txt
@@ -16,7 +16,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -30,7 +30,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -44,7 +44,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -63,7 +63,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -101,7 +101,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -179,7 +179,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue202.baseline.txt b/tests/baselines/Issue202.baseline.txt
index f21cfb1..8d1750d 100644
--- a/tests/baselines/Issue202.baseline.txt
+++ b/tests/baselines/Issue202.baseline.txt
@@ -37,7 +37,7 @@ Grammar: TypeScriptReact.tmLanguage
^^^^
source.tsx meta.class.tsx
^^^^
- source.tsx meta.class.tsx meta.field.declaration.tsx variable.object.property.tsx
+ source.tsx meta.class.tsx meta.field.declaration.tsx meta.definition.property.tsx variable.object.property.tsx
^
source.tsx meta.class.tsx meta.field.declaration.tsx meta.type.annotation.tsx keyword.operator.type.annotation.tsx
^
@@ -73,7 +73,7 @@ Grammar: TypeScriptReact.tmLanguage
^^^^
source.tsx meta.class.tsx
^^^^
- source.tsx meta.class.tsx meta.field.declaration.tsx variable.object.property.tsx
+ source.tsx meta.class.tsx meta.field.declaration.tsx meta.definition.property.tsx variable.object.property.tsx
^
source.tsx meta.class.tsx meta.field.declaration.tsx meta.type.annotation.tsx keyword.operator.type.annotation.tsx
^
diff --git a/tests/baselines/Issue208.baseline.txt b/tests/baselines/Issue208.baseline.txt
index c7cdccb..0fe36ac 100644
--- a/tests/baselines/Issue208.baseline.txt
+++ b/tests/baselines/Issue208.baseline.txt
@@ -20,7 +20,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -63,7 +63,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -118,7 +118,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -163,7 +163,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -203,7 +203,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -244,7 +244,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
diff --git a/tests/baselines/Issue208.txt b/tests/baselines/Issue208.txt
index 4692d70..486a2fc 100644
--- a/tests/baselines/Issue208.txt
+++ b/tests/baselines/Issue208.txt
@@ -42,7 +42,7 @@ Grammar: TypeScript.tmLanguage
>class MyClass {
> static someProp = new Thing('data');
^^^^^^^^
- [5, 12]: source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ [5, 12]: source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^^^^^
[5, 27]: source.ts meta.class.ts meta.field.declaration.ts new.expr.ts entity.name.type.ts
^^^^^^
@@ -51,7 +51,7 @@ Grammar: TypeScript.tmLanguage
[5, 41]: source.ts meta.class.ts meta.field.declaration.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts
> static someProp = makeThing('data');
^^^^^^^^
- [6, 12]: source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ [6, 12]: source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^^^^^^^^^
[6, 23]: source.ts meta.class.ts meta.field.declaration.ts entity.name.function.ts
^^^^^^
diff --git a/tests/baselines/Issue212.baseline.txt b/tests/baselines/Issue212.baseline.txt
index 48c9224..2d766e7 100644
--- a/tests/baselines/Issue212.baseline.txt
+++ b/tests/baselines/Issue212.baseline.txt
@@ -19,7 +19,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue215.baseline.txt b/tests/baselines/Issue215.baseline.txt
index 9e96b50..f08fae9 100644
--- a/tests/baselines/Issue215.baseline.txt
+++ b/tests/baselines/Issue215.baseline.txt
@@ -19,7 +19,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -44,7 +44,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts keyword.operator.assignment.ts
^
@@ -109,7 +109,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts keyword.operator.assignment.ts
^
diff --git a/tests/baselines/Issue216.baseline.txt b/tests/baselines/Issue216.baseline.txt
index bc4739b..b64f000 100644
--- a/tests/baselines/Issue216.baseline.txt
+++ b/tests/baselines/Issue216.baseline.txt
@@ -35,7 +35,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -80,7 +80,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts meta.var.expr.ts
^^^^^
- source.ts meta.class.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue217.baseline.txt b/tests/baselines/Issue217.baseline.txt
index bd748a4..2372649 100644
--- a/tests/baselines/Issue217.baseline.txt
+++ b/tests/baselines/Issue217.baseline.txt
@@ -44,7 +44,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -67,7 +67,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts
^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -135,7 +135,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -160,7 +160,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts
^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
diff --git a/tests/baselines/Issue218.baseline.txt b/tests/baselines/Issue218.baseline.txt
index b0cbc4e..9e03ae5 100644
--- a/tests/baselines/Issue218.baseline.txt
+++ b/tests/baselines/Issue218.baseline.txt
@@ -27,7 +27,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue219.baseline.txt b/tests/baselines/Issue219.baseline.txt
index 55ee472..59a744d 100644
--- a/tests/baselines/Issue219.baseline.txt
+++ b/tests/baselines/Issue219.baseline.txt
@@ -23,7 +23,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^^^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.separator.comma.ts
^^^
@@ -32,7 +32,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^^^^^^^^^^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^^^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
>} = this.props
@@ -79,6 +79,6 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts punctuation.terminator.statement.ts
\ No newline at end of file
diff --git a/tests/baselines/Issue221.baseline.txt b/tests/baselines/Issue221.baseline.txt
index f701c6d..413a1d9 100644
--- a/tests/baselines/Issue221.baseline.txt
+++ b/tests/baselines/Issue221.baseline.txt
@@ -34,7 +34,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -73,7 +73,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -92,7 +92,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue226.baseline.txt b/tests/baselines/Issue226.baseline.txt
index fc2900d..00b3f3f 100644
--- a/tests/baselines/Issue226.baseline.txt
+++ b/tests/baselines/Issue226.baseline.txt
@@ -18,7 +18,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -43,7 +43,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue230.baseline.txt b/tests/baselines/Issue230.baseline.txt
index 34761f6..d85cd23 100644
--- a/tests/baselines/Issue230.baseline.txt
+++ b/tests/baselines/Issue230.baseline.txt
@@ -138,7 +138,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts
^^^^^
- source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue232.baseline.txt b/tests/baselines/Issue232.baseline.txt
index 80cc2fd..36e1bf2 100644
--- a/tests/baselines/Issue232.baseline.txt
+++ b/tests/baselines/Issue232.baseline.txt
@@ -21,13 +21,13 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts
^
- source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.separator.comma.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts
^^^^^^^^^
- source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts
^
@@ -56,7 +56,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.block.ts meta.var.expr.ts
^^^^^^
- source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue235.baseline.txt b/tests/baselines/Issue235.baseline.txt
index 3e57122..b17aea2 100644
--- a/tests/baselines/Issue235.baseline.txt
+++ b/tests/baselines/Issue235.baseline.txt
@@ -50,7 +50,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue236.baseline.txt b/tests/baselines/Issue236.baseline.txt
index 9242765..a306ebb 100644
--- a/tests/baselines/Issue236.baseline.txt
+++ b/tests/baselines/Issue236.baseline.txt
@@ -38,7 +38,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -118,7 +118,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue239.baseline.txt b/tests/baselines/Issue239.baseline.txt
index b6cd100..23ae1c8 100644
--- a/tests/baselines/Issue239.baseline.txt
+++ b/tests/baselines/Issue239.baseline.txt
@@ -19,7 +19,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^^^^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
diff --git a/tests/baselines/Issue241.baseline.txt b/tests/baselines/Issue241.baseline.txt
index dfa65d6..479b727 100644
--- a/tests/baselines/Issue241.baseline.txt
+++ b/tests/baselines/Issue241.baseline.txt
@@ -25,7 +25,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -60,7 +60,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -84,7 +84,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -129,7 +129,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -153,7 +153,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -188,7 +188,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -212,7 +212,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -234,7 +234,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts punctuation.definition.block.ts
^
- source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.return.type.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -257,7 +257,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -281,7 +281,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -313,7 +313,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.return.type.ts meta.type.tuple.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -340,7 +340,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue243.baseline.txt b/tests/baselines/Issue243.baseline.txt
index 5ccb3c1..cab88df 100644
--- a/tests/baselines/Issue243.baseline.txt
+++ b/tests/baselines/Issue243.baseline.txt
@@ -135,7 +135,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -158,7 +158,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -190,7 +190,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts
^^
diff --git a/tests/baselines/Issue244.baseline.txt b/tests/baselines/Issue244.baseline.txt
index 33866ff..ce3e6cf 100644
--- a/tests/baselines/Issue244.baseline.txt
+++ b/tests/baselines/Issue244.baseline.txt
@@ -122,7 +122,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -151,7 +151,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue248.baseline.txt b/tests/baselines/Issue248.baseline.txt
index 3b51e0c..c71e08d 100644
--- a/tests/baselines/Issue248.baseline.txt
+++ b/tests/baselines/Issue248.baseline.txt
@@ -57,7 +57,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -78,7 +78,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -157,7 +157,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -178,7 +178,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -257,7 +257,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -278,7 +278,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -357,7 +357,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -378,7 +378,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -457,7 +457,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -478,7 +478,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -557,7 +557,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -578,7 +578,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue249.baseline.txt b/tests/baselines/Issue249.baseline.txt
index f3036c8..67f7e64 100644
--- a/tests/baselines/Issue249.baseline.txt
+++ b/tests/baselines/Issue249.baseline.txt
@@ -17,7 +17,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -73,7 +73,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^^^^^^^^^^^
diff --git a/tests/baselines/Issue250.baseline.txt b/tests/baselines/Issue250.baseline.txt
index b6cfa46..3785ea2 100644
--- a/tests/baselines/Issue250.baseline.txt
+++ b/tests/baselines/Issue250.baseline.txt
@@ -82,7 +82,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -111,7 +111,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts
^^^^
- source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -238,7 +238,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts
^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue251.baseline.txt b/tests/baselines/Issue251.baseline.txt
index 74dd68e..ba56083 100644
--- a/tests/baselines/Issue251.baseline.txt
+++ b/tests/baselines/Issue251.baseline.txt
@@ -20,7 +20,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts keyword.operator.assignment.ts
^
@@ -79,7 +79,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue252.baseline.txt b/tests/baselines/Issue252.baseline.txt
index 6be8af5..7dd568e 100644
--- a/tests/baselines/Issue252.baseline.txt
+++ b/tests/baselines/Issue252.baseline.txt
@@ -14,7 +14,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -77,7 +77,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts
^^^^^
- source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue262.baseline.txt b/tests/baselines/Issue262.baseline.txt
index 32baf4b..c6fa8c8 100644
--- a/tests/baselines/Issue262.baseline.txt
+++ b/tests/baselines/Issue262.baseline.txt
@@ -21,7 +21,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -72,7 +72,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue276.baseline.txt b/tests/baselines/Issue276.baseline.txt
index f2ae294..1f917c2 100644
--- a/tests/baselines/Issue276.baseline.txt
+++ b/tests/baselines/Issue276.baseline.txt
@@ -75,7 +75,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^^^^
diff --git a/tests/baselines/Issue28.baseline.txt b/tests/baselines/Issue28.baseline.txt
index 3580db8..e0efc91 100644
--- a/tests/baselines/Issue28.baseline.txt
+++ b/tests/baselines/Issue28.baseline.txt
@@ -33,7 +33,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -50,7 +50,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -67,7 +67,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -84,7 +84,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -101,7 +101,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -118,7 +118,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue280.baseline.txt b/tests/baselines/Issue280.baseline.txt
index 0e73232..ee908aa 100644
--- a/tests/baselines/Issue280.baseline.txt
+++ b/tests/baselines/Issue280.baseline.txt
@@ -54,7 +54,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.class.tsx meta.method.declaration.tsx
^^^^^^^^^^^^^^^^^^^^
- source.tsx meta.class.tsx meta.method.declaration.tsx entity.name.function.tsx
+ source.tsx meta.class.tsx meta.method.declaration.tsx meta.definition.method.tsx entity.name.function.tsx
^
source.tsx meta.class.tsx meta.method.declaration.tsx meta.parameters.tsx punctuation.definition.parameters.begin.tsx
^
@@ -71,7 +71,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx
^^^^^^^^^
- source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.class.tsx meta.method.declaration.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
diff --git a/tests/baselines/Issue283.baseline.txt b/tests/baselines/Issue283.baseline.txt
index fb21ae9..b110c2f 100644
--- a/tests/baselines/Issue283.baseline.txt
+++ b/tests/baselines/Issue283.baseline.txt
@@ -121,7 +121,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.class.tsx meta.method.declaration.tsx
^^^^^^
- source.tsx meta.class.tsx meta.method.declaration.tsx entity.name.function.tsx
+ source.tsx meta.class.tsx meta.method.declaration.tsx meta.definition.method.tsx entity.name.function.tsx
^
source.tsx meta.class.tsx meta.method.declaration.tsx meta.parameters.tsx punctuation.definition.parameters.begin.tsx
^
diff --git a/tests/baselines/Issue285.baseline.txt b/tests/baselines/Issue285.baseline.txt
index a829331..1cd5930 100644
--- a/tests/baselines/Issue285.baseline.txt
+++ b/tests/baselines/Issue285.baseline.txt
@@ -16,7 +16,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue288.baseline.txt b/tests/baselines/Issue288.baseline.txt
index 00b5370..4a5b5eb 100644
--- a/tests/baselines/Issue288.baseline.txt
+++ b/tests/baselines/Issue288.baseline.txt
@@ -47,7 +47,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -63,7 +63,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -94,7 +94,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -114,7 +114,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -141,7 +141,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts keyword.operator.assignment.ts
^
@@ -170,7 +170,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts keyword.operator.assignment.ts
^
@@ -186,7 +186,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts keyword.operator.assignment.ts
^
@@ -219,7 +219,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts keyword.operator.assignment.ts
^
diff --git a/tests/baselines/Issue288.txt b/tests/baselines/Issue288.txt
index 6592a27..09c7a8f 100644
--- a/tests/baselines/Issue288.txt
+++ b/tests/baselines/Issue288.txt
@@ -33,7 +33,7 @@ Grammar: TypeScript.tmLanguage
>
>function Name(){
^^^^
- [4, 10]: source.ts meta.function.ts entity.name.function.ts
+ [4, 10]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
>}
>var AnotherName = function(){
^
@@ -42,7 +42,7 @@ Grammar: TypeScript.tmLanguage
>
>export function eName(){
^^^^^
- [9, 17]: source.ts meta.function.ts entity.name.function.ts
+ [9, 17]: source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
>}
>export var eAnotherName = function(){
^
@@ -51,25 +51,25 @@ Grammar: TypeScript.tmLanguage
>
>var functionName=1;
^^^^^^^^^^^^
- [14, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [14, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
>functionName=1;
^^^^^^^^^^^^
[15, 9]: source.ts variable.other.readwrite.ts
>
>export var functionName2=1;
^^^^^^^^^^^^^
- [17, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [17, 20]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
>
>var exportName="hello";
^^^^^^^^^^
- [19, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [19, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
>exportName2="hello";
^^^^^^^^^^^
[20, 7]: source.ts variable.other.readwrite.ts
>
>var returnName=1;
^^^^^^^^^^
- [22, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [22, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
>returnName+=1;
^^^^^^^^^^
[23, 7]: source.ts variable.other.readwrite.ts
diff --git a/tests/baselines/Issue292.baseline.txt b/tests/baselines/Issue292.baseline.txt
index c765164..ae1e45f 100644
--- a/tests/baselines/Issue292.baseline.txt
+++ b/tests/baselines/Issue292.baseline.txt
@@ -22,7 +22,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -81,7 +81,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue294.baseline.txt b/tests/baselines/Issue294.baseline.txt
index 12a86f3..d79cf6e 100644
--- a/tests/baselines/Issue294.baseline.txt
+++ b/tests/baselines/Issue294.baseline.txt
@@ -52,7 +52,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts
^^^^
- source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts switch-statement.expr.ts switch-block.expr.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue3.baseline.txt b/tests/baselines/Issue3.baseline.txt
index caf021d..67905b7 100644
--- a/tests/baselines/Issue3.baseline.txt
+++ b/tests/baselines/Issue3.baseline.txt
@@ -11,7 +11,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue304.baseline.txt b/tests/baselines/Issue304.baseline.txt
index 8c7967b..4f4e8a0 100644
--- a/tests/baselines/Issue304.baseline.txt
+++ b/tests/baselines/Issue304.baseline.txt
@@ -23,7 +23,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -177,7 +177,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^
source.ts meta.var.expr.ts meta.object-literal.ts
^^^^^^^^
- source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^^^
diff --git a/tests/baselines/Issue305.baseline.txt b/tests/baselines/Issue305.baseline.txt
index 49105e1..40d2648 100644
--- a/tests/baselines/Issue305.baseline.txt
+++ b/tests/baselines/Issue305.baseline.txt
@@ -37,7 +37,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
diff --git a/tests/baselines/Issue307.baseline.txt b/tests/baselines/Issue307.baseline.txt
index bf6d7aa..f72bcea 100644
--- a/tests/baselines/Issue307.baseline.txt
+++ b/tests/baselines/Issue307.baseline.txt
@@ -30,7 +30,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts
^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -49,7 +49,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^^^
- source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -95,7 +95,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
- source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
> } = obj;
@@ -123,7 +123,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue314.baseline.txt b/tests/baselines/Issue314.baseline.txt
index df4a2d3..0738ae8 100644
--- a/tests/baselines/Issue314.baseline.txt
+++ b/tests/baselines/Issue314.baseline.txt
@@ -12,7 +12,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -55,7 +55,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue318.baseline.txt b/tests/baselines/Issue318.baseline.txt
index 3b65852..6204dfe 100644
--- a/tests/baselines/Issue318.baseline.txt
+++ b/tests/baselines/Issue318.baseline.txt
@@ -90,7 +90,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^^^^^^^^
- source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -121,7 +121,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^^^^^^
- source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue32.baseline.txt b/tests/baselines/Issue32.baseline.txt
index 86cb0c7..f799019 100644
--- a/tests/baselines/Issue32.baseline.txt
+++ b/tests/baselines/Issue32.baseline.txt
@@ -50,7 +50,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -63,7 +63,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -108,7 +108,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -121,7 +121,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue32.txt b/tests/baselines/Issue32.txt
index a2346ce..4ef6838 100644
--- a/tests/baselines/Issue32.txt
+++ b/tests/baselines/Issue32.txt
@@ -36,10 +36,10 @@ Grammar: TypeScript.tmLanguage
[5, 11]: source.ts meta.class.ts entity.name.type.class.ts
> currentData: Data;
^^^^^^^^^^^
- [6, 2]: source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ [6, 2]: source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
> setVal(d: Data)
^^^^^^
- [7, 2]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [7, 2]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
>}
>
>
@@ -48,10 +48,10 @@ Grammar: TypeScript.tmLanguage
[11, 1]: source.ts meta.class.ts storage.type.class.ts
> currentData: Data;
^^^^^^^^^^^
- [12, 2]: source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ [12, 2]: source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
> setVal(d: Data){
^^^^^^
- [13, 2]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [13, 2]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
> this.currentData = d;
^^^^
[14, 3]: source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.language.this.ts
diff --git a/tests/baselines/Issue321.baseline.txt b/tests/baselines/Issue321.baseline.txt
index 0536c17..e7e8f42 100644
--- a/tests/baselines/Issue321.baseline.txt
+++ b/tests/baselines/Issue321.baseline.txt
@@ -85,7 +85,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^^^^^^^^^^^
@@ -175,7 +175,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.var.expr.ts
^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -420,7 +420,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.var.expr.ts
^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -557,7 +557,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.var.expr.ts
^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -606,7 +606,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -653,7 +653,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts meta.var.expr.ts
^^^^^
- source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -694,7 +694,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts meta.var.expr.ts
^^^^^
- source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -903,7 +903,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.var.expr.ts
^^^^^
- source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -948,7 +948,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.var.expr.ts
^^^^^
- source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.arrow.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue335.baseline.txt b/tests/baselines/Issue335.baseline.txt
index ff1883c..370e560 100644
--- a/tests/baselines/Issue335.baseline.txt
+++ b/tests/baselines/Issue335.baseline.txt
@@ -70,7 +70,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -87,7 +87,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
> d.default = 1;
@@ -129,7 +129,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -164,7 +164,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -181,7 +181,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
> d.case = 1
@@ -221,7 +221,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -256,7 +256,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -273,7 +273,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
> d.default = 1
^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
@@ -373,7 +373,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -408,7 +408,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -425,7 +425,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.class.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.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
> d.case = 1
^^
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
@@ -525,7 +525,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue36.baseline.txt b/tests/baselines/Issue36.baseline.txt
index 03a005c..92902bb 100644
--- a/tests/baselines/Issue36.baseline.txt
+++ b/tests/baselines/Issue36.baseline.txt
@@ -15,7 +15,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -30,7 +30,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.var.expr.ts meta.object-literal.ts
^^^^^
- source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -49,7 +49,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts
^^^^^
- source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-literal.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue37.baseline.txt b/tests/baselines/Issue37.baseline.txt
index 0e4c642..76a1b8a 100644
--- a/tests/baselines/Issue37.baseline.txt
+++ b/tests/baselines/Issue37.baseline.txt
@@ -189,7 +189,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -233,7 +233,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -276,7 +276,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.block.ts meta.var.expr.ts
^
- source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -415,7 +415,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.block.ts meta.function.ts
^^^^^
- source.ts meta.block.ts meta.function.ts entity.name.function.ts
+ source.ts meta.block.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.block.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -460,7 +460,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -490,7 +490,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -537,7 +537,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -575,7 +575,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -634,7 +634,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.block.ts meta.class.ts
^^^^^^
- source.ts meta.block.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
diff --git a/tests/baselines/Issue37.txt b/tests/baselines/Issue37.txt
index 8e616a9..295537f 100644
--- a/tests/baselines/Issue37.txt
+++ b/tests/baselines/Issue37.txt
@@ -101,7 +101,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^
[10, 2]: source.ts meta.class.ts storage.modifier.ts
^^^^^^^^^^^
- [10, 9]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [10, 9]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
>
> }
>}
@@ -115,7 +115,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^
[16, 2]: source.ts meta.class.ts storage.modifier.ts
^^^^^
- [16, 10]: source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ [16, 10]: source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
>}
>
>void newFunctionName(){
@@ -192,7 +192,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^
[53, 9]: source.ts meta.block.ts meta.class.ts storage.modifier.ts
^^^^^^
- [53, 16]: source.ts meta.block.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ [53, 16]: source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^^^^
[53, 24]: source.ts meta.block.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts
>
diff --git a/tests/baselines/Issue43.baseline.txt b/tests/baselines/Issue43.baseline.txt
index f6d15b3..b4b0923 100644
--- a/tests/baselines/Issue43.baseline.txt
+++ b/tests/baselines/Issue43.baseline.txt
@@ -12,7 +12,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue44.baseline.txt b/tests/baselines/Issue44.baseline.txt
index 94be7d4..33ae719 100644
--- a/tests/baselines/Issue44.baseline.txt
+++ b/tests/baselines/Issue44.baseline.txt
@@ -32,7 +32,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts
^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -45,7 +45,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts
^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue44.txt b/tests/baselines/Issue44.txt
index fb57704..24b0ed6 100644
--- a/tests/baselines/Issue44.txt
+++ b/tests/baselines/Issue44.txt
@@ -22,12 +22,12 @@ Grammar: TypeScript.tmLanguage
[2, 11]: source.ts meta.class.ts entity.name.type.class.ts
> testvar: string;
^^^^^^^
- [3, 3]: source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ [3, 3]: source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^^^^^^
[3, 12]: source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts
> testfunc(): string;
^^^^^^^^
- [4, 3]: source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ [4, 3]: source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^^^^^^
[4, 15]: source.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts
>}
diff --git a/tests/baselines/Issue5.baseline.txt b/tests/baselines/Issue5.baseline.txt
index bc65b96..f43eb21 100644
--- a/tests/baselines/Issue5.baseline.txt
+++ b/tests/baselines/Issue5.baseline.txt
@@ -45,7 +45,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -70,7 +70,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -107,7 +107,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts keyword.operator.assignment.ts
^
@@ -146,7 +146,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -218,7 +218,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -312,7 +312,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue59.baseline.txt b/tests/baselines/Issue59.baseline.txt
index b53a61e..83aad9b 100644
--- a/tests/baselines/Issue59.baseline.txt
+++ b/tests/baselines/Issue59.baseline.txt
@@ -29,7 +29,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -62,7 +62,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
diff --git a/tests/baselines/Issue63.baseline.txt b/tests/baselines/Issue63.baseline.txt
index a5bc5fd..e450a64 100644
--- a/tests/baselines/Issue63.baseline.txt
+++ b/tests/baselines/Issue63.baseline.txt
@@ -304,7 +304,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.type.declaration.ts meta.object.type.ts
^^^
- source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -317,7 +317,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.type.declaration.ts meta.object.type.ts
^^^
- source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
diff --git a/tests/baselines/Issue63.txt b/tests/baselines/Issue63.txt
index bf9577c..a983389 100644
--- a/tests/baselines/Issue63.txt
+++ b/tests/baselines/Issue63.txt
@@ -76,12 +76,12 @@ Grammar: TypeScript.tmLanguage
>
> foo: T,
^^^
- [11, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ [11, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
[11, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts entity.name.type.ts
> bar: number
^^^
- [12, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ [12, 2]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^^^^^^
[12, 7]: source.ts meta.type.declaration.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts
>
diff --git a/tests/baselines/Issue64.baseline.txt b/tests/baselines/Issue64.baseline.txt
index f1796c1..ef99015 100644
--- a/tests/baselines/Issue64.baseline.txt
+++ b/tests/baselines/Issue64.baseline.txt
@@ -87,7 +87,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^^^
diff --git a/tests/baselines/Issue65.baseline.txt b/tests/baselines/Issue65.baseline.txt
index d8d60f7..e46d56d 100644
--- a/tests/baselines/Issue65.baseline.txt
+++ b/tests/baselines/Issue65.baseline.txt
@@ -34,7 +34,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -98,7 +98,7 @@ Grammar: TypeScript.tmLanguage
^^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue66.baseline.txt b/tests/baselines/Issue66.baseline.txt
index 65999ec..270d0ac 100644
--- a/tests/baselines/Issue66.baseline.txt
+++ b/tests/baselines/Issue66.baseline.txt
@@ -18,7 +18,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
@@ -72,7 +72,7 @@ Grammar: TypeScriptReact.tmLanguage
^^^^
source.tsx meta.class.tsx
^^^^^^
- source.tsx meta.class.tsx meta.method.declaration.tsx entity.name.function.tsx
+ source.tsx meta.class.tsx meta.method.declaration.tsx meta.definition.method.tsx entity.name.function.tsx
^
source.tsx meta.class.tsx meta.method.declaration.tsx meta.parameters.tsx punctuation.definition.parameters.begin.tsx
^
diff --git a/tests/baselines/Issue77.baseline.txt b/tests/baselines/Issue77.baseline.txt
index 791f3c6..03cf8d9 100644
--- a/tests/baselines/Issue77.baseline.txt
+++ b/tests/baselines/Issue77.baseline.txt
@@ -91,7 +91,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -101,7 +101,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.return.type.ts meta.object.type.ts punctuation.definition.block.ts
^
- source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -155,7 +155,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts cast.expr.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.object.type.ts punctuation.definition.block.ts
^
- source.ts cast.expr.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts cast.expr.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts cast.expr.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.function.return.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -191,7 +191,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/Issue88.baseline.txt b/tests/baselines/Issue88.baseline.txt
index 80f6cb8..a2a2dfa 100644
--- a/tests/baselines/Issue88.baseline.txt
+++ b/tests/baselines/Issue88.baseline.txt
@@ -26,7 +26,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.function.tsx
^^^
- source.tsx meta.function.tsx entity.name.function.tsx
+ source.tsx meta.function.tsx meta.definition.function.tsx entity.name.function.tsx
^
source.tsx meta.function.tsx meta.parameters.tsx punctuation.definition.parameters.begin.tsx
^
diff --git a/tests/baselines/Issue90.baseline.txt b/tests/baselines/Issue90.baseline.txt
index 459a8e3..12a2614 100644
--- a/tests/baselines/Issue90.baseline.txt
+++ b/tests/baselines/Issue90.baseline.txt
@@ -17,7 +17,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -36,7 +36,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -55,7 +55,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue90.txt b/tests/baselines/Issue90.txt
index 96a0a76..d56db6c 100644
--- a/tests/baselines/Issue90.txt
+++ b/tests/baselines/Issue90.txt
@@ -16,14 +16,14 @@ Grammar: TypeScript.tmLanguage
^
[2, 1]: source.ts
^
- [2, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [2, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
[2, 10]: source.ts meta.var.expr.ts constant.numeric.decimal.ts
> var c = a ^ b;
^
[3, 1]: source.ts
^
- [3, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [3, 6]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
[3, 10]: source.ts meta.var.expr.ts variable.other.readwrite.ts
^
diff --git a/tests/baselines/Issue96.baseline.txt b/tests/baselines/Issue96.baseline.txt
index 4454a70..1608c70 100644
--- a/tests/baselines/Issue96.baseline.txt
+++ b/tests/baselines/Issue96.baseline.txt
@@ -22,7 +22,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts punctuation.terminator.statement.ts
>let variable;
@@ -31,7 +31,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts punctuation.terminator.statement.ts
>
@@ -56,7 +56,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -108,7 +108,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/Issue96.txt b/tests/baselines/Issue96.txt
index 78ba593..1085633 100644
--- a/tests/baselines/Issue96.txt
+++ b/tests/baselines/Issue96.txt
@@ -32,7 +32,7 @@ Grammar: TypeScript.tmLanguage
>
>var constenum = 10;
^^^^^^^^^
- [7, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [7, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
[7, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
>constenum += 10;
@@ -48,7 +48,7 @@ Grammar: TypeScript.tmLanguage
>
>var constable = "I am rrrrrroyal!";
^^^^^^^^^
- [11, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [11, 10]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
[11, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
>constable += " Royal, I say!";
diff --git a/tests/baselines/ParameterProperties.baseline.txt b/tests/baselines/ParameterProperties.baseline.txt
index 0dcfd8d..9ef4af0 100644
--- a/tests/baselines/ParameterProperties.baseline.txt
+++ b/tests/baselines/ParameterProperties.baseline.txt
@@ -88,7 +88,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt b/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt
index 2319d92..30b5557 100644
--- a/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt
+++ b/tests/baselines/SyntacticallyIncorrectStrings.baseline.txt
@@ -53,7 +53,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/TsxSamples.baseline.txt b/tests/baselines/TsxSamples.baseline.txt
index b7a4d77..bbe9180 100644
--- a/tests/baselines/TsxSamples.baseline.txt
+++ b/tests/baselines/TsxSamples.baseline.txt
@@ -100,7 +100,7 @@ Grammar: TypeScriptReact.tmLanguage
^^^^
source.tsx meta.class.tsx
^^^^^^
- source.tsx meta.class.tsx meta.method.declaration.tsx entity.name.function.tsx
+ source.tsx meta.class.tsx meta.method.declaration.tsx meta.definition.method.tsx entity.name.function.tsx
^
source.tsx meta.class.tsx meta.method.declaration.tsx meta.parameters.tsx punctuation.definition.parameters.begin.tsx
^
@@ -191,7 +191,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^^^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
@@ -287,7 +287,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^^^^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
@@ -390,7 +390,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^^^^^^^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
@@ -504,7 +504,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^^^^^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
@@ -557,7 +557,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^^^^^^^^^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
@@ -593,7 +593,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^^^^^^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
@@ -626,7 +626,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^^^^^^^^^^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
@@ -686,7 +686,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
@@ -725,7 +725,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
@@ -790,7 +790,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
@@ -861,7 +861,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
@@ -908,7 +908,7 @@ Grammar: TypeScriptReact.tmLanguage
^
source.tsx meta.var.expr.tsx
^
- source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
+ source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.definition.variable.tsx variable.other.readwrite.tsx
^
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
^
diff --git a/tests/baselines/arrow.baseline.txt b/tests/baselines/arrow.baseline.txt
index 9ad96a4..c8e8ed5 100644
--- a/tests/baselines/arrow.baseline.txt
+++ b/tests/baselines/arrow.baseline.txt
@@ -19,7 +19,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -71,7 +71,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/awaitUsedInExpression.baseline.txt b/tests/baselines/awaitUsedInExpression.baseline.txt
index 3d837b7..f78c974 100644
--- a/tests/baselines/awaitUsedInExpression.baseline.txt
+++ b/tests/baselines/awaitUsedInExpression.baseline.txt
@@ -11,7 +11,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/binder.baseline.txt b/tests/baselines/binder.baseline.txt
index 83a95b1..8cc9de8 100644
--- a/tests/baselines/binder.baseline.txt
+++ b/tests/baselines/binder.baseline.txt
@@ -18,7 +18,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -73,7 +73,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^^^^^^
- source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -132,7 +132,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^^^^^^^^^^^^^^^^^
- source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -160,7 +160,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts
^^^^^^^^^^^^^^^
- source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
diff --git a/tests/baselines/constants.baseline.txt b/tests/baselines/constants.baseline.txt
index 26087c6..e05e908 100644
--- a/tests/baselines/constants.baseline.txt
+++ b/tests/baselines/constants.baseline.txt
@@ -17,7 +17,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -36,7 +36,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -55,7 +55,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -74,7 +74,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -93,7 +93,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -114,7 +114,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -135,7 +135,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/destructuringWithDefaults.baseline.txt b/tests/baselines/destructuringWithDefaults.baseline.txt
index abb6a30..d1576ef 100644
--- a/tests/baselines/destructuringWithDefaults.baseline.txt
+++ b/tests/baselines/destructuringWithDefaults.baseline.txt
@@ -49,7 +49,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -64,7 +64,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -79,7 +79,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.class.ts
^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -114,7 +114,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^^^^^^^^^^^^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
@@ -131,7 +131,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^^^^^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
@@ -158,7 +158,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^^^^^^^^^^^^^^^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
@@ -200,7 +200,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -314,7 +314,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts
^^^^^^
- source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts
^
@@ -331,7 +331,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts
^^^^^^
- source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts
^
@@ -352,7 +352,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts
^^^^^^^^
- source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts
^
@@ -390,7 +390,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
diff --git a/tests/baselines/docComments.baseline.txt b/tests/baselines/docComments.baseline.txt
index 6209135..95aa337 100644
--- a/tests/baselines/docComments.baseline.txt
+++ b/tests/baselines/docComments.baseline.txt
@@ -70,7 +70,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^^^^^
diff --git a/tests/baselines/generator.baseline.txt b/tests/baselines/generator.baseline.txt
index 7568ec3..21d234a 100644
--- a/tests/baselines/generator.baseline.txt
+++ b/tests/baselines/generator.baseline.txt
@@ -47,7 +47,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.block.ts meta.function.ts
^
- source.ts meta.block.ts meta.function.ts entity.name.function.ts
+ source.ts meta.block.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.block.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -84,7 +84,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.block.ts meta.function.ts meta.function.overload.ts
^
- source.ts meta.block.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ source.ts meta.block.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.block.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -121,7 +121,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.block.ts meta.function.ts meta.function.overload.ts
^
- source.ts meta.block.ts meta.function.ts meta.function.overload.ts entity.name.function.ts
+ source.ts meta.block.ts meta.function.ts meta.function.overload.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.block.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -170,7 +170,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -184,7 +184,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -216,7 +216,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts keyword.generator.asterisk.ts
^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -302,7 +302,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -331,7 +331,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -360,7 +360,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.method.declaration.ts
^^^^^^^^
- source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
+ source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.class.ts meta.method.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
^
diff --git a/tests/baselines/multipleVariableDeclaration.baseline.txt b/tests/baselines/multipleVariableDeclaration.baseline.txt
index 43867a6..96fa20c 100644
--- a/tests/baselines/multipleVariableDeclaration.baseline.txt
+++ b/tests/baselines/multipleVariableDeclaration.baseline.txt
@@ -16,26 +16,26 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts punctuation.separator.comma.ts
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts punctuation.separator.comma.ts
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
>var a1 = 1, b1 = function (x) { return 1; }, c1 = "string"
^^^
source.ts meta.var.expr.ts storage.type.ts
^
source.ts meta.var.expr.ts
^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -49,7 +49,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -89,7 +89,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -108,7 +108,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -132,7 +132,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -196,7 +196,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -219,7 +219,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -251,7 +251,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/multipleVariableDeclaration.txt b/tests/baselines/multipleVariableDeclaration.txt
index fef70f3..d8108f1 100644
--- a/tests/baselines/multipleVariableDeclaration.txt
+++ b/tests/baselines/multipleVariableDeclaration.txt
@@ -12,29 +12,29 @@ Grammar: TypeScript.tmLanguage
-----------------------------------
>var a, b, c
^
- [1, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [1, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
- [1, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [1, 8]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
- [1, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [1, 11]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
>var a1 = 1, b1 = function (x) { return 1; }, c1 = "string"
^^
- [2, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [2, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^^
- [2, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [2, 13]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^^
- [2, 46]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [2, 46]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
>var a2: string = "test", b2: () => void = () => { console.log("hello"); }, c2: string | number;
^^
- [3, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [3, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^^
- [3, 26]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [3, 26]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^^
- [3, 76]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [3, 76]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
>var obj = {
^^^
- [4, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [4, 5]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
> foo: "10"
>}, other = 10;
^^^^^
- [6, 4]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
\ No newline at end of file
+ [6, 4]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
\ No newline at end of file
diff --git a/tests/baselines/numeric.baseline.txt b/tests/baselines/numeric.baseline.txt
index 528c6d0..ef43132 100644
--- a/tests/baselines/numeric.baseline.txt
+++ b/tests/baselines/numeric.baseline.txt
@@ -21,7 +21,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -40,7 +40,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -59,7 +59,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -78,7 +78,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -101,7 +101,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -124,7 +124,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -145,7 +145,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -164,7 +164,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -187,7 +187,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -208,7 +208,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -229,7 +229,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/numericAsType.baseline.txt b/tests/baselines/numericAsType.baseline.txt
index 3aea635..8eac0de 100644
--- a/tests/baselines/numericAsType.baseline.txt
+++ b/tests/baselines/numericAsType.baseline.txt
@@ -12,7 +12,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
diff --git a/tests/baselines/parameterBindingPattern.baseline.txt b/tests/baselines/parameterBindingPattern.baseline.txt
index e33ad9d..6c8b598 100644
--- a/tests/baselines/parameterBindingPattern.baseline.txt
+++ b/tests/baselines/parameterBindingPattern.baseline.txt
@@ -55,7 +55,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -209,7 +209,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts
^^^^^
- source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -279,7 +279,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -387,7 +387,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -476,7 +476,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -489,7 +489,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -504,7 +504,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -528,7 +528,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -541,7 +541,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -556,7 +556,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -580,7 +580,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -601,7 +601,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts
^^^^^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -660,7 +660,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -687,7 +687,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts
^^^^^
- source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -758,7 +758,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -808,7 +808,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -838,7 +838,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts
^^^^^
- source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
diff --git a/tests/baselines/pr48_noSemiColon.baseline.txt b/tests/baselines/pr48_noSemiColon.baseline.txt
index a69606f..1de3d8b 100644
--- a/tests/baselines/pr48_noSemiColon.baseline.txt
+++ b/tests/baselines/pr48_noSemiColon.baseline.txt
@@ -44,7 +44,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -73,7 +73,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -98,7 +98,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts
^^^^^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -148,7 +148,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -187,7 +187,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^^^
@@ -292,7 +292,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -339,7 +339,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/pr48_noSemiColon.txt b/tests/baselines/pr48_noSemiColon.txt
index ec4fb33..d4a152f 100644
--- a/tests/baselines/pr48_noSemiColon.txt
+++ b/tests/baselines/pr48_noSemiColon.txt
@@ -30,17 +30,17 @@ Grammar: TypeScript.tmLanguage
^^^^^^^
[2, 2]: source.ts meta.class.ts storage.modifier.ts
^^^^
- [2, 10]: source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ [2, 10]: source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
> private options: TemplateOptions = {}
^^^^^^^
[3, 2]: source.ts meta.class.ts storage.modifier.ts
^^^^^^^
- [3, 10]: source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ [3, 10]: source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
> private state = {}
^^^^^^^
[4, 2]: source.ts meta.class.ts storage.modifier.ts
^^^^^
- [4, 10]: source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ [4, 10]: source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
>}
>
>export type Stats = fs.Stats
@@ -56,7 +56,7 @@ Grammar: TypeScript.tmLanguage
^^^^^
[8, 8]: source.ts meta.var.expr.ts storage.type.ts
^^^^^
- [8, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ [8, 14]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
>
>/**
> * Verify comments
diff --git a/tests/baselines/readonly.baseline.txt b/tests/baselines/readonly.baseline.txt
index 67ab672..fcaf9ef 100644
--- a/tests/baselines/readonly.baseline.txt
+++ b/tests/baselines/readonly.baseline.txt
@@ -37,7 +37,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.field.declaration.ts
^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -56,7 +56,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.field.declaration.ts
^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts keyword.operator.optional.ts
^
@@ -98,7 +98,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.field.declaration.ts
^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -117,7 +117,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.class.ts meta.field.declaration.ts
^
- source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
@@ -144,7 +144,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -158,7 +158,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -170,7 +170,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -189,7 +189,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
diff --git a/tests/baselines/regexp.baseline.txt b/tests/baselines/regexp.baseline.txt
index 0e3daad..019749d 100644
--- a/tests/baselines/regexp.baseline.txt
+++ b/tests/baselines/regexp.baseline.txt
@@ -12,7 +12,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -65,7 +65,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/restAndSpreadExpression.baseline.txt b/tests/baselines/restAndSpreadExpression.baseline.txt
index 9e4314f..4d9bade 100644
--- a/tests/baselines/restAndSpreadExpression.baseline.txt
+++ b/tests/baselines/restAndSpreadExpression.baseline.txt
@@ -27,7 +27,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^^
@@ -62,13 +62,13 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.separator.comma.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.separator.comma.ts
^
@@ -76,7 +76,7 @@ Grammar: TypeScript.tmLanguage
^^^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts keyword.operator.rest.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
@@ -214,7 +214,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.separator.comma.ts
^
@@ -226,13 +226,13 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.separator.comma.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
@@ -261,7 +261,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts
^
- source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.separator.comma.ts
^
@@ -271,13 +271,13 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts
^
- source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.separator.comma.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts
^
- source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts
^
@@ -333,7 +333,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -374,7 +374,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
^
@@ -420,7 +420,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.return.type.ts meta.object.type.ts
^^
- source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.return.type.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -511,7 +511,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^^^^^^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -558,7 +558,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -628,7 +628,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
@@ -665,7 +665,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts
^^^^^^
- source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
diff --git a/tests/baselines/variableBindingPattern.baseline.txt b/tests/baselines/variableBindingPattern.baseline.txt
index 1689b9d..2d74111 100644
--- a/tests/baselines/variableBindingPattern.baseline.txt
+++ b/tests/baselines/variableBindingPattern.baseline.txt
@@ -51,7 +51,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -205,7 +205,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts
^^^^^
- source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -283,7 +283,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.separator.comma.ts
^
@@ -305,7 +305,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts
^
@@ -321,7 +321,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.separator.comma.ts
^
@@ -331,7 +331,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^^^^^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
@@ -343,7 +343,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
@@ -378,7 +378,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.separator.comma.ts
^
@@ -400,7 +400,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts
^
@@ -416,7 +416,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts punctuation.separator.comma.ts
^
@@ -426,7 +426,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^^^^^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
@@ -438,7 +438,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts
^
@@ -455,7 +455,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -468,7 +468,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -483,7 +483,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -507,7 +507,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -520,7 +520,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -535,7 +535,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -559,7 +559,7 @@ Grammar: TypeScript.tmLanguage
^^^^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts
^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -580,7 +580,7 @@ Grammar: TypeScript.tmLanguage
^^^^^^^^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts
^^^^^
- source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.var.expr.ts meta.object-binding-pattern-variable.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -630,7 +630,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts
^^^
- source.ts meta.function.ts entity.name.function.ts
+ source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
^
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^
@@ -657,7 +657,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts
^^^^^
- source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.function.ts meta.block.ts cast.expr.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
@@ -732,7 +732,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts
^^^^^
- source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts
^
@@ -740,7 +740,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts
^^^^^
- source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts
^
@@ -769,7 +769,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts
^^^^^
- source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.object.ts
^
@@ -777,7 +777,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts
^^^^^
- source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts variable.other.readwrite.ts
+ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.definition.variable.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts punctuation.definition.binding-pattern.array.ts
^
@@ -791,7 +791,7 @@ Grammar: TypeScript.tmLanguage
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts
^^^^^
- source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts variable.object.property.ts
+ source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.var.expr.ts meta.array-binding-pattern-variable.ts meta.type.annotation.ts meta.type.tuple.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^