fix: virtual references remained

Author: ota-meshi

src/context/script-let.ts

@@ -155,11 +155,6 @@ export class ScriptLetContext {
         for (const callback of callbacks) {
           callback(node as E, result);
         }
-        (node as any).parent = parent;
-
-        tokens.shift(); // (
-        tokens.pop(); // )
-        tokens.pop(); // ;
 
         if (isTS) {
           removeScope(
@@ -184,6 +179,12 @@ export class ScriptLetContext {
           );
         }
 
+        (node as any).parent = parent;
+
+        tokens.shift(); // (
+        tokens.pop(); // )
+        tokens.pop(); // ;
+
         // Disconnect the tree structure.
         exprSt.expression = null as never;
       }
@@ -242,7 +243,6 @@ export class ScriptLetContext {
         for (const callback of callbacks) {
           callback(node, result);
         }
-        (node as any).parent = parent;
 
         const scope = result.getScope(decl);
         for (const variable of scope.variables) {
@@ -253,6 +253,8 @@ export class ScriptLetContext {
           }
         }
 
+        (node as any).parent = parent;
+
         tokens.shift(); // const
         tokens.pop(); // ;
 
@@ -340,11 +342,6 @@ export class ScriptLetContext {
 
         // Process for nodes
         callback(expr, ctx, idx);
-        (expr as any).parent = eachBlock;
-        (ctx as any).parent = eachBlock;
-        if (idx) {
-          (idx as any).parent = eachBlock;
-        }
 
         // Process for scope
         result.registerNodeToScope(eachBlock, scope);
@@ -365,6 +362,12 @@ export class ScriptLetContext {
           removeReference(ref, scope.upper!);
         }
 
+        (expr as any).parent = eachBlock;
+        (ctx as any).parent = eachBlock;
+        if (idx) {
+          (idx as any).parent = eachBlock;
+        }
+
         tokens.shift(); // Array
         tokens.shift(); // .
         tokens.shift(); // from
@@ -502,7 +505,7 @@ export class ScriptLetContext {
           range,
         });
         if (this.ctx.isTypeScript()) {
-          source += ` : (${arrayTypings[index]})`;
+          source += `: (${arrayTypings[index]})`;
         }
       }
       const restore = this.appendScript(
@@ -641,6 +644,7 @@ export class ScriptLetContext {
     const comments = result.ast.comments;
     const processedComments = [];
     const nodeToScope = getNodeToScope(result.scopeManager!);
+    const postprocessList: (() => void)[] = [];
 
     let tok;
     while ((tok = tokens.shift())) {
@@ -749,6 +753,7 @@ export class ScriptLetContext {
 
     result.ast.tokens = processedTokens;
     result.ast.comments = processedComments;
+    postprocessList.forEach((p) => p());
 
     // Helpers
     /** Get scope */
@@ -763,7 +768,12 @@ export class ScriptLetContext {
 
     /** Register node to scope */
     function registerNodeToScope(node: any, scope: Scope): void {
-      scope.block = node;
+      // If we replace the `scope.block` at this time,
+      // the scope restore calculation will not work, so we will replace the `scope.block` later.
+      postprocessList.push(() => {
+        scope.block = node;
+      });
+
       const scopes = nodeToScope.get(node);
       if (scopes) {
         scopes.push(scope);

src/scope/index.ts

@@ -418,3 +418,51 @@ export function addAllReferences(
     (a, b) => a.identifier.range![0] - b.identifier.range![0]
   );
 }
+
+/**
+ * Simplify scope data.
+ * @deprecated For Debug
+ */
+export function simplifyScope(scope: Scope): unknown {
+  return {
+    type: scope.type,
+    childScopes: scope.childScopes.map(simplifyScope),
+    block: {
+      type: scope.block.type,
+      loc: JSON.stringify(scope.block.loc),
+    },
+    variables:
+      scope.type === "global" ? null : simplifyVariables(scope.variables),
+    references: scope.references.map(simplifyReference),
+    through: scope.through.map(simplifyReference),
+    get original() {
+      return scope;
+    },
+  };
+}
+
+/**
+ * Simplify variables data.
+ * @deprecated For Debug
+ */
+function simplifyVariables(variables: Variable[]) {
+  return Object.fromEntries(
+    variables.map((v) => [
+      v.name,
+      {
+        loc: JSON.stringify(v.defs[0]?.node.loc),
+      },
+    ])
+  );
+}
+
+/**
+ * Simplify reference data.
+ * @deprecated For Debug
+ */
+function simplifyReference(reference: Reference) {
+  return {
+    name: reference.identifier.name,
+    loc: JSON.stringify(reference.identifier.loc),
+  };
+}

tests/fixtures/parser/ast/await04-input.svelte

@@ -0,0 +1,7 @@
+<script lang="ts">
+  const p = Promise.resolve();
+</script>
+
+{#await p}
+{:then v}
+{/await}

tests/fixtures/parser/ast/await04-no-unused-vars-result.json

@@ -0,0 +1,8 @@
+[
+  {
+    "ruleId": "no-unused-vars",
+    "code": "v",
+    "line": 6,
+    "column": 8
+  }
+]