From 89447748d500e66846f9f4068ada12424da0ce74 Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Tue, 22 Aug 2017 10:47:37 -0700
Subject: [PATCH] Reuse exiting getFirstIdentifier function

---
 src/compiler/checker.ts      |  2 +-
 src/compiler/symbolWalker.ts | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 4781f4bc183..cff540c3f06 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -205,7 +205,7 @@ namespace ts {
             getEmitResolver,
             getExportsOfModule: getExportsOfModuleAsArray,
             getExportsAndPropertiesOfModule,
-            getSymbolWalker: createGetSymbolWalker(getRestTypeOfSignature, getReturnTypeOfSignature, getBaseTypes, resolveStructuredTypeMembers, getTypeOfSymbol, getResolvedSymbol, getIndexTypeOfStructuredType, getConstraintFromTypeParameter),
+            getSymbolWalker: createGetSymbolWalker(getRestTypeOfSignature, getReturnTypeOfSignature, getBaseTypes, resolveStructuredTypeMembers, getTypeOfSymbol, getResolvedSymbol, getIndexTypeOfStructuredType, getConstraintFromTypeParameter, getFirstIdentifier),
             getAmbientModules,
             getAllAttributesTypeFromJsxOpeningLikeElement: node => {
                 node = getParseTreeNode(node, isJsxOpeningLikeElement);
diff --git a/src/compiler/symbolWalker.ts b/src/compiler/symbolWalker.ts
index 6567870c961..e20ef9f9d98 100644
--- a/src/compiler/symbolWalker.ts
+++ b/src/compiler/symbolWalker.ts
@@ -8,7 +8,8 @@ namespace ts {
         getTypeOfSymbol: (sym: Symbol) => Type,
         getResolvedSymbol: (node: Node) => Symbol,
         getIndexTypeOfStructuredType: (type: Type, kind: IndexKind) => Type,
-        getConstraintFromTypeParameter: (typeParameter: TypeParameter) => Type) {
+        getConstraintFromTypeParameter: (typeParameter: TypeParameter) => Type,
+        getFirstIdentifier: (node: EntityNameOrEntityNameExpression) => Identifier) {
 
         return getSymbolWalker;
 
@@ -180,20 +181,11 @@ namespace ts {
                     // query node on any of the symbol's declarations and get symbols there
                     if ((d as any).type && (d as any).type.kind === SyntaxKind.TypeQuery) {
                         const query = (d as any).type as TypeQueryNode;
-                        const entity = leftmostSymbol(query.exprName);
+                        const entity = getResolvedSymbol(getFirstIdentifier(query.exprName));
                         visitSymbol(entity);
                     }
                 });
             }
         }
-
-        function leftmostSymbol(expr: QualifiedName | Identifier): Symbol {
-            if (expr.kind === SyntaxKind.Identifier) {
-                return getResolvedSymbol(expr as Identifier);
-            }
-            else {
-                return leftmostSymbol((expr as QualifiedName).left);
-            }
-        }
     }
 }
\ No newline at end of file