fix: wrong token when using lang=ts (#504)

sveltejs · Apr 9, 2024 · 44c1704 · 44c1704
1 parent b9f00bc
commit 44c1704
Show file tree

Hide file tree

Showing 14 changed files with 1,984 additions and 570 deletions.
diff --git a/.changeset/violet-rockets-relax.md b/.changeset/violet-rockets-relax.md
@@ -0,0 +1,5 @@
+---
+"svelte-eslint-parser": patch
+---
+
+fix: wrong token when using `lang=ts`
diff --git a/src/context/script-let.ts b/src/context/script-let.ts
@@ -178,6 +178,10 @@ export class ScriptLetContext {
           callback(node as E, result);
         }
 
+        tokens.shift(); // (
+        tokens.pop(); // )
+        tokens.pop(); // ;
+
         if (isTS) {
           for (const scope of extractTypeNodeScopes(
             tsAs!.typeAnnotation,
@@ -201,10 +205,6 @@ export class ScriptLetContext {
 
         (node as any).parent = parent;
 
-        tokens.shift(); // (
-        tokens.pop(); // )
-        tokens.pop(); // ;
-
         // Disconnect the tree structure.
         exprSt.expression = null as never;
       },

diff --git a/tests/fixtures/parser/ast/svelte5/docs/runes/11-1-$inspect-ts-output.json b/tests/fixtures/parser/ast/svelte5/docs/runes/11-1-$inspect-ts-output.json
@@ -1656,87 +1656,15 @@
     },
     {
       "type": "Identifier",
-      "value": "c",
+      "value": "count",
       "range": [
         194,
-        195
-      ],
-      "loc": {
-        "start": {
-          "line": 8,
-          "column": 24
-        },
-        "end": {
-          "line": 8,
-          "column": 25
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "o",
-      "range": [
-        195,
-        196
-      ],
-      "loc": {
-        "start": {
-          "line": 8,
-          "column": 25
-        },
-        "end": {
-          "line": 8,
-          "column": 26
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "u",
-      "range": [
-        196,
-        197
-      ],
-      "loc": {
-        "start": {
-          "line": 8,
-          "column": 26
-        },
-        "end": {
-          "line": 8,
-          "column": 27
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "n",
-      "range": [
-        197,
-        198
-      ],
-      "loc": {
-        "start": {
-          "line": 8,
-          "column": 27
-        },
-        "end": {
-          "line": 8,
-          "column": 28
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "t",
-      "range": [
-        198,
         199
       ],
       "loc": {
         "start": {
           "line": 8,
-          "column": 28
+          "column": 24
         },
         "end": {
           "line": 8,
@@ -1746,33 +1674,15 @@
     },
     {
       "type": "Punctuator",
-      "value": "+",
+      "value": "++",
       "range": [
         199,
-        200
-      ],
-      "loc": {
-        "start": {
-          "line": 8,
-          "column": 29
-        },
-        "end": {
-          "line": 8,
-          "column": 30
-        }
-      }
-    },
-    {
-      "type": "Punctuator",
-      "value": "+",
-      "range": [
-        200,
         201
       ],
       "loc": {
         "start": {
           "line": 8,
-          "column": 30
+          "column": 29
         },
         "end": {
           "line": 8,

diff --git a/tests/fixtures/parser/ast/svelte5/docs/runes/11-2-$inspect-ts-output.json b/tests/fixtures/parser/ast/svelte5/docs/runes/11-2-$inspect-ts-output.json
@@ -1837,87 +1837,15 @@
     },
     {
       "type": "Identifier",
-      "value": "c",
+      "value": "count",
       "range": [
         223,
-        224
-      ],
-      "loc": {
-        "start": {
-          "line": 11,
-          "column": 24
-        },
-        "end": {
-          "line": 11,
-          "column": 25
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "o",
-      "range": [
-        224,
-        225
-      ],
-      "loc": {
-        "start": {
-          "line": 11,
-          "column": 25
-        },
-        "end": {
-          "line": 11,
-          "column": 26
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "u",
-      "range": [
-        225,
-        226
-      ],
-      "loc": {
-        "start": {
-          "line": 11,
-          "column": 26
-        },
-        "end": {
-          "line": 11,
-          "column": 27
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "n",
-      "range": [
-        226,
-        227
-      ],
-      "loc": {
-        "start": {
-          "line": 11,
-          "column": 27
-        },
-        "end": {
-          "line": 11,
-          "column": 28
-        }
-      }
-    },
-    {
-      "type": "Identifier",
-      "value": "t",
-      "range": [
-        227,
         228
       ],
       "loc": {
         "start": {
           "line": 11,
-          "column": 28
+          "column": 24
         },
         "end": {
           "line": 11,
@@ -1927,33 +1855,15 @@
     },
     {
       "type": "Punctuator",
-      "value": "+",
+      "value": "++",
       "range": [
         228,
-        229
-      ],
-      "loc": {
-        "start": {
-          "line": 11,
-          "column": 29
-        },
-        "end": {
-          "line": 11,
-          "column": 30
-        }
-      }
-    },
-    {
-      "type": "Punctuator",
-      "value": "+",
-      "range": [
-        229,
         230
       ],
       "loc": {
         "start": {
           "line": 11,
-          "column": 30
+          "column": 29
         },
         "end": {
           "line": 11,

diff --git a/tests/fixtures/parser/ast/svelte5/ts-$derived-by01-output.json b/tests/fixtures/parser/ast/svelte5/ts-$derived-by01-output.json
@@ -2745,7 +2745,7 @@
       }
     },
     {
-      "type": "Identifier",
+      "type": "Numeric",
       "value": "1",
       "range": [
         241,