Skip to content

Commit bf0ddaf

Browse files
TypeScript Botsheetalkamat
TypeScript Bot
and
sheetalkamat
authored
🤖 Pick PR #59070 (Delay the calculation of common sou...) into release-5.5 (#59072)
Co-authored-by: Sheetal Nandi <[email protected]>
1 parent a44e2d9 commit bf0ddaf

8 files changed

+691
-31
lines changed

‎src/compiler/program.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -4379,7 +4379,8 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
43794379
options.outDir || // there is --outDir specified
43804380
options.rootDir || // there is --rootDir specified
43814381
options.sourceRoot || // there is --sourceRoot specified
4382-
options.mapRoot // there is --mapRoot specified
4382+
options.mapRoot || // there is --mapRoot specified
4383+
(getEmitDeclarations(options) && options.declarationDir) // there is --declarationDir specified
43834384
) {
43844385
// Precalculate and cache the common source directory
43854386
const dir = getCommonSourceDirectory();

‎src/compiler/utilities.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -6345,15 +6345,15 @@ export function getOwnEmitOutputFilePath(fileName: string, host: EmitHost, exten
63456345

63466346
/** @internal */
63476347
export function getDeclarationEmitOutputFilePath(fileName: string, host: EmitHost) {
6348-
return getDeclarationEmitOutputFilePathWorker(fileName, host.getCompilerOptions(), host.getCurrentDirectory(), host.getCommonSourceDirectory(), f => host.getCanonicalFileName(f));
6348+
return getDeclarationEmitOutputFilePathWorker(fileName, host.getCompilerOptions(), host);
63496349
}
63506350

63516351
/** @internal */
6352-
export function getDeclarationEmitOutputFilePathWorker(fileName: string, options: CompilerOptions, currentDirectory: string, commonSourceDirectory: string, getCanonicalFileName: GetCanonicalFileName): string {
6352+
export function getDeclarationEmitOutputFilePathWorker(fileName: string, options: CompilerOptions, host: Pick<EmitHost, "getCommonSourceDirectory" | "getCurrentDirectory" | "getCanonicalFileName">): string {
63536353
const outputDir = options.declarationDir || options.outDir; // Prefer declaration folder if specified
63546354

63556355
const path = outputDir
6356-
? getSourceFilePathInNewDirWorker(fileName, outputDir, currentDirectory, commonSourceDirectory, getCanonicalFileName)
6356+
? getSourceFilePathInNewDirWorker(fileName, outputDir, host.getCurrentDirectory(), host.getCommonSourceDirectory(), f => host.getCanonicalFileName(f))
63576357
: fileName;
63586358
const declarationExtension = getDeclarationEmitExtensionForPath(path);
63596359
return removeFileExtension(path) + declarationExtension;

‎src/server/project.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1622,7 +1622,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
16221622
!sourceFile ||
16231623
sourceFile.resolvedPath !== source ||
16241624
!this.isValidGeneratedFileWatcher(
1625-
getDeclarationEmitOutputFilePathWorker(sourceFile.fileName, this.compilerOptions, this.currentDirectory, this.program!.getCommonSourceDirectory(), this.getCanonicalFileName),
1625+
getDeclarationEmitOutputFilePathWorker(sourceFile.fileName, this.compilerOptions, this.program!),
16261626
watcher,
16271627
)
16281628
) {

‎src/services/sourcemaps.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export function getSourceMapper(host: SourceMapperHost): SourceMapper {
117117

118118
const declarationPath = outPath ?
119119
removeFileExtension(outPath) + Extension.Dts :
120-
getDeclarationEmitOutputFilePathWorker(info.fileName, program.getCompilerOptions(), currentDirectory, program.getCommonSourceDirectory(), getCanonicalFileName);
120+
getDeclarationEmitOutputFilePathWorker(info.fileName, program.getCompilerOptions(), program);
121121
if (declarationPath === undefined) return undefined;
122122

123123
const newLoc = getDocumentPositionMapper(declarationPath, info.fileName).getGeneratedPosition(info);

‎src/testRunner/unittests/tsserver/projectErrors.ts

+27
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as ts from "../../_namespaces/ts.js";
22
import { jsonToReadableText } from "../helpers.js";
3+
import { libContent } from "../helpers/contents.js";
34
import {
45
baselineTsserverLogs,
56
closeFilesForSession,
@@ -833,3 +834,29 @@ describe("unittests:: tsserver:: projectErrors:: with file rename on wsl2::", ()
833834
baselineTsserverLogs("projectErrors", "file rename on wsl2", session);
834835
});
835836
});
837+
838+
describe("unittests:: tsserver:: projectErrors:: dts errors when files dont belong to common root", () => {
839+
[undefined, "decls"].forEach(declarationDir => {
840+
it(`dts errors when files dont belong to common root${declarationDir ? " with declarationDir" : ""}`, () => {
841+
const host = createServerHost({
842+
"/home/src/projects/project/src/file.ts": `import { a } from "../a";`,
843+
"/home/src/projects/project/a.ts": `export const a = 10;`,
844+
"/home/src/projects/project/src/tsconfig.json": jsonToReadableText({
845+
compilerOptions: {
846+
composite: true,
847+
noEmit: true,
848+
declarationDir,
849+
},
850+
}),
851+
[libFile.path]: libContent,
852+
});
853+
const session = new TestSession(host);
854+
openFilesForSession(["/home/src/projects/project/src/file.ts"], session);
855+
verifyGetErrRequest({
856+
session,
857+
files: ["/home/src/projects/project/src/file.ts"],
858+
});
859+
baselineTsserverLogs("projectErrors", `dts errors when files dont belong to common root${declarationDir ? " with declarationDir" : ""}`, session);
860+
});
861+
});
862+
});

0 commit comments

Comments
 (0)