fix: #32

searchfe · Apr 29, 2019 · fd998c7 · fd998c7
1 parent c2bda3d
commit fd998c7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/src/emitter.ts b/src/emitter.ts
@@ -1770,19 +1770,27 @@ export function emitFile(
             const nodeStart = node.getStart();
             const nodeEnd = node.getEnd();
 
+            let names = {};
             identifiers.forEach(item => {
                 if (
                     item.getParent().getKind() === ts.SyntaxKind.PropertyAccessExpression
                     && (item.getParent().compilerNode as ts.PropertyAccessExpression).name === item.compilerNode
                 ) {
                     return;
                 }
-
-                const symbolOfIdentifier = item.getSymbol().compilerSymbol;
+                const nodeSymbol = item.getSymbol();
+                if (!nodeSymbol) {
+                    return;
+                }
+                const symbolOfIdentifier = nodeSymbol.compilerSymbol;
                 const d = symbolOfIdentifier.getDeclarations();
                 const inherite = d.find(item => item.getStart() < nodeStart || item.getEnd() > nodeEnd);
                 if (inherite) {
-                    inheritedVariables.push(item);
+                    const text = item.getText();
+                    if (!names[text]) {
+                        names[text] = 1;
+                        inheritedVariables.push(item);
+                    }
                 }
             });
 

diff --git a/test/features/inheritedVariables.php b/test/features/inheritedVariables.php
@@ -24,6 +24,7 @@
         return "123" . $b;
     },
     "b" => function () use(&$b)  {
-        return "123" . $b;
+        $a = $b;
+        return "123" . $b . $a;
     }
 );
diff --git a/test/features/inheritedVariables.ts b/test/features/inheritedVariables.ts
@@ -30,6 +30,10 @@ let obj = {
         return '123' + b;
     },
     b() {
-        return '123' + b;
+        /**
+         * @ssr
+         */
+        const a = b;
+        return '123' + b + a;
     }
 }