Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use resolvedPath consistently in the builder (#35757)

Browse Source 
* Add baseline for #35468

* Use resolvedPath consistently in the builder
Fixes #35468
This commit is contained in:
Sheetal Nandi
2019-12-19 10:10:17 -08:00
committed by GitHub
parent 5d3284032b
commit ec84392f2e
46 changed files with 1073 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/testRunner/unittests/tsbuild/watchMode.ts
+45 -5
View File
@@ -810,7 +810,7 @@ export function gfoo() {
[aDts, [aDts]],
[bDts, [bDts, aDts]],
[refs.path, [refs.path]],
[cTs.path, [cTs.path, refs.path, bDts]]
[cTs.path, [cTs.path, refs.path, bDts, aDts]]
];
function createSolutionAndWatchMode() {
@@ -965,7 +965,7 @@ export function gfoo() {
[aDts, [aDts]],
[bDts, [bDts, aDts]],
[nrefs.path, [nrefs.path]],
[cTs.path, [cTs.path, nrefs.path, bDts]]
[cTs.path, [cTs.path, nrefs.path, bDts, aDts]]
],
// revert the update
revert: host => host.writeFile(cTsconfig.path, cTsconfig.content),
@@ -1001,7 +1001,7 @@ export function gfoo() {
[nrefs.path, [nrefs.path]],
[bDts, [bDts, nrefs.path]],
[refs.path, [refs.path]],
[cTs.path, [cTs.path, refs.path, bDts]],
[cTs.path, [cTs.path, refs.path, bDts, nrefs.path]],
],
// revert the update
revert: host => host.writeFile(bTsconfig.path, bTsconfig.content),
@@ -1055,7 +1055,7 @@ export function gfoo() {
[aTs.path, [aTs.path]],
[bDts, [bDts, aTs.path]],
[refs.path, [refs.path]],
[cTs.path, [cTs.path, refs.path, bDts]],
[cTs.path, [cTs.path, refs.path, bDts, aTs.path]],
],
// revert the update
revert: host => host.writeFile(aTsconfig.path, aTsconfig.content),
@@ -1093,7 +1093,7 @@ export function gfoo() {
[aDts, [aDts]],
[bDts, [bDts, aDts]],
[refs.path, [refs.path]],
[cTsFile.path, [cTsFile.path, refs.path, bDts]]
[cTsFile.path, [cTsFile.path, refs.path, bDts, aDts]]
];
function getOutputFileStamps(host: TsBuildWatchSystem) {
return expectedFiles.map(file => transformOutputToOutputFileStamp(file, host));
@@ -1246,4 +1246,44 @@ const a = {
]
});
});
describe("unittests:: tsbuild:: watchMode:: with reexport when referenced project reexports definitions from another file", () => {
verifyTscWatch({
scenario: "reexport",
subScenario: "Reports errors correctly",
commandLineArgs: ["-b", "-w", "-verbose", "src"],
sys: () => createWatchedSystem(
[
...[
"src/tsconfig.json",
"src/main/tsconfig.json", "src/main/index.ts",
"src/pure/tsconfig.json", "src/pure/index.ts", "src/pure/session.ts"
]
.map(f => getFileFromProject("reexport", f)),
{ path: libFile.path, content: libContent }
],
{ currentDirectory: `${projectsLocation}/reexport` }
),
changes: [
sys => {
const content = sys.readFile(`${projectsLocation}/reexport/src/pure/session.ts`)!;
sys.writeFile(`${projectsLocation}/reexport/src/pure/session.ts`, content.replace("// ", ""));
sys.checkTimeoutQueueLengthAndRun(1); // build src/pure
sys.checkTimeoutQueueLengthAndRun(1); // build src/main
sys.checkTimeoutQueueLengthAndRun(1); // build src
sys.checkTimeoutQueueLength(0);
return "Introduce error";
},
sys => {
const content = sys.readFile(`${projectsLocation}/reexport/src/pure/session.ts`)!;
sys.writeFile(`${projectsLocation}/reexport/src/pure/session.ts`, content.replace("bar: ", "// bar: "));
sys.checkTimeoutQueueLengthAndRun(1); // build src/pure
sys.checkTimeoutQueueLengthAndRun(1); // build src/main
sys.checkTimeoutQueueLengthAndRun(1); // build src
sys.checkTimeoutQueueLength(0);
return "Fix error";
}
]
});
});
}
src/testRunner/unittests/tscWatch/helpers.ts
+1 -1
View File
@@ -399,7 +399,7 @@ namespace ts.tscWatch {
if (state.semanticDiagnosticsPerFile?.size) {
baseline.push("Semantic diagnostics in builder refreshed for::");
for (const file of program.getSourceFiles()) {
if (!state.semanticDiagnosticsFromOldState || !state.semanticDiagnosticsFromOldState.has(file.path)) {
if (!state.semanticDiagnosticsFromOldState || !state.semanticDiagnosticsFromOldState.has(file.resolvedPath)) {
baseline.push(file.fileName);
}
}