microsoft · Sheetal Nandi (sheetalkamat) · Mar 9, 2019 · Mar 1, 2019 · Mar 4, 2019 · Mar 4, 2019
diff --git a/lib/tsc.js b/lib/tsc.js
diff --git a/lib/tsserver.js b/lib/tsserver.js
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
diff --git a/lib/typescript.js b/lib/typescript.js
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts
@@ -451,15 +451,7 @@ namespace ts {
         let readFileWithCache = (f: string) => host.readFile(f);
         let projectCompilerOptions = baseCompilerOptions;
         const compilerHost = createCompilerHostFromProgramHost(host, () => projectCompilerOptions);
-        const originalGetSourceFile = compilerHost.getSourceFile;
-        const computeHash = host.createHash || generateDjb2Hash;
-        compilerHost.getSourceFile = (...args) => {
-            const result = originalGetSourceFile.call(compilerHost, ...args);
-            if (result) {
-                result.version = computeHash.call(host, result.text);
-            }
-            return result;
-        };
+        setGetSourceFileAsHashVersioned(compilerHost, host);
 
         const buildInfoChecked = createFileMap<true>(toPath);
 
@@ -1241,13 +1233,7 @@ namespace ts {
         function getOldProgram(proj: ResolvedConfigFileName, parsed: ParsedCommandLine) {
             const value = builderPrograms.getValue(proj);
             if (value) return value;
-            const buildInfoPath = getOutputPathForBuildInfo(parsed.options);
-            if (!buildInfoPath) return undefined;
-            const content = readFileWithCache(buildInfoPath);
-            if (!content) return undefined;
-            const buildInfo = getBuildInfo(content);
-            if (buildInfo.version !== version) return undefined;
-            return buildInfo.program && createBuildProgramUsingProgramBuildInfo(buildInfo.program) as any as T;
+            return readBuilderProgram(parsed.options, readFileWithCache) as any as T;
         }
 
         function updateBundle(proj: ResolvedConfigFileName): BuildResultFlags {

diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts
diff --git a/src/testRunner/tsconfig.json b/src/testRunner/tsconfig.json
@@ -101,6 +101,7 @@
         "unittests/tscWatch/consoleClearing.ts",
         "unittests/tscWatch/emit.ts",
         "unittests/tscWatch/emitAndErrorUpdates.ts",
+        "unittests/tscWatch/incremental.ts",
         "unittests/tscWatch/programUpdates.ts",
         "unittests/tscWatch/resolutionCache.ts",
         "unittests/tscWatch/watchEnvironment.ts",

diff --git a/src/testRunner/unittests/tsbuild/outFile.ts b/src/testRunner/unittests/tsbuild/outFile.ts
@@ -99,13 +99,7 @@ namespace ts {
                 // outputs
                 ...outputFiles[project.first],
                 ...outputFiles[project.second],
-
-                // build info
-                outputFiles[project.third][ext.buildinfo],
-            ],
-            // These are first not present and later read new contents to generate third output
-            outputFiles[project.first][ext.buildinfo],
-            outputFiles[project.second][ext.buildinfo]
+            ]
         );
 
         let dtsChangedExpectedDiagnostics: ReadonlyArray<fakes.ExpectedDiagnostic> = [
@@ -131,12 +125,8 @@ namespace ts {
                 ...outputFiles[project.first],
                 ...outputFiles[project.second],
                 outputFiles[project.third][ext.dts],
-
-                // build info
-                outputFiles[project.third][ext.buildinfo],
             ],
             outputFiles[project.first][ext.dts], // dts changes so once read old content, and once new (to emit third)
-            outputFiles[project.first][ext.buildinfo], // since first build info changes
         );
 
         let dtsChangedExpectedDiagnosticsDependOrdered: ReadonlyArray<fakes.ExpectedDiagnostic> = [
@@ -173,8 +163,7 @@ namespace ts {
                 ...outputFiles[project.first],
                 ...outputFiles[project.second],
                 ...outputFiles[project.third],
-            ],
-            outputFiles[project.first][ext.buildinfo], // since first build info changes
+            ]
         );
 
         let dtsUnchangedExpectedDiagnosticsDependOrdered: ReadonlyArray<fakes.ExpectedDiagnostic> = [
@@ -227,7 +216,6 @@ namespace ts {
                 value.set(path, 1);
             }
             value.set(outputFiles[project.second][ext.dts], 2); // dts changes so once read old content, and once new (to emit third)
-            value.set(outputFiles[project.second][ext.buildinfo], 2); // since first build info changes
             return value;
         }
 

diff --git a/src/testRunner/unittests/tscWatch/helpers.ts b/src/testRunner/unittests/tscWatch/helpers.ts
@@ -32,6 +32,7 @@ namespace ts.tscWatch {
     export interface Watch {
         (): Program;
         getBuilderProgram(): EmitAndSemanticDiagnosticsBuilderProgram;
+        close(): void;
     }
 
     export function createWatchOfConfigFile(configFileName: string, host: WatchedSystem, maxNumberOfFilesToIterateForInvalidation?: number) {
@@ -40,6 +41,7 @@ namespace ts.tscWatch {
         const watch = createWatchProgram(compilerHost);
         const result = (() => watch.getCurrentProgram().getProgram()) as Watch;
         result.getBuilderProgram = () => watch.getCurrentProgram();
+        result.close = () => watch.close();
         return result;
     }