Use isExternalModuleImportEquals in one more place (microsoft#22417)

Andy · web-flow · commit 4a39caffd4dc · 2018-03-29T15:40:25.000-07:00
diff --git 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;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -394,18 +394,16 @@ namespace ts.FindAllReferences {`
`394`	`394`	`case SyntaxKind.ExportDeclaration:`
`395`	`395`	`case SyntaxKind.ImportDeclaration: {`
`396`	`396`	`const decl = statement as ImportDeclaration \| ExportDeclaration;`
`397`		`- if (decl.moduleSpecifier && decl.moduleSpecifier.kind === SyntaxKind.StringLiteral) {`
`398`		`- action(decl, decl.moduleSpecifier as StringLiteral);`
	`397`	`+ if (decl.moduleSpecifier && isStringLiteral(decl.moduleSpecifier)) {`
	`398`	`+ action(decl, decl.moduleSpecifier);`
`399`	`399`	`}`
`400`	`400`	`break;`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`case SyntaxKind.ImportEqualsDeclaration: {`
`404`	`404`	`const decl = statement as ImportEqualsDeclaration;`
`405`		`- const { moduleReference } = decl;`
`406`		`- if (moduleReference.kind === SyntaxKind.ExternalModuleReference &&`
`407`		`- moduleReference.expression.kind === SyntaxKind.StringLiteral) {`
`408`		`- action(decl, moduleReference.expression as StringLiteral);`
	`405`	`+ if (isExternalModuleImportEquals(decl)) {`
	`406`	`+ action(decl, decl.moduleReference.expression);`
`409`	`407`	`}`
`410`	`408`	`break;`
`411`	`409`	`}`
`@@ -647,7 +645,7 @@ namespace ts.FindAllReferences {`
`647`	`645`	`return node.kind === SyntaxKind.ModuleDeclaration && (node as ModuleDeclaration).name.kind === SyntaxKind.StringLiteral;`
`648`	`646`	`}`
`649`	`647`
`650`		`- function isExternalModuleImportEquals({ moduleReference }: ImportEqualsDeclaration): boolean {`
`651`		`- return moduleReference.kind === SyntaxKind.ExternalModuleReference && moduleReference.expression.kind === SyntaxKind.StringLiteral;`
	`648`	`+ function isExternalModuleImportEquals(eq: ImportEqualsDeclaration): eq is ImportEqualsDeclaration & { moduleReference: { expression: StringLiteral } } {`
	`649`	`+ return eq.moduleReference.kind === SyntaxKind.ExternalModuleReference && eq.moduleReference.expression.kind === SyntaxKind.StringLiteral;`
`652`	`650`	`}`
`653`	`651`	`}`