Climb past multiple property accesses if necessary

Andy Hanson · Andy Hanson · commit efc7e9db6f3c · 2016-08-30T06:51:52.000-07:00
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -2792,6 +2792,10 @@ namespace ts {
         return isRightSideOfPropertyAccess(node) ? node.parent : node;
     }
 
+    function climbPastManyPropertyAccesses(node: Node): Node {
+        return isRightSideOfPropertyAccess(node) ? climbPastManyPropertyAccesses(node.parent) : node;
+    }
+
     function isCallExpressionTarget(node: Node): boolean {
         node = climbPastPropertyAccess(node);
         return node && node.parent && node.parent.kind === SyntaxKind.CallExpression && (<CallExpression>node.parent).expression === node;
@@ -2804,7 +2808,7 @@ namespace ts {
 
     /** Returns a CallLikeExpression where `node` is the target being invoked. */
     function getAncestorCallLikeExpression(node: Node): CallLikeExpression | undefined {
-        const target = climbPastPropertyAccess(node);
+        const target = climbPastManyPropertyAccesses(node);
         const callLike = target.parent;
         return isCallLikeExpression(callLike) && getInvokedExpression(callLike) === target && callLike;
     }
diff --git a/tests/cases/fourslash/goToDefinitionOverloadsInMultiplePropertyAccesses.ts b/tests/cases/fourslash/goToDefinitionOverloadsInMultiplePropertyAccesses.ts
@@ -0,0 +1,16 @@
+/// <reference path='fourslash.ts' />
+
+// Test that we can climb past more than one property access to reach a call expression.
+
+////namespace A {
+////    export namespace B {
+////        export function f(value: number): void;
+////        /*1*/export function f(value: string): void;
+////        export function f(value: number | string) {}
+////    }
+////}
+////A.B./*2*/f("");
+
+goTo.marker("2");
+goTo.definition();
+verify.caretAtMarker("1");
