From f7d1f39e4241ace7ee3603858203f42763834d0b Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 30 Aug 2019 22:50:09 +0000
Subject: [PATCH] Cherry-pick PR #33168 into release-3.6

Component commits:
078ef7ff02 Fix the semantic diagnostics caching in builder to handle conversion from relative to buildInfo to absolute path Fixes #33161
---
 src/compiler/builder.ts                       |  2 +-
 .../unittests/tscWatch/incremental.ts         | 43 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts
index 7af7be17f5534..093a75a7c281d 100644
--- a/src/compiler/builder.ts
+++ b/src/compiler/builder.ts
@@ -1036,7 +1036,7 @@ namespace ts {
             compilerOptions: convertFromReusableCompilerOptions(program.options, toAbsolutePath),
             referencedMap: getMapOfReferencedSet(program.referencedMap, toPath),
             exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath),
-            semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && arrayToMap(program.semanticDiagnosticsPerFile, value => isString(value) ? value : value[0], value => isString(value) ? emptyArray : value[1]),
+            semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && arrayToMap(program.semanticDiagnosticsPerFile, value => toPath(isString(value) ? value : value[0]), value => isString(value) ? emptyArray : value[1]),
             hasReusableDiagnostic: true
         };
         return {
diff --git a/src/testRunner/unittests/tscWatch/incremental.ts b/src/testRunner/unittests/tscWatch/incremental.ts
index 6c72a4bfe9c71..f7e959c5f037a 100644
--- a/src/testRunner/unittests/tscWatch/incremental.ts
+++ b/src/testRunner/unittests/tscWatch/incremental.ts
@@ -542,6 +542,49 @@ namespace ts.tscWatch {
                     ],
                     expectedIncrementalErrors: file2Errors,
                 });
+
+                it("verify that state is read correctly", () => {
+                    const system = createWatchedSystem([libFile, file1, fileModified, config], { currentDirectory: project });
+                    incrementalBuild("tsconfig.json", system);
+
+                    const command = parseConfigFileWithSystem("tsconfig.json", {}, system, noop)!;
+                    const builderProgram = createIncrementalProgram({
+                        rootNames: command.fileNames,
+                        options: command.options,
+                        projectReferences: command.projectReferences,
+                        configFileParsingDiagnostics: getConfigFileParsingDiagnostics(command),
+                        host: createIncrementalCompilerHost(command.options, system)
+                    });
+
+                    const state = builderProgram.getState();
+                    assert.equal(state.changedFilesSet!.size, 0, "changes");
+
+                    assert.equal(state.fileInfos.size, 3, "FileInfo size");
+                    assert.deepEqual(state.fileInfos.get(libFile.path), libFileInfo);
+                    assert.deepEqual(state.fileInfos.get(file1.path), getFileInfo(file1.content));
+                    assert.deepEqual(state.fileInfos.get(file2.path), file2FileInfo);
+
+                    assert.deepEqual(state.compilerOptions, {
+                        incremental: true,
+                        module: ModuleKind.AMD,
+                        configFilePath: config.path
+                    });
+
+                    assert.equal(state.referencedMap!.size, 0);
+                    assert.equal(state.exportedModulesMap!.size, 0);
+
+                    assert.equal(state.semanticDiagnosticsPerFile!.size, 3);
+                    assert.deepEqual(state.semanticDiagnosticsPerFile!.get(libFile.path), emptyArray);
+                    assert.deepEqual(state.semanticDiagnosticsPerFile!.get(file1.path), emptyArray);
+                    const { file: _, relatedInformation: __, ...rest } = file2ReuasableError[1][0];
+                    assert.deepEqual(state.semanticDiagnosticsPerFile!.get(file2.path), [{
+                        ...rest,
+                        file: state.program!.getSourceFileByPath(file2.path as Path)!,
+                        relatedInformation: undefined,
+                        reportsUnnecessary: undefined,
+                        source: undefined
+                    }]);
+                });
             });
 
             describe("with --out", () => {