Skip to content

Commit 99d4cca

Browse files
sheetalkamatsheetalkamat
committed
Search till root just like tsc when the projectRootPath specified doesnt contain the info.path
Fixes microsoft#21209
1 parent 05c42d9 commit 99d4cca

4 files changed

Lines changed: 98 additions & 20 deletions

File tree

‎src/harness/unittests/tsserverProjectSystem.ts‎

Lines changed: 79 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3655,11 +3655,11 @@ namespace ts.projectSystem {
36553655
// Open file1 -> configFile
36563656
verifyConfigFileName(file1, "/a", configFile);
36573657
verifyConfigFileName(file1, "/a/b", configFile);
3658-
verifyConfigFileName(file1, "/a/B", useCaseSensitiveFileNames ? undefined : configFile);
3658+
verifyConfigFileName(file1, "/a/B", configFile);
36593659

36603660
// Open file2 use root "/a/b"
36613661
verifyConfigFileName(file2, "/a", useCaseSensitiveFileNames ? configFile2 : configFile);
3662-
verifyConfigFileName(file2, "/a/b", useCaseSensitiveFileNames ? undefined : configFile);
3662+
verifyConfigFileName(file2, "/a/b", useCaseSensitiveFileNames ? configFile2 : configFile);
36633663
verifyConfigFileName(file2, "/a/B", useCaseSensitiveFileNames ? undefined : configFile);
36643664

36653665
function verifyConfigFileName(file: FileOrFolder, projectRoot: string, expectedConfigFile: FileOrFolder | undefined) {
@@ -4998,6 +4998,83 @@ namespace ts.projectSystem {
49984998
checkWatchedDirectories(host, [], /*recursive*/ false);
49994999
checkWatchedDirectories(host, getTypeRootsFromLocation(projectDir), /*recursive*/ true);
50005000
});
5001+
5002+
describe("when the opened file is not from project root", () => {
5003+
const projectRoot = "/a/b/projects/project";
5004+
const file: FileOrFolder = {
5005+
path: `${projectRoot}/src/index.ts`,
5006+
content: "let y = 10"
5007+
};
5008+
const tsconfig: FileOrFolder = {
5009+
path: `${projectRoot}/tsconfig.json`,
5010+
content: "{}"
5011+
};
5012+
const files = [file, libFile];
5013+
const filesWithConfig = files.concat(tsconfig);
5014+
const dirOfFile = getDirectoryPath(file.path);
5015+
5016+
function openClientFile(files: FileOrFolder[]) {
5017+
const host = createServerHost(files);
5018+
const projectService = createProjectService(host);
5019+
5020+
projectService.openClientFile(file.path, /*fileContent*/ undefined, /*scriptKind*/ undefined, "/a/b/projects/proj");
5021+
return { host, projectService };
5022+
}
5023+
5024+
function verifyConfiguredProject(host: TestServerHost, projectService: TestProjectService) {
5025+
projectService.checkNumberOfProjects({ configuredProjects: 1 });
5026+
const project = projectService.configuredProjects.get(tsconfig.path);
5027+
assert.isDefined(project);
5028+
5029+
checkProjectActualFiles(project, [file.path, libFile.path, tsconfig.path]);
5030+
checkWatchedFiles(host, [libFile.path, tsconfig.path]);
5031+
checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
5032+
checkWatchedDirectories(host, [projectRoot].concat(getTypeRootsFromLocation(projectRoot)), /*recursive*/ true);
5033+
}
5034+
5035+
function verifyInferredProject(host: TestServerHost, projectService: TestProjectService) {
5036+
projectService.checkNumberOfProjects({ inferredProjects: 1 });
5037+
const project = projectService.inferredProjects[0];
5038+
assert.isDefined(project);
5039+
5040+
const filesToWatch = [libFile.path];
5041+
forEachAncestorDirectory(dirOfFile, ancestor => {
5042+
filesToWatch.push(combinePaths(ancestor, "tsconfig.json"));
5043+
filesToWatch.push(combinePaths(ancestor, "jsconfig.json"));
5044+
});
5045+
5046+
checkProjectActualFiles(project, [file.path, libFile.path]);
5047+
checkWatchedFiles(host, filesToWatch);
5048+
checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
5049+
checkWatchedDirectories(host, getTypeRootsFromLocation(dirOfFile), /*recursive*/ true);
5050+
}
5051+
5052+
it("tsconfig for the file exists", () => {
5053+
const { host, projectService } = openClientFile(filesWithConfig);
5054+
verifyConfiguredProject(host, projectService);
5055+
5056+
host.reloadFS(files);
5057+
host.runQueuedTimeoutCallbacks();
5058+
verifyInferredProject(host, projectService);
5059+
5060+
host.reloadFS(filesWithConfig);
5061+
host.runQueuedTimeoutCallbacks();
5062+
verifyConfiguredProject(host, projectService);
5063+
});
5064+
5065+
it("tsconfig for the file does not exist", () => {
5066+
const { host, projectService } = openClientFile(files);
5067+
verifyInferredProject(host, projectService);
5068+
5069+
host.reloadFS(filesWithConfig);
5070+
host.runQueuedTimeoutCallbacks();
5071+
verifyConfiguredProject(host, projectService);
5072+
5073+
host.reloadFS(files);
5074+
host.runQueuedTimeoutCallbacks();
5075+
verifyInferredProject(host, projectService);
5076+
});
5077+
});
50015078
});
50025079

