Fix inner vs outer typeAnnotation ranges

Author: JamesHenry

lib/convert.js

@@ -518,7 +518,7 @@ module.exports = function convert(config) {
 
         }
 
-        case SyntaxKind.VariableDeclaration:
+        case SyntaxKind.VariableDeclaration: {
             Object.assign(result, {
                 type: AST_NODE_TYPES.VariableDeclarator,
                 id: convertChild(node.name),
@@ -528,8 +528,17 @@ module.exports = function convert(config) {
             if (node.type) {
                 result.id.typeAnnotation = convertTypeAnnotation(node.type);
                 result.id.range[1] = node.type.getEnd();
+
+                const identifierEnd = node.name.getEnd();
+                const numCharsBetweenTypeAndIdentifier = node.type.getStart() - (node.type.getFullStart() - identifierEnd - ":".length) - identifierEnd;
+
+                result.id.typeAnnotation.range = [
+                    result.id.typeAnnotation.range[0] - numCharsBetweenTypeAndIdentifier,
+                    result.id.typeAnnotation.range[1]
+                ];
             }
             break;
+        }
 
         case SyntaxKind.VariableStatement:
             Object.assign(result, {

tests/fixtures/typescript/basics/variable-declaration-type-annotation-spacing.src.ts

@@ -0,0 +1 @@
+let x   :      string;

tests/lib/__snapshots__/typescript.js.snap

@@ -15050,7 +15050,7 @@ Object {
                 },
               },
               "range": Array [
-                17,
+                15,
                 44,
               ],
               "type": "TypeAnnotation",
@@ -15694,7 +15694,7 @@ Object {
                 },
               },
               "range": Array [
-                7,
+                5,
                 11,
               ],
               "type": "TypeAnnotation",
@@ -15784,7 +15784,7 @@ Object {
                 },
               },
               "range": Array [
-                20,
+                18,
                 29,
               ],
               "type": "TypeAnnotation",
@@ -17345,7 +17345,7 @@ Object {
                 },
               },
               "range": Array [
-                9,
+                7,
                 14,
               ],
               "type": "TypeAnnotation",
@@ -17546,7 +17546,7 @@ Object {
                 },
               },
               "range": Array [
-                9,
+                8,
                 15,
               ],
               "type": "TypeAnnotation",
@@ -17654,7 +17654,7 @@ Object {
                 },
               },
               "range": Array [
-                39,
+                37,
                 45,
               ],
               "type": "TypeAnnotation",
@@ -17750,6 +17750,119 @@ Object {
 }
 `;
 
+exports[`typescript fixtures/basics/variable-declaration-type-annotation-spacing.src 1`] = `
+Object {
+  "body": Array [
+    Object {
+      "declarations": Array [
+        Object {
+          "id": Object {
+            "loc": Object {
+              "end": Object {
+                "column": 5,
+                "line": 1,
+              },
+              "start": Object {
+                "column": 4,
+                "line": 1,
+              },
+            },
+            "name": "x",
+            "range": Array [
+              4,
+              21,
+            ],
+            "type": "Identifier",
+            "typeAnnotation": Object {
+              "loc": Object {
+                "end": Object {
+                  "column": 21,
+                  "line": 1,
+                },
+                "start": Object {
+                  "column": 15,
+                  "line": 1,
+                },
+              },
+              "range": Array [
+                8,
+                21,
+              ],
+              "type": "TypeAnnotation",
+              "typeAnnotation": Object {
+                "loc": Object {
+                  "end": Object {
+                    "column": 21,
+                    "line": 1,
+                  },
+                  "start": Object {
+                    "column": 15,
+                    "line": 1,
+                  },
+                },
+                "range": Array [
+                  15,
+                  21,
+                ],
+                "type": "TSStringKeyword",
+              },
+            },
+          },
+          "init": null,
+          "loc": Object {
+            "end": Object {
+              "column": 21,
+              "line": 1,
+            },
+            "start": Object {
+              "column": 4,
+              "line": 1,
+            },
+          },
+          "range": Array [
+            4,
+            21,
+          ],
+          "type": "VariableDeclarator",
+        },
+      ],
+      "kind": "let",
+      "loc": Object {
+        "end": Object {
+          "column": 22,
+          "line": 1,
+        },
+        "start": Object {
+          "column": 0,
+          "line": 1,
+        },
+      },
+      "range": Array [
+        0,
+        22,
+      ],
+      "type": "VariableDeclaration",
+    },
+  ],
+  "loc": Object {
+    "end": Object {
+      "column": 22,
+      "line": 1,
+    },
+    "start": Object {
+      "column": 0,
+      "line": 1,
+    },
+  },
+  "range": Array [
+    0,
+    22,
+  ],
+  "sourceType": "script",
+  "type": "Program",
+}
+`;
+
 exports[`typescript fixtures/decorators/accessor-decorators/accessor-decorator-factory-instance-member.src 1`] = `
 Object {
   "body": Array [