Fix bug: don't call addIndirectUser if we're not tracking indirect users (microsoft#22121)

Andy · web-flow · commit 8463b1e02838 · 2018-02-22T09:20:59.000-08:00
diff --git a/src/services/importTracker.ts b/src/services/importTracker.ts
@@ -109,7 +109,9 @@ namespace ts.FindAllReferences {
                             }
                             else if (isDefaultImport(direct)) {
                                 const sourceFileLike = getSourceFileLikeForImportDeclaration(direct);
-                                addIndirectUser(sourceFileLike); // Add a check for indirect uses to handle synthetic default imports
+                                if (!isAvailableThroughGlobal) {
+                                    addIndirectUser(sourceFileLike); // Add a check for indirect uses to handle synthetic default imports
+                                }
                                 directImports.push(direct);
                             }
                             else {
@@ -651,8 +653,8 @@ namespace ts.FindAllReferences {
         if (parent.kind === SyntaxKind.SourceFile) {
             return parent as SourceFile;
         }
-        Debug.assert(parent.kind === SyntaxKind.ModuleBlock && isAmbientModuleDeclaration(parent.parent));
-        return parent.parent as AmbientModuleDeclaration;
+        Debug.assert(parent.kind === SyntaxKind.ModuleBlock);
+        return cast(parent.parent, isAmbientModuleDeclaration);
     }
 
     function isAmbientModuleDeclaration(node: Node): node is AmbientModuleDeclaration {
diff --git a/tests/cases/fourslash/esModuleInteropFindAllReferences.ts b/tests/cases/fourslash/esModuleInteropFindAllReferences.ts
@@ -1,3 +1,5 @@
+/// <reference path="fourslash.ts"/>
+
 // @esModuleInterop: true
 
 // @Filename: /abc.d.ts
@@ -6,7 +8,7 @@
 ////}
 
 // @Filename: /b.ts
-////import * as a from "a";
+////import a from "a";
 ////a.[|x|];
 
 verify.rangesReferenceEachOther();
diff --git a/tests/cases/fourslash/esModuleInteropFindAllReferences2.ts b/tests/cases/fourslash/esModuleInteropFindAllReferences2.ts
@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts"/>
+
+// Tests that we don't always add an indirect user, which causes problems if the module is already available globally.
+
+// @esModuleInterop: true
+
+// @Filename: /a.d.ts
+////export as namespace abc;
+////export const [|x|]: number;
+
+// @Filename: /b.ts
+////import a from "./a";
+////a.[|x|];
+
+verify.rangesReferenceEachOther();

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,9 @@ namespace ts.FindAllReferences {`
`109`	`109`	`}`
`110`	`110`	`else if (isDefaultImport(direct)) {`
`111`	`111`	`const sourceFileLike = getSourceFileLikeForImportDeclaration(direct);`
`112`		`- addIndirectUser(sourceFileLike); // Add a check for indirect uses to handle synthetic default imports`
	`112`	`+ if (!isAvailableThroughGlobal) {`
	`113`	`+ addIndirectUser(sourceFileLike); // Add a check for indirect uses to handle synthetic default imports`
	`114`	`+ }`
`113`	`115`	`directImports.push(direct);`
`114`	`116`	`}`
`115`	`117`	`else {`
`@@ -651,8 +653,8 @@ namespace ts.FindAllReferences {`
`651`	`653`	`if (parent.kind === SyntaxKind.SourceFile) {`
`652`	`654`	`return parent as SourceFile;`
`653`	`655`	`}`
`654`		`- Debug.assert(parent.kind === SyntaxKind.ModuleBlock && isAmbientModuleDeclaration(parent.parent));`
`655`		`- return parent.parent as AmbientModuleDeclaration;`
	`656`	`+ Debug.assert(parent.kind === SyntaxKind.ModuleBlock);`
	`657`	`+ return cast(parent.parent, isAmbientModuleDeclaration);`
`656`	`658`	`}`
`657`	`659`
`658`	`660`	`function isAmbientModuleDeclaration(node: Node): node is AmbientModuleDeclaration {`