50035080
describe("tsserverProjectSystem cancellationToken", () => {

‎src/server/editorServices.ts‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ namespace ts.server {
11561156
* This is called by inferred project whenever script info is added as a root
11571157
*/
11581158
/* @internal */
1159-
startWatchingConfigFilesForInferredProjectRoot(info: ScriptInfo, projectRootPath: NormalizedPath | undefined) {
1159+
startWatchingConfigFilesForInferredProjectRoot(info: ScriptInfo) {
11601160
Debug.assert(info.isScriptOpen());
11611161
this.forEachConfigFileLocation(info, (configFileName, canonicalConfigFilePath) => {
11621162
let configFileExistenceInfo = this.configFileExistenceInfoCache.get(canonicalConfigFilePath);
@@ -1178,7 +1178,7 @@ namespace ts.server {
11781178
!this.getConfiguredProjectByCanonicalConfigFilePath(canonicalConfigFilePath)) {
11791179
this.createConfigFileWatcherOfConfigFileExistence(configFileName, canonicalConfigFilePath, configFileExistenceInfo);
11801180
}
1181-
}, projectRootPath);
1181+
});
11821182
}
11831183

11841184
/**
@@ -1209,12 +1209,14 @@ namespace ts.server {
12091209
* The server must start searching from the directory containing
12101210
* the newly opened file.
12111211
*/
1212-
private forEachConfigFileLocation(info: ScriptInfo,
1213-
action: (configFileName: NormalizedPath, canonicalConfigFilePath: string) => boolean | void,
1214-
projectRootPath?: NormalizedPath) {
1215-
let searchPath = asNormalizedPath(getDirectoryPath(info.fileName));
1216-
1217-
while (!projectRootPath || containsPath(projectRootPath, searchPath, this.currentDirectory, !this.host.useCaseSensitiveFileNames)) {
1212+
private forEachConfigFileLocation(info: ScriptInfo, action: (configFileName: NormalizedPath, canonicalConfigFilePath: string) => boolean | void) {
1213+
const projectRootPath = this.openFiles.get(info.path);
1214+
let searchPath = asNormalizedPath(this.getNormalizedAbsolutePath(getDirectoryPath(info.fileName)));
1215+
const isSearchPathInProjectRoot = () => containsPath(projectRootPath, searchPath, this.currentDirectory, !this.host.useCaseSensitiveFileNames);
1216+
1217+
// If projectRootPath doesnt contain info.path, then do normal search for config file
1218+
const anySearchPathOk = !projectRootPath || !isSearchPathInProjectRoot();
1219+
do {
12181220
const canonicalSearchPath = normalizedPathToPath(searchPath, this.currentDirectory, this.toCanonicalFileName);
12191221
const tsconfigFileName = asNormalizedPath(combinePaths(searchPath, "tsconfig.json"));
12201222
let result = action(tsconfigFileName, combinePaths(canonicalSearchPath, "tsconfig.json"));
@@ -1233,7 +1235,7 @@ namespace ts.server {
12331235
break;
12341236
}
12351237
searchPath = parentPath;
1236-
}
1238+
} while (anySearchPathOk || isSearchPathInProjectRoot());
12371239

12381240
return undefined;
12391241
}
@@ -1246,13 +1248,12 @@ namespace ts.server {
12461248
* The server must start searching from the directory containing
12471249
* the newly opened file.
12481250
*/
1249-
private getConfigFileNameForFile(info: ScriptInfo, projectRootPath: NormalizedPath | undefined) {
1251+
private getConfigFileNameForFile(info: ScriptInfo) {
12501252
Debug.assert(info.isScriptOpen());
12511253
this.logger.info(`Search path: ${getDirectoryPath(info.fileName)}`);
12521254
const configFileName = this.forEachConfigFileLocation(info,
12531255
(configFileName, canonicalConfigFilePath) =>
1254-
this.configFileExists(configFileName, canonicalConfigFilePath, info),
1255-
projectRootPath
1256+
this.configFileExists(configFileName, canonicalConfigFilePath, info)
12561257
);
12571258
if (configFileName) {
12581259
this.logger.info(`For info: ${info.fileName} :: Config file name: ${configFileName}`);
@@ -1906,7 +1907,7 @@ namespace ts.server {
19061907
// we first detect if there is already a configured project created for it: if so,
19071908
// we re- read the tsconfig file content and update the project only if we havent already done so
19081909
// otherwise we create a new one.
1909-
const configFileName = this.getConfigFileNameForFile(info, this.openFiles.get(path));
1910+
const configFileName = this.getConfigFileNameForFile(info);
19101911
if (configFileName) {
19111912
const project = this.findConfiguredProjectByProjectName(configFileName);
19121913
if (!project) {
@@ -2012,9 +2013,10 @@ namespace ts.server {
20122013
let configFileErrors: ReadonlyArray<Diagnostic>;
20132014

20142015
const info = this.getOrCreateScriptInfoOpenedByClientForNormalizedPath(fileName, projectRootPath ? this.getNormalizedAbsolutePath(projectRootPath) : this.currentDirectory, fileContent, scriptKind, hasMixedContent);
2016+
this.openFiles.set(info.path, projectRootPath);
20152017
let project: ConfiguredProject | ExternalProject = this.findExternalProjetContainingOpenScriptInfo(info);
20162018
if (!project) {
2017-
configFileName = this.getConfigFileNameForFile(info, projectRootPath);
2019+
configFileName = this.getConfigFileNameForFile(info);
20182020
if (configFileName) {
20192021
project = this.findConfiguredProjectByProjectName(configFileName);
20202022
if (!project) {
@@ -2047,7 +2049,6 @@ namespace ts.server {
20472049
}
20482050

20492051
Debug.assert(!info.isOrphan());
2050-
this.openFiles.set(info.path, projectRootPath);
20512052

20522053
// Remove the configured projects that have zero references from open files.
20532054
// This was postponed from closeOpenFile to after opening next file,

‎src/server/project.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1200,7 +1200,7 @@ namespace ts.server {
12001200

12011201
addRoot(info: ScriptInfo) {
12021202
Debug.assert(info.isScriptOpen());
1203-
this.projectService.startWatchingConfigFilesForInferredProjectRoot(info, this.projectService.openFiles.get(info.path));
1203+
this.projectService.startWatchingConfigFilesForInferredProjectRoot(info);
12041204
if (!this._isJsInferredProject && info.isJavaScript()) {
12051205
this.toggleJsInferredProject(/*isJsInferredProject*/ true);
12061206
}

‎tests/baselines/reference/api/tsserverlibrary.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7891,7 +7891,7 @@ declare namespace ts.server {
78917891
* The server must start searching from the directory containing
78927892
* the newly opened file.
78937893
*/
7894-
private forEachConfigFileLocation(info, action, projectRootPath?);
7894+
private forEachConfigFileLocation(info, action);
78957895
/**
78967896
* This function tries to search for a tsconfig.json for the given file.
78977897
* This is different from the method the compiler uses because
@@ -7900,7 +7900,7 @@ declare namespace ts.server {
79007900
* The server must start searching from the directory containing
79017901
* the newly opened file.
79027902
*/
7903-
private getConfigFileNameForFile(info, projectRootPath);
7903+
private getConfigFileNameForFile(info);
79047904
private printProjects();
79057905
private findConfiguredProjectByProjectName(configFileName);
79067906
private getConfiguredProjectByCanonicalConfigFilePath(canonicalConfigFilePath);

0 commit comments

Comments
 (0)