From 5b8448f4f3afdf7b827fbdf833d446040731fa3a Mon Sep 17 00:00:00 2001 From: charburgx Date: Thu, 27 Oct 2022 01:56:56 -0500 Subject: [PATCH] fix(api): narrow declarations to identifier --- packages/api/src/tree.ts | 3 + packages/api/src/util.ts | 21 ++ .../baselines/reference/array.localized.tree | 8 +- tests/baselines/reference/array.tree | 4 +- .../reference/arrayObjectAlias.localized.tree | 56 +-- .../baselines/reference/arrayObjectAlias.tree | 32 +- .../baselines/reference/class.localized.tree | 264 +++++++------- tests/baselines/reference/class.tree | 208 +++++------ .../reference/classGeneric.localized.tree | 324 +++++++++--------- tests/baselines/reference/classGeneric.tree | 288 ++++++++-------- .../reference/conditional.localized.tree | 8 +- tests/baselines/reference/conditional.tree | 4 +- tests/baselines/reference/enum.localized.tree | 8 +- tests/baselines/reference/enum.tree | 28 +- .../reference/function.localized.tree | 48 +-- tests/baselines/reference/function.tree | 36 +- .../reference/functionGeneric.localized.tree | 112 +++--- .../baselines/reference/functionGeneric.tree | 90 ++--- .../reference/genericTypeDef.localized.tree | 24 +- tests/baselines/reference/genericTypeDef.tree | 12 +- .../reference/indexedAccess.localized.tree | 20 +- tests/baselines/reference/indexedAccess.tree | 12 +- .../baselines/reference/keyof.localized.tree | 8 +- tests/baselines/reference/keyof.tree | 4 +- .../baselines/reference/lambda.localized.tree | 68 ++-- tests/baselines/reference/lambda.tree | 36 +- .../baselines/reference/mapped.localized.tree | 14 +- tests/baselines/reference/mapped.tree | 8 +- .../reference/mappedParam.localized.tree | 22 +- tests/baselines/reference/mappedParam.tree | 14 +- .../reference/partial.localized.tree | 58 ++-- tests/baselines/reference/partial.tree | 40 +-- tests/baselines/reference/pick.localized.tree | 248 +++++++------- tests/baselines/reference/pick.tree | 134 ++++---- .../reference/recursive.localized.tree | 56 +-- tests/baselines/reference/recursive.tree | 52 +-- .../baselines/reference/tuple.localized.tree | 8 +- tests/baselines/reference/tuple.tree | 4 +- .../reference/tupleNamed.localized.tree | 8 +- tests/baselines/reference/tupleNamed.tree | 4 +- .../reference/tupleObjectAlias.localized.tree | 76 ++-- .../baselines/reference/tupleObjectAlias.tree | 44 +-- .../reference/uppercase.localized.tree | 36 +- tests/baselines/reference/uppercase.tree | 24 +- 44 files changed, 1300 insertions(+), 1276 deletions(-) diff --git a/packages/api/src/tree.ts b/packages/api/src/tree.ts index a81d9dd..08f82dc 100644 --- a/packages/api/src/tree.ts +++ b/packages/api/src/tree.ts @@ -41,6 +41,7 @@ import { getNodeSymbol, TypescriptContext, removeDuplicates, + narrowDeclarationForLocation, } from "./util" const maxDepthExceeded: TypeInfo = { kind: "max_depth", id: getEmptyTypeId() } @@ -613,6 +614,8 @@ function _generateTypeTree( function getDeclarationInfo( declaration: ts.Declaration ): DeclarationInfo | undefined { + declaration = narrowDeclarationForLocation(declaration) + const sourceFile = declaration.getSourceFile() const location = getSourceFileLocation(sourceFile, declaration) diff --git a/packages/api/src/util.ts b/packages/api/src/util.ts index da6ab24..d2963af 100644 --- a/packages/api/src/util.ts +++ b/packages/api/src/util.ts @@ -50,6 +50,8 @@ type NodeWithTypeArguments = ts.Node & { } type NodeWithJsDoc = ts.Node & { jsDoc?: ts.Node[] | undefined } +type DeclarationInternal = ts.Declaration & { name?: ts.Identifier } + export type UnionTypeInternal = ts.UnionType & { id: number } export type IntersectionTypeInternal = ts.IntersectionType & { id: number } export type TypeReferenceInternal = ts.TypeReference & { @@ -849,3 +851,22 @@ export function getSourceFileLocation( }, } } + +/** + * Tries to find subnode that can be retrieved later + * by the client + * + * For example, consider: + * + * `export enum Enum { ... }` + * + * If the client tries to retrieve the entire `EnumDeclaration` + * node, then it will go from character 0, which will find the + * `export` token, which does not have a type. In this case, + * the node is narrowed to its identifier - `Enum` in this case + * + * @param node + */ +export function narrowDeclarationForLocation(node: ts.Declaration) { + return (node as DeclarationInternal).name ?? node +} diff --git a/tests/baselines/reference/array.localized.tree b/tests/baselines/reference/array.localized.tree index 5f321a2..a013ac5 100644 --- a/tests/baselines/reference/array.localized.tree +++ b/tests/baselines/reference/array.localized.tree @@ -13,11 +13,11 @@ type arrayOfStrings = string[] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 30 + "character": 19 } } } @@ -30,11 +30,11 @@ type arrayOfStrings = string[] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 30 + "character": 19 } } } diff --git a/tests/baselines/reference/array.tree b/tests/baselines/reference/array.tree index e55fc38..b3fe45c 100644 --- a/tests/baselines/reference/array.tree +++ b/tests/baselines/reference/array.tree @@ -18,11 +18,11 @@ type arrayOfStrings = string[] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 30 + "character": 19 } } } diff --git a/tests/baselines/reference/arrayObjectAlias.localized.tree b/tests/baselines/reference/arrayObjectAlias.localized.tree index f2a1959..12dbc37 100644 --- a/tests/baselines/reference/arrayObjectAlias.localized.tree +++ b/tests/baselines/reference/arrayObjectAlias.localized.tree @@ -12,11 +12,11 @@ type Obj = { a: string, b: number } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 35 + "character": 8 } } } @@ -28,11 +28,11 @@ type Obj = { a: string, b: number } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 35 + "character": 8 } } } @@ -55,7 +55,7 @@ type Obj = { a: string, b: number } }, "end": { "line": 0, - "character": 23 + "character": 14 } } } @@ -71,7 +71,7 @@ type Obj = { a: string, b: number } }, "end": { "line": 0, - "character": 23 + "character": 14 } } } @@ -96,7 +96,7 @@ type Obj = { a: string, b: number } }, "end": { "line": 0, - "character": 33 + "character": 25 } } } @@ -112,7 +112,7 @@ type Obj = { a: string, b: number } }, "end": { "line": 0, - "character": 33 + "character": 25 } } } @@ -143,7 +143,7 @@ type Obj = { a: string, b: number } }, "end": { "line": 0, - "character": 23 + "character": 14 } } } @@ -159,7 +159,7 @@ type Obj = { a: string, b: number } }, "end": { "line": 0, - "character": 23 + "character": 14 } } } @@ -185,7 +185,7 @@ type Obj = { a: string, b: number } }, "end": { "line": 0, - "character": 33 + "character": 25 } } } @@ -201,7 +201,7 @@ type Obj = { a: string, b: number } }, "end": { "line": 0, - "character": 33 + "character": 25 } } } @@ -223,11 +223,11 @@ type arrObj = Obj[] "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 19 + "character": 11 } } } @@ -240,11 +240,11 @@ type arrObj = Obj[] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 35 + "character": 8 } } } @@ -267,7 +267,7 @@ type arrObj = Obj[] }, "end": { "line": 0, - "character": 23 + "character": 14 } } } @@ -283,7 +283,7 @@ type arrObj = Obj[] }, "end": { "line": 0, - "character": 23 + "character": 14 } } } @@ -308,7 +308,7 @@ type arrObj = Obj[] }, "end": { "line": 0, - "character": 33 + "character": 25 } } } @@ -324,7 +324,7 @@ type arrObj = Obj[] }, "end": { "line": 0, - "character": 33 + "character": 25 } } } @@ -348,11 +348,11 @@ type arrObj = Obj[] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 35 + "character": 8 } } } @@ -364,11 +364,11 @@ type arrObj = Obj[] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 35 + "character": 8 } } } @@ -391,7 +391,7 @@ type arrObj = Obj[] }, "end": { "line": 0, - "character": 23 + "character": 14 } } } @@ -407,7 +407,7 @@ type arrObj = Obj[] }, "end": { "line": 0, - "character": 23 + "character": 14 } } } @@ -432,7 +432,7 @@ type arrObj = Obj[] }, "end": { "line": 0, - "character": 33 + "character": 25 } } } @@ -448,7 +448,7 @@ type arrObj = Obj[] }, "end": { "line": 0, - "character": 33 + "character": 25 } } } diff --git a/tests/baselines/reference/arrayObjectAlias.tree b/tests/baselines/reference/arrayObjectAlias.tree index 896a70a..da2d469 100644 --- a/tests/baselines/reference/arrayObjectAlias.tree +++ b/tests/baselines/reference/arrayObjectAlias.tree @@ -21,7 +21,7 @@ type Obj = { a: string, b: number } }, "end": { "line": 0, - "character": 23 + "character": 14 } } } @@ -47,7 +47,7 @@ type Obj = { a: string, b: number } }, "end": { "line": 0, - "character": 33 + "character": 25 } } } @@ -68,11 +68,11 @@ type Obj = { a: string, b: number } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 35 + "character": 8 } } } @@ -101,7 +101,7 @@ type Obj = { a: string, b: number } }, "end": { "line": 0, - "character": 23 + "character": 14 } } } @@ -128,7 +128,7 @@ type Obj = { a: string, b: number } }, "end": { "line": 0, - "character": 33 + "character": 25 } } } @@ -161,7 +161,7 @@ type arrObj = Obj[] }, "end": { "line": 0, - "character": 23 + "character": 14 } } } @@ -187,7 +187,7 @@ type arrObj = Obj[] }, "end": { "line": 0, - "character": 33 + "character": 25 } } } @@ -230,11 +230,11 @@ type arrObj = Obj[] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 35 + "character": 8 } } } @@ -253,11 +253,11 @@ type arrObj = Obj[] "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 19 + "character": 11 } } } @@ -288,7 +288,7 @@ type arrObj = Obj[] }, "end": { "line": 0, - "character": 23 + "character": 14 } } } @@ -314,7 +314,7 @@ type arrObj = Obj[] }, "end": { "line": 0, - "character": 33 + "character": 25 } } } @@ -335,11 +335,11 @@ type arrObj = Obj[] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 35 + "character": 8 } } } diff --git a/tests/baselines/reference/class.localized.tree b/tests/baselines/reference/class.localized.tree index 7f8eee9..9163bbf 100644 --- a/tests/baselines/reference/class.localized.tree +++ b/tests/baselines/reference/class.localized.tree @@ -14,11 +14,11 @@ interface TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -30,11 +30,11 @@ interface TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -56,7 +56,7 @@ interface TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -72,7 +72,7 @@ interface TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -110,7 +110,7 @@ interface TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -126,7 +126,7 @@ interface TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -163,11 +163,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -179,11 +179,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -203,11 +203,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -219,11 +219,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -245,7 +245,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -261,7 +261,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -320,7 +320,7 @@ class TestClass implements TestInterface { }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -336,7 +336,7 @@ class TestClass implements TestInterface { }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -362,8 +362,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -378,8 +378,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -406,11 +406,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -422,11 +422,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -446,11 +446,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -462,11 +462,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -488,7 +488,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -504,7 +504,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -563,7 +563,7 @@ class TestClass implements TestInterface { }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -579,7 +579,7 @@ class TestClass implements TestInterface { }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -605,8 +605,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -621,8 +621,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -652,11 +652,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -668,11 +668,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -694,7 +694,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -710,7 +710,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -748,11 +748,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -764,11 +764,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -788,11 +788,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -804,11 +804,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -830,7 +830,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -846,7 +846,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -905,7 +905,7 @@ class TestClass implements TestInterface { }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -921,7 +921,7 @@ class TestClass implements TestInterface { }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -947,8 +947,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -963,8 +963,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -998,7 +998,7 @@ class TestClass implements TestInterface { }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -1014,7 +1014,7 @@ class TestClass implements TestInterface { }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -1040,8 +1040,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -1056,8 +1056,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -1094,7 +1094,7 @@ const _a = new TestClass("param") }, "end": { "line": 12, - "character": 33 + "character": 8 } } } @@ -1110,7 +1110,7 @@ const _a = new TestClass("param") }, "end": { "line": 12, - "character": 33 + "character": 8 } } } @@ -1128,11 +1128,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -1145,11 +1145,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -1169,11 +1169,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -1185,11 +1185,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -1211,7 +1211,7 @@ const _a = new TestClass("param") }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -1227,7 +1227,7 @@ const _a = new TestClass("param") }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -1286,7 +1286,7 @@ const _a = new TestClass("param") }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -1302,7 +1302,7 @@ const _a = new TestClass("param") }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -1328,8 +1328,8 @@ const _a = new TestClass("param") "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -1344,8 +1344,8 @@ const _a = new TestClass("param") "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -1378,11 +1378,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -1394,11 +1394,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -1421,7 +1421,7 @@ const _a = new TestClass("param") }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -1437,7 +1437,7 @@ const _a = new TestClass("param") }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -1457,11 +1457,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -1474,11 +1474,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -1498,11 +1498,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -1514,11 +1514,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -1540,7 +1540,7 @@ const _a = new TestClass("param") }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -1556,7 +1556,7 @@ const _a = new TestClass("param") }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -1619,8 +1619,8 @@ const _a = new TestClass("param") "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -1635,8 +1635,8 @@ const _a = new TestClass("param") "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } diff --git a/tests/baselines/reference/class.tree b/tests/baselines/reference/class.tree index 4877954..7ae634a 100644 --- a/tests/baselines/reference/class.tree +++ b/tests/baselines/reference/class.tree @@ -25,7 +25,7 @@ interface TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -55,7 +55,7 @@ interface TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -77,11 +77,11 @@ interface TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -111,7 +111,7 @@ interface TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -141,7 +141,7 @@ interface TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -179,8 +179,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -209,8 +209,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -243,7 +243,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -272,7 +272,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -294,11 +294,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -350,7 +350,7 @@ class TestClass implements TestInterface { }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -372,11 +372,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -393,11 +393,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -427,8 +427,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -457,8 +457,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -491,7 +491,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -520,7 +520,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -542,11 +542,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -598,7 +598,7 @@ class TestClass implements TestInterface { }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -620,11 +620,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -641,11 +641,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -680,7 +680,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -710,7 +710,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -732,11 +732,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -772,8 +772,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -802,8 +802,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -836,7 +836,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -865,7 +865,7 @@ class TestClass implements TestInterface { }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -887,11 +887,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -943,7 +943,7 @@ class TestClass implements TestInterface { }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -965,11 +965,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -986,11 +986,11 @@ class TestClass implements TestInterface { "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -1018,7 +1018,7 @@ class TestClass implements TestInterface { }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -1048,8 +1048,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -1078,8 +1078,8 @@ class TestClass implements TestInterface { "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -1114,8 +1114,8 @@ const _a = new TestClass("param") "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -1144,8 +1144,8 @@ const _a = new TestClass("param") "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -1175,8 +1175,8 @@ const _a = new TestClass("param") "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -1209,7 +1209,7 @@ const _a = new TestClass("param") }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -1238,7 +1238,7 @@ const _a = new TestClass("param") }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -1260,11 +1260,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -1316,7 +1316,7 @@ const _a = new TestClass("param") }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -1338,11 +1338,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -1359,11 +1359,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -1386,7 +1386,7 @@ const _a = new TestClass("param") }, "end": { "line": 12, - "character": 33 + "character": 8 } } } @@ -1440,7 +1440,7 @@ const _a = new TestClass("param") }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -1471,8 +1471,8 @@ const _a = new TestClass("param") "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -1501,8 +1501,8 @@ const _a = new TestClass("param") "character": 4 }, "end": { - "line": 9, - "character": 5 + "line": 7, + "character": 12 } } } @@ -1535,7 +1535,7 @@ const _a = new TestClass("param") }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -1564,7 +1564,7 @@ const _a = new TestClass("param") }, "end": { "line": 1, - "character": 22 + "character": 12 } } } @@ -1586,11 +1586,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 0, - "character": 0 + "character": 10 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 23 } } } @@ -1641,7 +1641,7 @@ const _a = new TestClass("param") }, "end": { "line": 5, - "character": 29 + "character": 21 } } } @@ -1663,11 +1663,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -1684,11 +1684,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } @@ -1709,11 +1709,11 @@ const _a = new TestClass("param") "range": { "start": { "line": 4, - "character": 0 + "character": 6 }, "end": { - "line": 10, - "character": 1 + "line": 4, + "character": 15 } } } diff --git a/tests/baselines/reference/classGeneric.localized.tree b/tests/baselines/reference/classGeneric.localized.tree index aae8fc3..9c579ae 100644 --- a/tests/baselines/reference/classGeneric.localized.tree +++ b/tests/baselines/reference/classGeneric.localized.tree @@ -13,11 +13,11 @@ class TestBaseClass { } "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -29,11 +29,11 @@ class TestBaseClass { } "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -61,11 +61,11 @@ class TestBaseClass { } "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -77,11 +77,11 @@ class TestBaseClass { } "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -122,11 +122,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -138,11 +138,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -205,11 +205,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -222,11 +222,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -287,7 +287,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -303,7 +303,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -327,7 +327,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -343,7 +343,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -390,8 +390,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -406,8 +406,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -430,7 +430,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -446,7 +446,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -475,11 +475,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -491,11 +491,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -558,11 +558,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -575,11 +575,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -640,7 +640,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -656,7 +656,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -680,7 +680,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -696,7 +696,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -743,8 +743,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -759,8 +759,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -783,7 +783,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -799,7 +799,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -874,11 +874,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -890,11 +890,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -935,11 +935,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -951,11 +951,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -1018,11 +1018,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -1035,11 +1035,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -1100,7 +1100,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -1116,7 +1116,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -1140,7 +1140,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -1156,7 +1156,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -1203,8 +1203,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -1219,8 +1219,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -1243,7 +1243,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -1259,7 +1259,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -1295,7 +1295,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -1311,7 +1311,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -1336,7 +1336,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -1352,7 +1352,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -1393,11 +1393,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -1409,11 +1409,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -1448,7 +1448,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 7, - "character": 23 + "character": 9 } } } @@ -1464,7 +1464,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 7, - "character": 23 + "character": 9 } } } @@ -1491,7 +1491,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 8, - "character": 24 + "character": 10 } } } @@ -1507,7 +1507,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 8, - "character": 24 + "character": 10 } } } @@ -1533,8 +1533,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -1549,8 +1549,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -1573,7 +1573,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -1589,7 +1589,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -1627,7 +1627,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -1643,7 +1643,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -1712,7 +1712,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 15, - "character": 42 + "character": 8 } } } @@ -1728,7 +1728,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 15, - "character": 42 + "character": 8 } } } @@ -1746,11 +1746,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -1763,11 +1763,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -1839,11 +1839,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -1856,11 +1856,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -1921,7 +1921,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -1937,7 +1937,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -1961,7 +1961,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -1977,7 +1977,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -2020,8 +2020,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -2036,8 +2036,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -2060,7 +2060,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -2076,7 +2076,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -2111,7 +2111,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 7, - "character": 23 + "character": 9 } } } @@ -2127,7 +2127,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 7, - "character": 23 + "character": 9 } } } @@ -2153,7 +2153,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 8, - "character": 24 + "character": 10 } } } @@ -2169,7 +2169,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 8, - "character": 24 + "character": 10 } } } @@ -2192,8 +2192,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -2208,8 +2208,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -2239,11 +2239,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -2255,11 +2255,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -2336,7 +2336,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -2352,7 +2352,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -2376,7 +2376,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -2392,7 +2392,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -2422,11 +2422,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -2439,11 +2439,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -2469,11 +2469,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -2486,11 +2486,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -2516,11 +2516,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -2533,11 +2533,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -2611,8 +2611,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -2627,8 +2627,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -2651,7 +2651,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -2667,7 +2667,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -2702,7 +2702,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 7, - "character": 23 + "character": 9 } } } @@ -2718,7 +2718,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 7, - "character": 23 + "character": 9 } } } @@ -2744,7 +2744,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 8, - "character": 24 + "character": 10 } } } @@ -2760,7 +2760,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 8, - "character": 24 + "character": 10 } } } @@ -2783,8 +2783,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -2799,8 +2799,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } diff --git a/tests/baselines/reference/classGeneric.tree b/tests/baselines/reference/classGeneric.tree index 984f555..d0c5faa 100644 --- a/tests/baselines/reference/classGeneric.tree +++ b/tests/baselines/reference/classGeneric.tree @@ -20,11 +20,11 @@ class TestBaseClass { } "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -41,11 +41,11 @@ class TestBaseClass { } "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -73,11 +73,11 @@ class TestBaseClass { } "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -94,11 +94,11 @@ class TestBaseClass { } "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -141,7 +141,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 7, - "character": 23 + "character": 9 } } } @@ -167,7 +167,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 8, - "character": 24 + "character": 10 } } } @@ -194,8 +194,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -241,7 +241,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -271,8 +271,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -301,11 +301,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -322,11 +322,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -378,7 +378,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -414,7 +414,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -464,11 +464,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -485,11 +485,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -547,7 +547,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 7, - "character": 23 + "character": 9 } } } @@ -573,7 +573,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 8, - "character": 24 + "character": 10 } } } @@ -600,8 +600,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -647,7 +647,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -677,8 +677,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -707,11 +707,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -728,11 +728,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -784,7 +784,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -820,7 +820,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -870,11 +870,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -891,11 +891,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -983,11 +983,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -1004,11 +1004,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -1051,7 +1051,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 7, - "character": 23 + "character": 9 } } } @@ -1077,7 +1077,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 8, - "character": 24 + "character": 10 } } } @@ -1104,8 +1104,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -1151,7 +1151,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -1181,8 +1181,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -1211,11 +1211,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -1232,11 +1232,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -1288,7 +1288,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -1324,7 +1324,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -1374,11 +1374,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -1395,11 +1395,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -1455,7 +1455,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -1493,7 +1493,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -1527,11 +1527,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -1548,11 +1548,11 @@ class TestClass extends TestBaseClass { "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -1580,7 +1580,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 7, - "character": 23 + "character": 9 } } } @@ -1608,7 +1608,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 8, - "character": 24 + "character": 10 } } } @@ -1638,8 +1638,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -1685,7 +1685,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -1716,8 +1716,8 @@ class TestClass extends TestBaseClass { "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -1766,7 +1766,7 @@ class TestClass extends TestBaseClass { }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -1828,7 +1828,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 7, - "character": 23 + "character": 9 } } } @@ -1855,7 +1855,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 8, - "character": 24 + "character": 10 } } } @@ -1882,8 +1882,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -1908,7 +1908,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -1938,8 +1938,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -1970,7 +1970,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 7, - "character": 23 + "character": 9 } } } @@ -1996,7 +1996,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 8, - "character": 24 + "character": 10 } } } @@ -2023,8 +2023,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -2070,7 +2070,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -2100,8 +2100,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -2130,11 +2130,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -2151,11 +2151,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -2207,7 +2207,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -2243,7 +2243,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -2293,11 +2293,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -2314,11 +2314,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -2369,7 +2369,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 15, - "character": 42 + "character": 8 } } } @@ -2429,7 +2429,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -2466,7 +2466,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -2497,7 +2497,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 7, - "character": 23 + "character": 9 } } } @@ -2524,7 +2524,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 8, - "character": 24 + "character": 10 } } } @@ -2551,8 +2551,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -2576,7 +2576,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -2606,8 +2606,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -2638,7 +2638,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 7, - "character": 23 + "character": 9 } } } @@ -2664,7 +2664,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 8, - "character": 24 + "character": 10 } } } @@ -2691,8 +2691,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -2738,7 +2738,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 10, - "character": 21 + "character": 18 } } } @@ -2768,8 +2768,8 @@ const _a = new TestClass(false, 4) "character": 4 }, "end": { - "line": 12, - "character": 5 + "line": 10, + "character": 12 } } } @@ -2798,11 +2798,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -2819,11 +2819,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 0, - "character": 0 + "character": 6 }, "end": { "line": 0, - "character": 23 + "character": 19 } } } @@ -2874,7 +2874,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 3, - "character": 30 + "character": 21 } } } @@ -2899,7 +2899,7 @@ const _a = new TestClass(false, 4) }, "end": { "line": 3, - "character": 52 + "character": 37 } } } @@ -2949,11 +2949,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -2970,11 +2970,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -3021,11 +3021,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } @@ -3108,11 +3108,11 @@ const _a = new TestClass(false, 4) "range": { "start": { "line": 2, - "character": 0 + "character": 6 }, "end": { - "line": 13, - "character": 1 + "line": 2, + "character": 15 } } } diff --git a/tests/baselines/reference/conditional.localized.tree b/tests/baselines/reference/conditional.localized.tree index 14cb734..05234aa 100644 --- a/tests/baselines/reference/conditional.localized.tree +++ b/tests/baselines/reference/conditional.localized.tree @@ -12,11 +12,11 @@ type Conditional = T extends string ? "a" : "b" "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 50 + "character": 16 } } } @@ -28,11 +28,11 @@ type Conditional = T extends string ? "a" : "b" "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 50 + "character": 16 } } } diff --git a/tests/baselines/reference/conditional.tree b/tests/baselines/reference/conditional.tree index d1d2b2a..bbe6bf7 100644 --- a/tests/baselines/reference/conditional.tree +++ b/tests/baselines/reference/conditional.tree @@ -53,11 +53,11 @@ type Conditional = T extends string ? "a" : "b" "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 50 + "character": 16 } } } diff --git a/tests/baselines/reference/enum.localized.tree b/tests/baselines/reference/enum.localized.tree index f9b8b9a..4989c8d 100644 --- a/tests/baselines/reference/enum.localized.tree +++ b/tests/baselines/reference/enum.localized.tree @@ -12,11 +12,11 @@ enum Test { A, B, C } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 21 + "character": 9 } } } @@ -28,11 +28,11 @@ enum Test { A, B, C } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 21 + "character": 9 } } } diff --git a/tests/baselines/reference/enum.tree b/tests/baselines/reference/enum.tree index a61a1d8..88c0921 100644 --- a/tests/baselines/reference/enum.tree +++ b/tests/baselines/reference/enum.tree @@ -38,11 +38,11 @@ enum Test { A, B, C } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 21 + "character": 9 } } } @@ -106,11 +106,11 @@ enum Test { A, B, C } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 21 + "character": 9 } } } @@ -174,11 +174,11 @@ enum Test { A, B, C } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 21 + "character": 9 } } } @@ -219,11 +219,11 @@ enum Test { A, B, C } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 21 + "character": 9 } } } @@ -268,11 +268,11 @@ enum Test { A, B, C } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 21 + "character": 9 } } } @@ -337,11 +337,11 @@ enum Test { A, B, C } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 21 + "character": 9 } } } @@ -406,11 +406,11 @@ enum Test { A, B, C } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 21 + "character": 9 } } } diff --git a/tests/baselines/reference/function.localized.tree b/tests/baselines/reference/function.localized.tree index 2d852b3..67e3768 100644 --- a/tests/baselines/reference/function.localized.tree +++ b/tests/baselines/reference/function.localized.tree @@ -14,11 +14,11 @@ function func(a: string, b?: number) { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -30,11 +30,11 @@ function func(a: string, b?: number) { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -57,7 +57,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 23 + "character": 15 } } } @@ -73,7 +73,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 23 + "character": 15 } } } @@ -98,7 +98,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 35 + "character": 26 } } } @@ -115,7 +115,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 35 + "character": 26 } } } @@ -145,11 +145,11 @@ function func(a: string, b?: number) { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -161,11 +161,11 @@ function func(a: string, b?: number) { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -188,7 +188,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 23 + "character": 15 } } } @@ -204,7 +204,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 23 + "character": 15 } } } @@ -229,7 +229,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 35 + "character": 26 } } } @@ -246,7 +246,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 35 + "character": 26 } } } @@ -284,7 +284,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 23 + "character": 15 } } } @@ -300,7 +300,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 23 + "character": 15 } } } @@ -326,7 +326,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 35 + "character": 26 } } } @@ -343,7 +343,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 35 + "character": 26 } } } diff --git a/tests/baselines/reference/function.tree b/tests/baselines/reference/function.tree index cd08eec..b4d6af3 100644 --- a/tests/baselines/reference/function.tree +++ b/tests/baselines/reference/function.tree @@ -17,11 +17,11 @@ function func(a: string, b?: number) { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -46,7 +46,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 23 + "character": 15 } } } @@ -73,7 +73,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 35 + "character": 26 } } } @@ -100,11 +100,11 @@ function func(a: string, b?: number) { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -127,11 +127,11 @@ function func(a: string, b?: number) { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -156,7 +156,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 23 + "character": 15 } } } @@ -183,7 +183,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 35 + "character": 26 } } } @@ -210,11 +210,11 @@ function func(a: string, b?: number) { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -242,7 +242,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 23 + "character": 15 } } } @@ -270,7 +270,7 @@ function func(a: string, b?: number) { }, "end": { "line": 0, - "character": 35 + "character": 26 } } } diff --git a/tests/baselines/reference/functionGeneric.localized.tree b/tests/baselines/reference/functionGeneric.localized.tree index 834775c..bb0f1b0 100644 --- a/tests/baselines/reference/functionGeneric.localized.tree +++ b/tests/baselines/reference/functionGeneric.localized.tree @@ -14,11 +14,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -30,11 +30,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -58,7 +58,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -74,7 +74,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -110,7 +110,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 38 + "character": 35 } } } @@ -126,7 +126,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 38 + "character": 35 } } } @@ -151,11 +151,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } @@ -169,11 +169,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } @@ -198,11 +198,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -214,11 +214,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -242,7 +242,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -258,7 +258,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -294,7 +294,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 38 + "character": 35 } } } @@ -310,7 +310,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 38 + "character": 35 } } } @@ -335,11 +335,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } @@ -353,11 +353,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } @@ -388,7 +388,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -404,7 +404,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -440,7 +440,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 38 + "character": 35 } } } @@ -456,7 +456,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 38 + "character": 35 } } } @@ -489,7 +489,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -505,7 +505,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -536,11 +536,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } @@ -554,11 +554,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } @@ -589,7 +589,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 38 + "character": 35 } } } @@ -605,7 +605,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 38 + "character": 35 } } } @@ -635,11 +635,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } @@ -653,11 +653,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } @@ -679,11 +679,11 @@ sig1("asd", 3, 4) "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -695,11 +695,11 @@ sig1("asd", 3, 4) "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -723,7 +723,7 @@ sig1("asd", 3, 4) }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -739,7 +739,7 @@ sig1("asd", 3, 4) }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -781,11 +781,11 @@ sig1("asd", 3, 4) "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } @@ -799,11 +799,11 @@ sig1("asd", 3, 4) "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } diff --git a/tests/baselines/reference/functionGeneric.tree b/tests/baselines/reference/functionGeneric.tree index e637f87..27fa43f 100644 --- a/tests/baselines/reference/functionGeneric.tree +++ b/tests/baselines/reference/functionGeneric.tree @@ -17,11 +17,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -50,7 +50,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -71,7 +71,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 38 + "character": 35 } } } @@ -98,11 +98,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } @@ -137,7 +137,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -159,11 +159,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -187,7 +187,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -213,11 +213,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -246,7 +246,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -267,7 +267,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 38 + "character": 35 } } } @@ -294,11 +294,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } @@ -333,7 +333,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -355,11 +355,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -383,7 +383,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -418,7 +418,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -450,7 +450,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -471,7 +471,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 38 + "character": 35 } } } @@ -502,7 +502,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -530,11 +530,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } @@ -570,7 +570,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -591,7 +591,7 @@ function sig1(arg: T, ...arg2: any[]): string { }, "end": { "line": 0, - "character": 38 + "character": 35 } } } @@ -618,11 +618,11 @@ function sig1(arg: T, ...arg2: any[]): string { "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } @@ -648,11 +648,11 @@ sig1("asd", 3, 4) "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -677,7 +677,7 @@ sig1("asd", 3, 4) }, "end": { "line": 0, - "character": 38 + "character": 35 } } } @@ -704,11 +704,11 @@ sig1("asd", 3, 4) "range": { "start": { "line": 0, - "character": 40 + "character": 43 }, "end": { "line": 0, - "character": 54 + "character": 47 } } } @@ -744,7 +744,7 @@ sig1("asd", 3, 4) }, "end": { "line": 0, - "character": 30 + "character": 15 } } } @@ -766,11 +766,11 @@ sig1("asd", 3, 4) "range": { "start": { "line": 0, - "character": 0 + "character": 9 }, "end": { - "line": 2, - "character": 1 + "line": 0, + "character": 13 } } } @@ -794,7 +794,7 @@ sig1("asd", 3, 4) }, "end": { "line": 0, - "character": 30 + "character": 15 } } } diff --git a/tests/baselines/reference/genericTypeDef.localized.tree b/tests/baselines/reference/genericTypeDef.localized.tree index fc9f5bf..07667d7 100644 --- a/tests/baselines/reference/genericTypeDef.localized.tree +++ b/tests/baselines/reference/genericTypeDef.localized.tree @@ -13,11 +13,11 @@ type TypeWithGenerics = T "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 31 + "character": 21 } } } @@ -29,11 +29,11 @@ type TypeWithGenerics = T "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 31 + "character": 21 } } } @@ -260,11 +260,11 @@ type InstantiatedGeneric = TypeWithGenerics "range": { "start": { "line": 2, - "character": 0 + "character": 5 }, "end": { "line": 2, - "character": 56 + "character": 24 } } } @@ -276,11 +276,11 @@ type InstantiatedGeneric = TypeWithGenerics "range": { "start": { "line": 2, - "character": 0 + "character": 5 }, "end": { "line": 2, - "character": 56 + "character": 24 } } } @@ -387,11 +387,11 @@ type InstantiatedGeneric = TypeWithGenerics "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 31 + "character": 21 } } } @@ -403,11 +403,11 @@ type InstantiatedGeneric = TypeWithGenerics "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 31 + "character": 21 } } } diff --git a/tests/baselines/reference/genericTypeDef.tree b/tests/baselines/reference/genericTypeDef.tree index f64f7b6..32de1b8 100644 --- a/tests/baselines/reference/genericTypeDef.tree +++ b/tests/baselines/reference/genericTypeDef.tree @@ -34,11 +34,11 @@ type TypeWithGenerics = T "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 31 + "character": 21 } } } @@ -213,11 +213,11 @@ type InstantiatedGeneric = TypeWithGenerics "range": { "start": { "line": 2, - "character": 0 + "character": 5 }, "end": { "line": 2, - "character": 56 + "character": 24 } } } @@ -314,11 +314,11 @@ type InstantiatedGeneric = TypeWithGenerics "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 31 + "character": 21 } } } diff --git a/tests/baselines/reference/indexedAccess.localized.tree b/tests/baselines/reference/indexedAccess.localized.tree index 2ede3c9..c805f71 100644 --- a/tests/baselines/reference/indexedAccess.localized.tree +++ b/tests/baselines/reference/indexedAccess.localized.tree @@ -12,11 +12,11 @@ type IndexedAccess = P[T] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 47 + "character": 18 } } } @@ -28,11 +28,11 @@ type IndexedAccess = P[T] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 47 + "character": 18 } } } @@ -95,7 +95,7 @@ type IndexedAccess = P[T] }, "end": { "line": 0, - "character": 39 + "character": 23 } } } @@ -111,7 +111,7 @@ type IndexedAccess = P[T] }, "end": { "line": 0, - "character": 39 + "character": 23 } } } @@ -217,7 +217,7 @@ type IndexedAccess = P[T] }, "end": { "line": 0, - "character": 39 + "character": 23 } } } @@ -233,7 +233,7 @@ type IndexedAccess = P[T] }, "end": { "line": 0, - "character": 39 + "character": 23 } } } @@ -369,7 +369,7 @@ type IndexedAccess = P[T] }, "end": { "line": 0, - "character": 39 + "character": 23 } } } @@ -385,7 +385,7 @@ type IndexedAccess = P[T] }, "end": { "line": 0, - "character": 39 + "character": 23 } } } diff --git a/tests/baselines/reference/indexedAccess.tree b/tests/baselines/reference/indexedAccess.tree index 2e13a5f..743edc4 100644 --- a/tests/baselines/reference/indexedAccess.tree +++ b/tests/baselines/reference/indexedAccess.tree @@ -40,7 +40,7 @@ type IndexedAccess = P[T] }, "end": { "line": 0, - "character": 39 + "character": 23 } } } @@ -84,11 +84,11 @@ type IndexedAccess = P[T] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 47 + "character": 18 } } } @@ -137,7 +137,7 @@ type IndexedAccess = P[T] }, "end": { "line": 0, - "character": 39 + "character": 23 } } } @@ -214,7 +214,7 @@ type IndexedAccess = P[T] }, "end": { "line": 0, - "character": 39 + "character": 23 } } } @@ -315,7 +315,7 @@ type IndexedAccess = P[T] }, "end": { "line": 0, - "character": 39 + "character": 23 } } } diff --git a/tests/baselines/reference/keyof.localized.tree b/tests/baselines/reference/keyof.localized.tree index 392924f..d01b823 100644 --- a/tests/baselines/reference/keyof.localized.tree +++ b/tests/baselines/reference/keyof.localized.tree @@ -12,11 +12,11 @@ type KeyOf = keyof T "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 23 + "character": 10 } } } @@ -28,11 +28,11 @@ type KeyOf = keyof T "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 23 + "character": 10 } } } diff --git a/tests/baselines/reference/keyof.tree b/tests/baselines/reference/keyof.tree index 9af0386..345232d 100644 --- a/tests/baselines/reference/keyof.tree +++ b/tests/baselines/reference/keyof.tree @@ -38,11 +38,11 @@ type KeyOf = keyof T "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 23 + "character": 10 } } } diff --git a/tests/baselines/reference/lambda.localized.tree b/tests/baselines/reference/lambda.localized.tree index 82a349e..3b0ba93 100644 --- a/tests/baselines/reference/lambda.localized.tree +++ b/tests/baselines/reference/lambda.localized.tree @@ -12,11 +12,11 @@ type f = (arg1: string, arg2: boolean) => void "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 46 + "character": 6 } } } @@ -28,11 +28,11 @@ type f = (arg1: string, arg2: boolean) => void "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 46 + "character": 6 } } } @@ -55,7 +55,7 @@ type f = (arg1: string, arg2: boolean) => void }, "end": { "line": 0, - "character": 22 + "character": 14 } } } @@ -71,7 +71,7 @@ type f = (arg1: string, arg2: boolean) => void }, "end": { "line": 0, - "character": 22 + "character": 14 } } } @@ -96,7 +96,7 @@ type f = (arg1: string, arg2: boolean) => void }, "end": { "line": 0, - "character": 37 + "character": 28 } } } @@ -112,7 +112,7 @@ type f = (arg1: string, arg2: boolean) => void }, "end": { "line": 0, - "character": 37 + "character": 28 } } } @@ -151,7 +151,7 @@ type f = (arg1: string, arg2: boolean) => void }, "end": { "line": 0, - "character": 22 + "character": 14 } } } @@ -167,7 +167,7 @@ type f = (arg1: string, arg2: boolean) => void }, "end": { "line": 0, - "character": 22 + "character": 14 } } } @@ -193,7 +193,7 @@ type f = (arg1: string, arg2: boolean) => void }, "end": { "line": 0, - "character": 37 + "character": 28 } } } @@ -209,7 +209,7 @@ type f = (arg1: string, arg2: boolean) => void }, "end": { "line": 0, - "character": 37 + "character": 28 } } } @@ -270,11 +270,11 @@ type t = { a: string } | f "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 26 + "character": 6 } } } @@ -286,11 +286,11 @@ type t = { a: string } | f "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 26 + "character": 6 } } } @@ -325,11 +325,11 @@ type t = { a: string } | f "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 46 + "character": 6 } } } @@ -352,7 +352,7 @@ type t = { a: string } | f }, "end": { "line": 0, - "character": 22 + "character": 14 } } } @@ -368,7 +368,7 @@ type t = { a: string } | f }, "end": { "line": 0, - "character": 22 + "character": 14 } } } @@ -393,7 +393,7 @@ type t = { a: string } | f }, "end": { "line": 0, - "character": 37 + "character": 28 } } } @@ -409,7 +409,7 @@ type t = { a: string } | f }, "end": { "line": 0, - "character": 37 + "character": 28 } } } @@ -483,7 +483,7 @@ type t = { a: string } | f }, "end": { "line": 1, - "character": 20 + "character": 12 } } } @@ -499,7 +499,7 @@ type t = { a: string } | f }, "end": { "line": 1, - "character": 20 + "character": 12 } } } @@ -535,7 +535,7 @@ type t = { a: string } | f }, "end": { "line": 1, - "character": 20 + "character": 12 } } } @@ -551,7 +551,7 @@ type t = { a: string } | f }, "end": { "line": 1, - "character": 20 + "character": 12 } } } @@ -571,11 +571,11 @@ type t = { a: string } | f "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 46 + "character": 6 } } } @@ -587,11 +587,11 @@ type t = { a: string } | f "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 46 + "character": 6 } } } @@ -614,7 +614,7 @@ type t = { a: string } | f }, "end": { "line": 0, - "character": 22 + "character": 14 } } } @@ -630,7 +630,7 @@ type t = { a: string } | f }, "end": { "line": 0, - "character": 22 + "character": 14 } } } @@ -655,7 +655,7 @@ type t = { a: string } | f }, "end": { "line": 0, - "character": 37 + "character": 28 } } } @@ -671,7 +671,7 @@ type t = { a: string } | f }, "end": { "line": 0, - "character": 37 + "character": 28 } } } diff --git a/tests/baselines/reference/lambda.tree b/tests/baselines/reference/lambda.tree index 60094d9..bd5ccdf 100644 --- a/tests/baselines/reference/lambda.tree +++ b/tests/baselines/reference/lambda.tree @@ -44,7 +44,7 @@ type f = (arg1: string, arg2: boolean) => void }, "end": { "line": 0, - "character": 22 + "character": 14 } } } @@ -70,7 +70,7 @@ type f = (arg1: string, arg2: boolean) => void }, "end": { "line": 0, - "character": 37 + "character": 28 } } } @@ -97,11 +97,11 @@ type f = (arg1: string, arg2: boolean) => void "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 46 + "character": 6 } } } @@ -130,7 +130,7 @@ type f = (arg1: string, arg2: boolean) => void }, "end": { "line": 0, - "character": 22 + "character": 14 } } } @@ -157,7 +157,7 @@ type f = (arg1: string, arg2: boolean) => void }, "end": { "line": 0, - "character": 37 + "character": 28 } } } @@ -240,7 +240,7 @@ type t = { a: string } | f }, "end": { "line": 0, - "character": 22 + "character": 14 } } } @@ -266,7 +266,7 @@ type t = { a: string } | f }, "end": { "line": 0, - "character": 37 + "character": 28 } } } @@ -315,11 +315,11 @@ type t = { a: string } | f "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 46 + "character": 6 } } } @@ -348,7 +348,7 @@ type t = { a: string } | f }, "end": { "line": 1, - "character": 20 + "character": 12 } } } @@ -394,11 +394,11 @@ type t = { a: string } | f "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 26 + "character": 6 } } } @@ -429,7 +429,7 @@ type t = { a: string } | f }, "end": { "line": 1, - "character": 20 + "character": 12 } } } @@ -482,7 +482,7 @@ type t = { a: string } | f }, "end": { "line": 0, - "character": 22 + "character": 14 } } } @@ -508,7 +508,7 @@ type t = { a: string } | f }, "end": { "line": 0, - "character": 37 + "character": 28 } } } @@ -535,11 +535,11 @@ type t = { a: string } | f "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 46 + "character": 6 } } } diff --git a/tests/baselines/reference/mapped.localized.tree b/tests/baselines/reference/mapped.localized.tree index 93d7d40..beeb7dd 100644 --- a/tests/baselines/reference/mapped.localized.tree +++ b/tests/baselines/reference/mapped.localized.tree @@ -12,11 +12,11 @@ type mapped = { [index: string]: number } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 41 + "character": 11 } } } @@ -28,11 +28,11 @@ type mapped = { [index: string]: number } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 41 + "character": 11 } } } @@ -54,7 +54,7 @@ type mapped = { [index: string]: number } }, "end": { "line": 0, - "character": 30 + "character": 22 } } } @@ -107,7 +107,7 @@ type mapped = { [index: string]: number } }, "end": { "line": 0, - "character": 30 + "character": 22 } } } @@ -123,7 +123,7 @@ type mapped = { [index: string]: number } }, "end": { "line": 0, - "character": 30 + "character": 22 } } } diff --git a/tests/baselines/reference/mapped.tree b/tests/baselines/reference/mapped.tree index fb17651..a9caf89 100644 --- a/tests/baselines/reference/mapped.tree +++ b/tests/baselines/reference/mapped.tree @@ -30,7 +30,7 @@ type mapped = { [index: string]: number } }, "end": { "line": 0, - "character": 30 + "character": 22 } } } @@ -53,11 +53,11 @@ type mapped = { [index: string]: number } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 41 + "character": 11 } } } @@ -88,7 +88,7 @@ type mapped = { [index: string]: number } }, "end": { "line": 0, - "character": 30 + "character": 22 } } } diff --git a/tests/baselines/reference/mappedParam.localized.tree b/tests/baselines/reference/mappedParam.localized.tree index 5e193d2..48e551f 100644 --- a/tests/baselines/reference/mappedParam.localized.tree +++ b/tests/baselines/reference/mappedParam.localized.tree @@ -12,11 +12,11 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 43 + "character": 16 } } } @@ -28,11 +28,11 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 43 + "character": 16 } } } @@ -53,7 +53,7 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} }, "end": { "line": 0, - "character": 38 + "character": 23 } } } @@ -75,7 +75,7 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} }, "end": { "line": 0, - "character": 38 + "character": 23 } } } @@ -92,7 +92,7 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} }, "end": { "line": 0, - "character": 38 + "character": 23 } } } @@ -164,7 +164,7 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} }, "end": { "line": 0, - "character": 38 + "character": 23 } } } @@ -180,7 +180,7 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} }, "end": { "line": 0, - "character": 38 + "character": 23 } } } @@ -231,7 +231,7 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} }, "end": { "line": 0, - "character": 38 + "character": 23 } } } @@ -247,7 +247,7 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} }, "end": { "line": 0, - "character": 38 + "character": 23 } } } diff --git a/tests/baselines/reference/mappedParam.tree b/tests/baselines/reference/mappedParam.tree index 07e665d..4d00388 100644 --- a/tests/baselines/reference/mappedParam.tree +++ b/tests/baselines/reference/mappedParam.tree @@ -72,7 +72,7 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} }, "end": { "line": 0, - "character": 38 + "character": 23 } } } @@ -95,7 +95,7 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} }, "end": { "line": 0, - "character": 38 + "character": 23 } } } @@ -118,7 +118,7 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} }, "end": { "line": 0, - "character": 38 + "character": 23 } } } @@ -139,11 +139,11 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 43 + "character": 16 } } } @@ -191,7 +191,7 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} }, "end": { "line": 0, - "character": 38 + "character": 23 } } } @@ -238,7 +238,7 @@ type mappedType2 = { [P in 'a'|'b'|'c']: P} }, "end": { "line": 0, - "character": 38 + "character": 23 } } } diff --git a/tests/baselines/reference/partial.localized.tree b/tests/baselines/reference/partial.localized.tree index be81344..18c39c5 100644 --- a/tests/baselines/reference/partial.localized.tree +++ b/tests/baselines/reference/partial.localized.tree @@ -12,11 +12,11 @@ type partialUnion = Partial<{a: string}|{b: string}> "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 52 + "character": 17 } } } @@ -28,11 +28,11 @@ type partialUnion = Partial<{a: string}|{b: string}> "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 52 + "character": 17 } } } @@ -67,11 +67,11 @@ type partialUnion = Partial<{a: string}|{b: string}> "range": { "start": { "line": 1548, - "character": 0 + "character": 5 }, "end": { - "line": 1550, - "character": 2 + "line": 1548, + "character": 12 } } } @@ -94,7 +94,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 38 + "character": 30 } } } @@ -111,7 +111,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 38 + "character": 30 } } } @@ -151,11 +151,11 @@ type partialUnion = Partial<{a: string}|{b: string}> "range": { "start": { "line": 1548, - "character": 0 + "character": 5 }, "end": { - "line": 1550, - "character": 2 + "line": 1548, + "character": 12 } } } @@ -182,11 +182,11 @@ type partialUnion = Partial<{a: string}|{b: string}> "range": { "start": { "line": 1548, - "character": 0 + "character": 5 }, "end": { - "line": 1550, - "character": 2 + "line": 1548, + "character": 12 } } } @@ -198,11 +198,11 @@ type partialUnion = Partial<{a: string}|{b: string}> "range": { "start": { "line": 1548, - "character": 0 + "character": 5 }, "end": { - "line": 1550, - "character": 2 + "line": 1548, + "character": 12 } } } @@ -308,7 +308,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 38 + "character": 30 } } } @@ -324,7 +324,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 38 + "character": 30 } } } @@ -390,7 +390,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 50 + "character": 42 } } } @@ -406,7 +406,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 50 + "character": 42 } } } @@ -440,7 +440,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 1549, - "character": 17 + "character": 6 } } } @@ -462,7 +462,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 1549, - "character": 17 + "character": 6 } } } @@ -479,7 +479,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 1549, - "character": 17 + "character": 6 } } } @@ -570,7 +570,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 38 + "character": 30 } } } @@ -586,7 +586,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 38 + "character": 30 } } } @@ -614,7 +614,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 50 + "character": 42 } } } @@ -630,7 +630,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 50 + "character": 42 } } } diff --git a/tests/baselines/reference/partial.tree b/tests/baselines/reference/partial.tree index 37b95af..2da7efd 100644 --- a/tests/baselines/reference/partial.tree +++ b/tests/baselines/reference/partial.tree @@ -24,7 +24,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 38 + "character": 30 } } } @@ -67,11 +67,11 @@ type partialUnion = Partial<{a: string}|{b: string}> "range": { "start": { "line": 1548, - "character": 0 + "character": 5 }, "end": { - "line": 1550, - "character": 2 + "line": 1548, + "character": 12 } } } @@ -99,7 +99,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 50 + "character": 42 } } } @@ -142,11 +142,11 @@ type partialUnion = Partial<{a: string}|{b: string}> "range": { "start": { "line": 1548, - "character": 0 + "character": 5 }, "end": { - "line": 1550, - "character": 2 + "line": 1548, + "character": 12 } } } @@ -166,11 +166,11 @@ type partialUnion = Partial<{a: string}|{b: string}> "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 52 + "character": 17 } } } @@ -253,7 +253,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 1549, - "character": 17 + "character": 6 } } } @@ -303,7 +303,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 1549, - "character": 17 + "character": 6 } } } @@ -326,7 +326,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 1549, - "character": 17 + "character": 6 } } } @@ -347,11 +347,11 @@ type partialUnion = Partial<{a: string}|{b: string}> "range": { "start": { "line": 1548, - "character": 0 + "character": 5 }, "end": { - "line": 1550, - "character": 2 + "line": 1548, + "character": 12 } } } @@ -409,7 +409,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 38 + "character": 30 } } } @@ -464,7 +464,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 50 + "character": 42 } } } @@ -528,7 +528,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 38 + "character": 30 } } } @@ -557,7 +557,7 @@ type partialUnion = Partial<{a: string}|{b: string}> }, "end": { "line": 0, - "character": 50 + "character": 42 } } } diff --git a/tests/baselines/reference/pick.localized.tree b/tests/baselines/reference/pick.localized.tree index b6d6933..6ced906 100644 --- a/tests/baselines/reference/pick.localized.tree +++ b/tests/baselines/reference/pick.localized.tree @@ -12,11 +12,11 @@ type t = { a: "b", c: "d", d: { a: "b" } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 42 + "character": 6 } } } @@ -28,11 +28,11 @@ type t = { a: "b", c: "d", d: { a: "b" } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 42 + "character": 6 } } } @@ -54,7 +54,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -70,7 +70,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -94,7 +94,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 26 + "character": 20 } } } @@ -110,7 +110,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 26 + "character": 20 } } } @@ -134,7 +134,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -150,7 +150,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -172,7 +172,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -188,7 +188,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -221,7 +221,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -237,7 +237,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -262,7 +262,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 26 + "character": 20 } } } @@ -278,7 +278,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 26 + "character": 20 } } } @@ -303,7 +303,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -319,7 +319,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -341,7 +341,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -357,7 +357,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -387,7 +387,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -403,7 +403,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -424,11 +424,11 @@ type p = Pick & {b: "asd", d: { b: "c" }} "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 53 + "character": 6 } } } @@ -440,11 +440,11 @@ type p = Pick & {b: "asd", d: { b: "c" }} "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 53 + "character": 6 } } } @@ -466,7 +466,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } }, @@ -479,7 +479,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 52 + "character": 40 } } } @@ -495,7 +495,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } }, @@ -508,7 +508,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 52 + "character": 40 } } } @@ -530,7 +530,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -546,7 +546,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -570,7 +570,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -586,7 +586,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -613,7 +613,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -629,7 +629,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -653,7 +653,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 38 + "character": 30 } } } @@ -669,7 +669,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 38 + "character": 30 } } } @@ -694,11 +694,11 @@ type p = Pick & {b: "asd", d: { b: "c" }} "range": { "start": { "line": 1569, - "character": 0 + "character": 5 }, "end": { - "line": 1571, - "character": 2 + "line": 1569, + "character": 9 } } } @@ -710,11 +710,11 @@ type p = Pick & {b: "asd", d: { b: "c" }} "range": { "start": { "line": 1569, - "character": 0 + "character": 5 }, "end": { - "line": 1571, - "character": 2 + "line": 1569, + "character": 9 } } } @@ -790,11 +790,11 @@ type p = Pick & {b: "asd", d: { b: "c" }} "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 42 + "character": 6 } } } @@ -816,7 +816,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -832,7 +832,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -856,7 +856,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 26 + "character": 20 } } } @@ -872,7 +872,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 26 + "character": 20 } } } @@ -896,7 +896,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -912,7 +912,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -934,7 +934,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -950,7 +950,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -982,7 +982,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1569, - "character": 30 + "character": 14 } } } @@ -998,7 +998,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1569, - "character": 30 + "character": 14 } } } @@ -1073,7 +1073,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1570, - "character": 11 + "character": 6 } } } @@ -1095,7 +1095,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1570, - "character": 11 + "character": 6 } } } @@ -1112,7 +1112,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1570, - "character": 11 + "character": 6 } } } @@ -1159,11 +1159,11 @@ type p = Pick & {b: "asd", d: { b: "c" }} "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 42 + "character": 6 } } } @@ -1175,11 +1175,11 @@ type p = Pick & {b: "asd", d: { b: "c" }} "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 42 + "character": 6 } } } @@ -1201,7 +1201,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -1217,7 +1217,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -1241,7 +1241,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 26 + "character": 20 } } } @@ -1257,7 +1257,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 26 + "character": 20 } } } @@ -1281,7 +1281,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -1297,7 +1297,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -1319,7 +1319,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -1335,7 +1335,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -1368,7 +1368,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 38 + "character": 30 } } } @@ -1384,7 +1384,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 38 + "character": 30 } } } @@ -1409,7 +1409,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 52 + "character": 40 } } } @@ -1425,7 +1425,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 52 + "character": 40 } } } @@ -1447,7 +1447,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -1463,7 +1463,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -1493,7 +1493,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -1509,7 +1509,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -1538,7 +1538,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 58 + "character": 11 } } } @@ -1550,11 +1550,11 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 53 + "character": 6 } } } @@ -1576,7 +1576,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } }, @@ -1589,7 +1589,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 52 + "character": 40 } } } @@ -1605,7 +1605,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } }, @@ -1618,7 +1618,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 52 + "character": 40 } } } @@ -1640,7 +1640,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -1656,7 +1656,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -1680,7 +1680,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -1696,7 +1696,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -1723,7 +1723,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -1739,7 +1739,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -1763,7 +1763,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 38 + "character": 30 } } } @@ -1779,7 +1779,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 38 + "character": 30 } } } @@ -1802,11 +1802,11 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 53 + "character": 6 } } } @@ -1818,11 +1818,11 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 53 + "character": 6 } } } @@ -1844,7 +1844,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } }, @@ -1857,7 +1857,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 52 + "character": 40 } } } @@ -1873,7 +1873,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } }, @@ -1886,7 +1886,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 52 + "character": 40 } } } @@ -1908,7 +1908,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -1924,7 +1924,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -1948,7 +1948,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -1964,7 +1964,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -1991,7 +1991,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -2007,7 +2007,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -2031,7 +2031,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 38 + "character": 30 } } } @@ -2047,7 +2047,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 38 + "character": 30 } } } @@ -2077,7 +2077,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 24 + "character": 19 } } } @@ -2093,7 +2093,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 24 + "character": 19 } } } @@ -2118,7 +2118,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 34 + "character": 27 } } } @@ -2134,7 +2134,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 34 + "character": 27 } } } @@ -2159,7 +2159,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 57 + "character": 37 } } } @@ -2175,7 +2175,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 57 + "character": 37 } } } @@ -2197,7 +2197,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 47 + "character": 42 } } } @@ -2213,7 +2213,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 47 + "character": 42 } } } @@ -2237,7 +2237,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 55 + "character": 50 } } } @@ -2253,7 +2253,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 55 + "character": 50 } } } @@ -2283,7 +2283,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 47 + "character": 42 } } } @@ -2299,7 +2299,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 47 + "character": 42 } } } @@ -2324,7 +2324,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 55 + "character": 50 } } } @@ -2340,7 +2340,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 55 + "character": 50 } } } diff --git a/tests/baselines/reference/pick.tree b/tests/baselines/reference/pick.tree index 305af8a..ac66cdd 100644 --- a/tests/baselines/reference/pick.tree +++ b/tests/baselines/reference/pick.tree @@ -21,7 +21,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -47,7 +47,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 26 + "character": 20 } } } @@ -76,7 +76,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -101,7 +101,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -122,11 +122,11 @@ type t = { a: "b", c: "d", d: { a: "b" } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 42 + "character": 6 } } } @@ -155,7 +155,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -182,7 +182,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 26 + "character": 20 } } } @@ -212,7 +212,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -237,7 +237,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -266,7 +266,7 @@ type t = { a: "b", c: "d", d: { a: "b" } } }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -300,7 +300,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -326,7 +326,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -350,7 +350,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -365,7 +365,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 52 + "character": 40 } } } @@ -391,7 +391,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -417,7 +417,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 38 + "character": 30 } } } @@ -437,11 +437,11 @@ type p = Pick & {b: "asd", d: { b: "c" }} "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 53 + "character": 6 } } } @@ -495,7 +495,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1569, - "character": 30 + "character": 14 } } } @@ -526,7 +526,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1570, - "character": 11 + "character": 6 } } } @@ -576,7 +576,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1570, - "character": 11 + "character": 6 } } } @@ -599,7 +599,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1570, - "character": 11 + "character": 6 } } } @@ -620,11 +620,11 @@ type p = Pick & {b: "asd", d: { b: "c" }} "range": { "start": { "line": 1569, - "character": 0 + "character": 5 }, "end": { - "line": 1571, - "character": 2 + "line": 1569, + "character": 9 } } } @@ -673,7 +673,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1569, - "character": 30 + "character": 14 } } } @@ -704,7 +704,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -730,7 +730,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 26 + "character": 20 } } } @@ -759,7 +759,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -784,7 +784,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -827,11 +827,11 @@ type p = Pick & {b: "asd", d: { b: "c" }} "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 42 + "character": 6 } } } @@ -881,7 +881,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -907,7 +907,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 26 + "character": 20 } } } @@ -936,7 +936,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -961,7 +961,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -982,11 +982,11 @@ type p = Pick & {b: "asd", d: { b: "c" }} "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 42 + "character": 6 } } } @@ -1015,7 +1015,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 38 + "character": 30 } } } @@ -1045,7 +1045,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -1070,7 +1070,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 52 + "character": 40 } } } @@ -1099,7 +1099,7 @@ type p = Pick & {b: "asd", d: { b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -1136,7 +1136,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -1162,7 +1162,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -1186,7 +1186,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -1201,7 +1201,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 52 + "character": 40 } } } @@ -1227,7 +1227,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -1253,7 +1253,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 38 + "character": 30 } } } @@ -1277,7 +1277,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 58 + "character": 11 } } } @@ -1294,11 +1294,11 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 53 + "character": 6 } } } @@ -1331,7 +1331,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 38 + "character": 33 } } } @@ -1357,7 +1357,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 50 + "character": 45 } } } @@ -1381,7 +1381,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 40 + "character": 28 } } } @@ -1396,7 +1396,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 52 + "character": 40 } } } @@ -1422,7 +1422,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 0, - "character": 18 + "character": 12 } } } @@ -1448,7 +1448,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 1, - "character": 38 + "character": 30 } } } @@ -1468,11 +1468,11 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 53 + "character": 6 } } } @@ -1501,7 +1501,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 24 + "character": 19 } } } @@ -1528,7 +1528,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 34 + "character": 27 } } } @@ -1558,7 +1558,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 47 + "character": 42 } } } @@ -1584,7 +1584,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 55 + "character": 50 } } } @@ -1609,7 +1609,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 57 + "character": 37 } } } @@ -1638,7 +1638,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 47 + "character": 42 } } } @@ -1665,7 +1665,7 @@ const test3: p = {a: "b", b: "asd", d: { a: "b", b: "c" }} }, "end": { "line": 3, - "character": 55 + "character": 50 } } } diff --git a/tests/baselines/reference/recursive.localized.tree b/tests/baselines/reference/recursive.localized.tree index 3cd78cd..41cef7b 100644 --- a/tests/baselines/reference/recursive.localized.tree +++ b/tests/baselines/reference/recursive.localized.tree @@ -12,11 +12,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } @@ -28,11 +28,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } @@ -54,7 +54,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -70,7 +70,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -93,7 +93,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 36 + "character": 25 } } } @@ -105,11 +105,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } @@ -146,7 +146,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -162,7 +162,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -185,7 +185,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 36 + "character": 25 } } } @@ -197,11 +197,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } @@ -236,7 +236,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 36 + "character": 25 } } } @@ -248,11 +248,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } @@ -274,7 +274,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -290,7 +290,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -317,11 +317,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } @@ -333,11 +333,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } @@ -359,7 +359,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -375,7 +375,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -398,7 +398,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 36 + "character": 25 } } } @@ -410,11 +410,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } diff --git a/tests/baselines/reference/recursive.tree b/tests/baselines/reference/recursive.tree index 435e9ee..f19be5c 100644 --- a/tests/baselines/reference/recursive.tree +++ b/tests/baselines/reference/recursive.tree @@ -26,7 +26,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -51,7 +51,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 36 + "character": 25 } } } @@ -68,11 +68,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } @@ -97,7 +97,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -118,11 +118,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } @@ -156,7 +156,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -181,7 +181,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 36 + "character": 25 } } } @@ -198,11 +198,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } @@ -227,7 +227,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -261,7 +261,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 36 + "character": 25 } } } @@ -278,11 +278,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } @@ -307,7 +307,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -332,7 +332,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 36 + "character": 25 } } } @@ -349,11 +349,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } @@ -388,7 +388,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -413,7 +413,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 36 + "character": 25 } } } @@ -430,11 +430,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } @@ -459,7 +459,7 @@ type Recursive = { a: { b: Recursive } } }, "end": { "line": 0, - "character": 38 + "character": 20 } } } @@ -480,11 +480,11 @@ type Recursive = { a: { b: Recursive } } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 40 + "character": 14 } } } diff --git a/tests/baselines/reference/tuple.localized.tree b/tests/baselines/reference/tuple.localized.tree index 6c9a7c0..81fa3d8 100644 --- a/tests/baselines/reference/tuple.localized.tree +++ b/tests/baselines/reference/tuple.localized.tree @@ -12,11 +12,11 @@ type tupleOfStuff = ["a", string, number] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 41 + "character": 17 } } } @@ -28,11 +28,11 @@ type tupleOfStuff = ["a", string, number] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 41 + "character": 17 } } } diff --git a/tests/baselines/reference/tuple.tree b/tests/baselines/reference/tuple.tree index 40cb48b..b32c429 100644 --- a/tests/baselines/reference/tuple.tree +++ b/tests/baselines/reference/tuple.tree @@ -30,11 +30,11 @@ type tupleOfStuff = ["a", string, number] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 41 + "character": 17 } } } diff --git a/tests/baselines/reference/tupleNamed.localized.tree b/tests/baselines/reference/tupleNamed.localized.tree index d008d88..6093d8b 100644 --- a/tests/baselines/reference/tupleNamed.localized.tree +++ b/tests/baselines/reference/tupleNamed.localized.tree @@ -12,11 +12,11 @@ type namedTuple = [param: "a", param2: string, param3: number] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 62 + "character": 15 } } } @@ -28,11 +28,11 @@ type namedTuple = [param: "a", param2: string, param3: number] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 62 + "character": 15 } } } diff --git a/tests/baselines/reference/tupleNamed.tree b/tests/baselines/reference/tupleNamed.tree index 551b80d..ab181e0 100644 --- a/tests/baselines/reference/tupleNamed.tree +++ b/tests/baselines/reference/tupleNamed.tree @@ -35,11 +35,11 @@ type namedTuple = [param: "a", param2: string, param3: number] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 62 + "character": 15 } } } diff --git a/tests/baselines/reference/tupleObjectAlias.localized.tree b/tests/baselines/reference/tupleObjectAlias.localized.tree index 34e6d12..cc94a6e 100644 --- a/tests/baselines/reference/tupleObjectAlias.localized.tree +++ b/tests/baselines/reference/tupleObjectAlias.localized.tree @@ -12,11 +12,11 @@ type Obj2 = { a: string, b: number } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 36 + "character": 9 } } } @@ -28,11 +28,11 @@ type Obj2 = { a: string, b: number } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 36 + "character": 9 } } } @@ -55,7 +55,7 @@ type Obj2 = { a: string, b: number } }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -71,7 +71,7 @@ type Obj2 = { a: string, b: number } }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -96,7 +96,7 @@ type Obj2 = { a: string, b: number } }, "end": { "line": 0, - "character": 34 + "character": 26 } } } @@ -112,7 +112,7 @@ type Obj2 = { a: string, b: number } }, "end": { "line": 0, - "character": 34 + "character": 26 } } } @@ -143,7 +143,7 @@ type Obj2 = { a: string, b: number } }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -159,7 +159,7 @@ type Obj2 = { a: string, b: number } }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -185,7 +185,7 @@ type Obj2 = { a: string, b: number } }, "end": { "line": 0, - "character": 34 + "character": 26 } } } @@ -201,7 +201,7 @@ type Obj2 = { a: string, b: number } }, "end": { "line": 0, - "character": 34 + "character": 26 } } } @@ -222,11 +222,11 @@ type tupleObj = [Obj2, Obj2] "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 28 + "character": 13 } } } @@ -238,11 +238,11 @@ type tupleObj = [Obj2, Obj2] "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 28 + "character": 13 } } } @@ -277,11 +277,11 @@ type tupleObj = [Obj2, Obj2] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 36 + "character": 9 } } } @@ -304,7 +304,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -320,7 +320,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -345,7 +345,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 34 + "character": 26 } } } @@ -361,7 +361,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 34 + "character": 26 } } } @@ -392,11 +392,11 @@ type tupleObj = [Obj2, Obj2] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 36 + "character": 9 } } } @@ -408,11 +408,11 @@ type tupleObj = [Obj2, Obj2] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 36 + "character": 9 } } } @@ -435,7 +435,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -451,7 +451,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -476,7 +476,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 34 + "character": 26 } } } @@ -492,7 +492,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 34 + "character": 26 } } } @@ -515,11 +515,11 @@ type tupleObj = [Obj2, Obj2] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 36 + "character": 9 } } } @@ -531,11 +531,11 @@ type tupleObj = [Obj2, Obj2] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 36 + "character": 9 } } } @@ -558,7 +558,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -574,7 +574,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -599,7 +599,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 34 + "character": 26 } } } @@ -615,7 +615,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 34 + "character": 26 } } } diff --git a/tests/baselines/reference/tupleObjectAlias.tree b/tests/baselines/reference/tupleObjectAlias.tree index 2842527..58ede5c 100644 --- a/tests/baselines/reference/tupleObjectAlias.tree +++ b/tests/baselines/reference/tupleObjectAlias.tree @@ -21,7 +21,7 @@ type Obj2 = { a: string, b: number } }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -47,7 +47,7 @@ type Obj2 = { a: string, b: number } }, "end": { "line": 0, - "character": 34 + "character": 26 } } } @@ -68,11 +68,11 @@ type Obj2 = { a: string, b: number } "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 36 + "character": 9 } } } @@ -101,7 +101,7 @@ type Obj2 = { a: string, b: number } }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -128,7 +128,7 @@ type Obj2 = { a: string, b: number } }, "end": { "line": 0, - "character": 34 + "character": 26 } } } @@ -162,7 +162,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -188,7 +188,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 34 + "character": 26 } } } @@ -231,11 +231,11 @@ type tupleObj = [Obj2, Obj2] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 36 + "character": 9 } } } @@ -278,11 +278,11 @@ type tupleObj = [Obj2, Obj2] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 36 + "character": 9 } } } @@ -302,11 +302,11 @@ type tupleObj = [Obj2, Obj2] "range": { "start": { "line": 1, - "character": 0 + "character": 5 }, "end": { "line": 1, - "character": 28 + "character": 13 } } } @@ -338,7 +338,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -364,7 +364,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 34 + "character": 26 } } } @@ -385,11 +385,11 @@ type tupleObj = [Obj2, Obj2] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 36 + "character": 9 } } } @@ -419,7 +419,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 24 + "character": 15 } } } @@ -445,7 +445,7 @@ type tupleObj = [Obj2, Obj2] }, "end": { "line": 0, - "character": 34 + "character": 26 } } } @@ -466,11 +466,11 @@ type tupleObj = [Obj2, Obj2] "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 36 + "character": 9 } } } diff --git a/tests/baselines/reference/uppercase.localized.tree b/tests/baselines/reference/uppercase.localized.tree index b915148..79d6efa 100644 --- a/tests/baselines/reference/uppercase.localized.tree +++ b/tests/baselines/reference/uppercase.localized.tree @@ -12,11 +12,11 @@ type U = Uppercase "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 39 + "character": 6 } } } @@ -28,11 +28,11 @@ type U = Uppercase "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 39 + "character": 6 } } } @@ -56,7 +56,7 @@ type U = Uppercase }, "end": { "line": 0, - "character": 23 + "character": 8 } } } @@ -72,7 +72,7 @@ type U = Uppercase }, "end": { "line": 0, - "character": 23 + "character": 8 } } } @@ -114,7 +114,7 @@ type U = Uppercase }, "end": { "line": 0, - "character": 23 + "character": 8 } } } @@ -130,7 +130,7 @@ type U = Uppercase }, "end": { "line": 0, - "character": 23 + "character": 8 } } } @@ -159,11 +159,11 @@ type U = Uppercase "range": { "start": { "line": 1623, - "character": 0 + "character": 5 }, "end": { "line": 1623, - "character": 45 + "character": 14 } } } @@ -175,11 +175,11 @@ type U = Uppercase "range": { "start": { "line": 1623, - "character": 0 + "character": 5 }, "end": { "line": 1623, - "character": 45 + "character": 14 } } } @@ -203,7 +203,7 @@ type U = Uppercase }, "end": { "line": 1623, - "character": 31 + "character": 16 } } } @@ -219,7 +219,7 @@ type U = Uppercase }, "end": { "line": 1623, - "character": 31 + "character": 16 } } } @@ -240,7 +240,7 @@ type U = Uppercase }, "end": { "line": 0, - "character": 23 + "character": 8 } } } @@ -257,7 +257,7 @@ type U = Uppercase }, "end": { "line": 0, - "character": 23 + "character": 8 } } } @@ -302,7 +302,7 @@ type U = Uppercase }, "end": { "line": 0, - "character": 23 + "character": 8 } } } @@ -318,7 +318,7 @@ type U = Uppercase }, "end": { "line": 0, - "character": 23 + "character": 8 } } } diff --git a/tests/baselines/reference/uppercase.tree b/tests/baselines/reference/uppercase.tree index 6e526c3..946a9eb 100644 --- a/tests/baselines/reference/uppercase.tree +++ b/tests/baselines/reference/uppercase.tree @@ -13,11 +13,11 @@ type U = Uppercase "range": { "start": { "line": 1623, - "character": 0 + "character": 5 }, "end": { "line": 1623, - "character": 45 + "character": 14 } } } @@ -45,7 +45,7 @@ type U = Uppercase }, "end": { "line": 0, - "character": 23 + "character": 8 } } } @@ -64,11 +64,11 @@ type U = Uppercase "range": { "start": { "line": 0, - "character": 0 + "character": 5 }, "end": { "line": 0, - "character": 39 + "character": 6 } } } @@ -92,7 +92,7 @@ type U = Uppercase }, "end": { "line": 0, - "character": 23 + "character": 8 } } } @@ -127,7 +127,7 @@ type U = Uppercase }, "end": { "line": 0, - "character": 23 + "character": 8 } } } @@ -149,11 +149,11 @@ type U = Uppercase "range": { "start": { "line": 1623, - "character": 0 + "character": 5 }, "end": { "line": 1623, - "character": 45 + "character": 14 } } } @@ -182,7 +182,7 @@ type U = Uppercase }, "end": { "line": 1623, - "character": 31 + "character": 16 } } } @@ -213,7 +213,7 @@ type U = Uppercase }, "end": { "line": 0, - "character": 23 + "character": 8 } } } @@ -248,7 +248,7 @@ type U = Uppercase }, "end": { "line": 0, - "character": 23 + "character": 8 } } }