Merge branch 'master' into referencesPrototypeSourceFile

microsoft · sheetalkamat · Sep 24, 2019 · Jun 13, 2019 · Jun 21, 2019 · Jun 21, 2019
commit 4d13f53df8953aea0160f1915ecf977d49a1a9b7
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -1077,7 +1077,7 @@ namespace ts.server {
                 const path = this.toPath(sourceFile);
                 if (this.generatedFilesMap) {
                     if (isGeneratedFileWatcher(this.generatedFilesMap)) {
-                        Debug.fail(`${this.projectName} Expected not to have --out watcher for generated file with options: ${JSON.stringify(this.compilerOptions)}`);
+                        Debug.fail(`${this.projectName} Expected to not have --out watcher for generated file with options: ${JSON.stringify(this.compilerOptions)}`);
                         return;
                     }
                     if (this.generatedFilesMap.has(path)) return;

diff --git a/src/testRunner/unittests/tsserver/projectReferences.ts b/src/testRunner/unittests/tsserver/projectReferences.ts
@@ -815,5 +815,80 @@ ${dependencyTs.content}`);
             verifyScenarios(/*withRefs*/ false);
             verifyScenarios(/*withRefs*/ true);
         });
+
+        it("reusing d.ts files from composite and non composite projects", () => {
+            const projectLocation = "/user/username/projects/myproject";
+            const configA: File = {
+                path: `${projectLocation}/compositea/tsconfig.json`,
+                content: JSON.stringify({
+                    compilerOptions: {
+                        composite: true,
+                        outDir: "../dist/",
+                        rootDir: "../",
+                        baseUrl: "../",
+                        paths: { "@ref/*": ["./dist/*"] }
+                    }
+                })
+            };
+            const aTs: File = {
+                path: `${projectLocation}/compositea/a.ts`,
+                content: `import { b } from "@ref/compositeb/b";`
+            };
+            const a2Ts: File = {
+                path: `${projectLocation}/compositea/a2.ts`,
+                content: `export const x = 10;`
+            };
+            const configB: File = {
+                path: `${projectLocation}/compositeb/tsconfig.json`,
+                content: configA.content
+            };
+            const bTs: File = {
+                path: `${projectLocation}/compositeb/b.ts`,
+                content: "export function b() {}"
+            };
+            const bDts: File = {
+                path: `${projectLocation}/dist/compositeb/b.d.ts`,
+                content: "export declare function b(): void;"
+            };
+            const configC: File = {
+                path: `${projectLocation}/compositec/tsconfig.json`,
+                content: JSON.stringify({
+                    compilerOptions: {
+                        composite: true,
+                        outDir: "../dist/",
+                        rootDir: "../",
+                        baseUrl: "../",
+                        paths: { "@ref/*": ["./*"] }
+                    },
+                    references: [{ path: "../compositeb" }]
+                })
+            };
+            const cTs: File = {
+                path: `${projectLocation}/compositec/c.ts`,
+                content: aTs.content
+            };
+            const files = [libFile, aTs, a2Ts, configA, bDts, bTs, configB, cTs, configC];
+            const host = createServerHost(files);
+            const service = createProjectService(host);
+            service.openClientFile(aTs.path);
+            service.checkNumberOfProjects({ configuredProjects: 1 });
+
+            // project A referencing b.d.ts without project reference
+            const projectA = service.configuredProjects.get(configA.path)!;
+            assert.isDefined(projectA);
+            checkProjectActualFiles(projectA, [aTs.path, a2Ts.path, bDts.path, libFile.path, configA.path]);
+
+            // reuses b.d.ts but sets the path and resolved path since projectC has project references
+            // as the real resolution was to b.ts
+            service.openClientFile(cTs.path);
+            service.checkNumberOfProjects({ configuredProjects: 2 });
+            const projectC = service.configuredProjects.get(configC.path)!;
+            checkProjectActualFiles(projectC, [cTs.path, bTs.path, libFile.path, configC.path]);
+
+            // Now new project for project A tries to reuse b but there is no filesByName mapping for b's source location
+            host.writeFile(a2Ts.path, `${a2Ts.content}export const y = 30;`);
+            assert.isTrue(projectA.dirty);
+            projectA.updateGraph();
+        });
     });
 }
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -8544,13 +8544,15 @@ declare namespace ts.server {
         private typeAcquisition;
         private directoriesWatchedForWildcards;
         readonly canonicalConfigFilePath: NormalizedPath;
-        private getSourceOfProjectReferenceRedirect;
+        private projectReferenceCallbacks;
+        private mapOfDeclarationDirectories;
         /** Ref count to the project when opened from external project */
         private externalProjectRefCount;
         private projectErrors;
         private projectReferences;
         protected isInitialLoadPending: () => boolean;
         fileExists(file: string): boolean;
+        directoryExists(path: string): boolean;
         /**
          * If the project has reload from disk pending, it reloads (and then updates graph as part of that) instead of just updating the graph
          * @returns: true if set of files in the project stays the same and false - otherwise.