Fixes missing nested object destrucuturing variable references

sisisin · sisisin · commit 02294a7bb6ea · 2019-07-28T22:14:32.000+09:00
diff --git a/src/services/importTracker.ts b/src/services/importTracker.ts
@@ -577,16 +577,10 @@ namespace ts.FindAllReferences {
     // If a reference is a class expression, the exported node would be its parent.
     // If a reference is a variable declaration, the exported node would be the variable statement.
     function getExportNode(parent: Node, node: Node): Node | undefined {
-        if (parent.kind === SyntaxKind.VariableDeclaration) {
-            const p = parent as VariableDeclaration;
-            return p.name !== node ? undefined :
-                p.parent.kind === SyntaxKind.CatchClause ? undefined : p.parent.parent.kind === SyntaxKind.VariableStatement ? p.parent.parent : undefined;
-        }
-        else if (parent.parent && parent.parent.parent && parent.parent.parent.kind === SyntaxKind.VariableDeclaration) {
-          const p = parent.parent.parent as VariableDeclaration;
-          const binded = parent as BindingElement;
-          return binded.name !== node ? undefined :
-              p.parent.kind === SyntaxKind.CatchClause ? undefined : p.parent.parent.kind === SyntaxKind.VariableStatement ? p.parent.parent : undefined;
+        const declaration = isVariableDeclaration(parent) ? parent : isBindingElement(parent) ? walkUpBindingElementsAndPatterns(parent) : undefined;
+        if (declaration) {
+            return (parent as VariableDeclaration | BindingElement).name !== node ? undefined :
+                isCatchClause(declaration.parent) ? undefined : isVariableStatement(declaration.parent.parent) ? declaration.parent.parent : undefined;
         }
         else {
             return parent;
diff --git a/src/testRunner/unittests/tsserver/getExportReferences.ts b/src/testRunner/unittests/tsserver/getExportReferences.ts
@@ -3,16 +3,18 @@ namespace ts.projectSystem {
         const exportVariable = "export const value = 0;";
         const exportArrayDestructured = "export const [valueA, valueB] = [0, 1];";
         const exportObjectDestructured = "export const { valueC, valueD: renamedD } = { valueC: 0, valueD: 1 };";
+        const exportNestedObject = "export const { nest: [valueE, { valueF }] } = { nest: [0, { valueF: 1 }] };";
 
         const mainTs: File = {
             path: "/main.ts",
-            content: 'import { value, valueA, valueB, valueC, renamedD } from "./mod";',
+            content: 'import { value, valueA, valueB, valueC, renamedD, valueE, valueF } from "./mod";',
         };
         const modTs: File = {
             path: "/mod.ts",
             content: `${exportVariable}
 ${exportArrayDestructured}
 ${exportObjectDestructured}
+${exportNestedObject}
 `,
         };
         const tsconfig: File = {
@@ -146,5 +148,38 @@ ${exportObjectDestructured}
 
             assert.deepEqual(response, expectResponse);
         });
+
+        it("should get nested object declaration references", () => {
+            const session = makeSampleSession();
+            const response = executeSessionRequest<protocol.ReferencesRequest, protocol.ReferencesResponse>(
+                session,
+                protocol.CommandTypes.References,
+                protocolFileLocationFromSubstring(modTs, "valueF"),
+            );
+
+            const expectResponse = {
+                refs: [
+                    referenceModTs({
+                        text: "valueF",
+                        lineText: exportNestedObject,
+                        contextText: exportNestedObject,
+                    }),
+                    referenceMainTs(mainTs, "valueF"),
+                    referenceModTs(
+                        {
+                            text: "valueF",
+                            lineText: exportNestedObject,
+                            contextText: "valueF: 1",
+                        },
+                        { options: { index: 1 } },
+                    ),
+                ],
+                symbolDisplayString: "const valueF: number",
+                symbolName: "valueF",
+                symbolStartOffset: protocolLocationFromSubstring(modTs.content, "valueF").offset,
+            };
+
+            assert.deepEqual(response, expectResponse);
+        });
     });
 }
