From 4a39caffd4dc11a28f343566cf5933784c9d8f5d Mon Sep 17 00:00:00 2001 From: Andy Date: Thu, 29 Mar 2018 15:40:25 -0700 Subject: [PATCH] Use isExternalModuleImportEquals in one more place (#22417) --- src/services/importTracker.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/services/importTracker.ts b/src/services/importTracker.ts index b5ffaaf9cea..de8a49243fa 100644 --- a/src/services/importTracker.ts +++ b/src/services/importTracker.ts @@ -394,18 +394,16 @@ namespace ts.FindAllReferences { case SyntaxKind.ExportDeclaration: case SyntaxKind.ImportDeclaration: { const decl = statement as ImportDeclaration | ExportDeclaration; - if (decl.moduleSpecifier && decl.moduleSpecifier.kind === SyntaxKind.StringLiteral) { - action(decl, decl.moduleSpecifier as StringLiteral); + if (decl.moduleSpecifier && isStringLiteral(decl.moduleSpecifier)) { + action(decl, decl.moduleSpecifier); } break; } case SyntaxKind.ImportEqualsDeclaration: { const decl = statement as ImportEqualsDeclaration; - const { moduleReference } = decl; - if (moduleReference.kind === SyntaxKind.ExternalModuleReference && - moduleReference.expression.kind === SyntaxKind.StringLiteral) { - action(decl, moduleReference.expression as StringLiteral); + if (isExternalModuleImportEquals(decl)) { + action(decl, decl.moduleReference.expression); } break; } @@ -647,7 +645,7 @@ namespace ts.FindAllReferences { return node.kind === SyntaxKind.ModuleDeclaration && (node as ModuleDeclaration).name.kind === SyntaxKind.StringLiteral; } - function isExternalModuleImportEquals({ moduleReference }: ImportEqualsDeclaration): boolean { - return moduleReference.kind === SyntaxKind.ExternalModuleReference && moduleReference.expression.kind === SyntaxKind.StringLiteral; + function isExternalModuleImportEquals(eq: ImportEqualsDeclaration): eq is ImportEqualsDeclaration & { moduleReference: { expression: StringLiteral } } { + return eq.moduleReference.kind === SyntaxKind.ExternalModuleReference && eq.moduleReference.expression.kind === SyntaxKind.StringLiteral; } }