From 977525b37ea7648e87044be8d72c8fdffa78c373 Mon Sep 17 00:00:00 2001 From: Andy Date: Thu, 29 Jun 2017 10:07:08 -0700 Subject: [PATCH] getSymbolOfEntityNameOrPropertyAccessExpression: combine common code from PropertyAccessExpression and QualifiedName cases (#16827) --- src/compiler/checker.ts | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7cb9902b831..514e8f401a9 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -22500,25 +22500,25 @@ namespace ts { } if (entityName.kind === SyntaxKind.Identifier) { - if (isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) { + if (isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) { return getIntrinsicTagSymbol(entityName.parent); } - return resolveEntityName(entityName, SymbolFlags.Value, /*ignoreErrors*/ false, /*dontResolveAlias*/ true); + return resolveEntityName(entityName, SymbolFlags.Value, /*ignoreErrors*/ false, /*dontResolveAlias*/ true); } - else if (entityName.kind === SyntaxKind.PropertyAccessExpression) { - const symbol = getNodeLinks(entityName).resolvedSymbol; - if (!symbol) { - checkPropertyAccessExpression(entityName); + else if (entityName.kind === SyntaxKind.PropertyAccessExpression || entityName.kind === SyntaxKind.QualifiedName) { + const links = getNodeLinks(entityName); + if (links.resolvedSymbol) { + return links.resolvedSymbol; } - return getNodeLinks(entityName).resolvedSymbol; - } - else if (entityName.kind === SyntaxKind.QualifiedName) { - const symbol = getNodeLinks(entityName).resolvedSymbol; - if (!symbol) { - checkQualifiedName(entityName); + + if (entityName.kind === SyntaxKind.PropertyAccessExpression) { + checkPropertyAccessExpression(entityName); } - return getNodeLinks(entityName).resolvedSymbol; + else { + checkQualifiedName(entityName); + } + return links.resolvedSymbol; } } else if (isTypeReferenceIdentifier(entityName)) {