Skip to content

Commit

Permalink
Revert "Search ancestor and its references for default projects (#57196…
Browse files Browse the repository at this point in the history 
…)"

This reverts commit e6add98.
  • Loading branch information
@sheetalkamat
sheetalkamat committed Aug 14, 2024
1 parent 3a43940 commit bce0272
Show file tree
Hide file tree
Showing 121 changed files with 3,861 additions and 8,235 deletions.
124 changes: 25 additions & 99 deletions src/server/editorServices.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import {
DocumentRegistry,
DocumentRegistryBucketKeyWithMode,
emptyOptions,
endsWith,
ensureTrailingDirectorySeparator,
equateStringsCaseInsensitive,
equateStringsCaseSensitive,
Expand Down Expand Up @@ -645,37 +644,10 @@ export interface ProjectServiceOptions {
*/
export type ConfigFileName = NormalizedPath | false;

/**
* Stores cached config file name for info as well as ancestor so is a map
* Key is false for Open ScriptInfo
* Key is NormalizedPath for Config file name
* @internal
*/
export type ConfigFileMapForOpenFile = Map<ConfigFileName, ConfigFileName>;

/**
* The cache for open script info will have
* ConfigFileName or false if ancestors are not looked up
* Map if ancestors are looked up
* @internal
*/
export type ConfigFileForOpenFile = ConfigFileName | ConfigFileMapForOpenFile;

/** Gets cached value of config file name based on open script info or ancestor script info */
function getConfigFileNameFromCache(info: OpenScriptInfoOrClosedOrConfigFileInfo, cache: Map<Path, ConfigFileForOpenFile> | undefined): ConfigFileName | undefined {
if (!cache) return undefined;
const configFileForOpenFile = cache.get(info.path);
if (configFileForOpenFile === undefined) return undefined;
if (!isAncestorConfigFileInfo(info)) {
return isString(configFileForOpenFile) || !configFileForOpenFile ?
configFileForOpenFile : // direct result
configFileForOpenFile.get(/*key*/ false); // Its a map, use false as the key for the info's config file name
}
else {
return configFileForOpenFile && !isString(configFileForOpenFile) ? // Map with fileName as key
configFileForOpenFile.get(info.fileName) :
undefined; // No result for the config file name
}
function getConfigFileNameFromCache(info: OpenScriptInfoOrClosedOrConfigFileInfo, cache: Map<Path, ConfigFileName> | undefined): ConfigFileName | undefined {
if (!cache || isAncestorConfigFileInfo(info)) return undefined;
return cache.get(info.path);
}

/** @internal */
Expand All @@ -690,7 +662,6 @@ export interface AncestorConfigFileInfo {
/** path of open file so we can look at correct root */
path: Path;
configFileInfo: true;
isForDefaultProject: boolean;
}
/** @internal */
export type OpenScriptInfoOrClosedFileInfo = ScriptInfo | OriginalFileInfo;
Expand Down Expand Up @@ -739,8 +710,6 @@ function forEachAncestorProject<T>(
allowDeferredClosed: boolean | undefined,
/** Used with ConfiguredProjectLoadKind.Reload to check if this project was already reloaded */
reloadedProjects: Set<ConfiguredProject> | undefined,
/** true means we are looking for solution, so we can stop if found project is not composite to go into parent solution */
searchOnlyPotentialSolution: boolean,
/** Used with ConfiguredProjectLoadKind.Reload to specify delay reload, and also a set of configured projects already marked for delay load */
delayReloadedConfiguredProjects?: Set<ConfiguredProject>,
): T | undefined {
Expand All @@ -750,10 +719,7 @@ function forEachAncestorProject<T>(
if (
!project.isInitialLoadPending() &&
(
(searchOnlyPotentialSolution && !project.getCompilerOptions().composite) ||
// Currently disableSolutionSearching is shared for finding solution/project when
// - loading solution for find all references
// - trying to find default project
!project.getCompilerOptions().composite ||
project.getCompilerOptions().disableSolutionSearching
)
) return;
Expand All @@ -763,7 +729,6 @@ function forEachAncestorProject<T>(
fileName: project.getConfigFilePath(),
path: info.path,
configFileInfo: true,
isForDefaultProject: !searchOnlyPotentialSolution,
}, kind === ConfiguredProjectLoadKind.Find);
if (!configFileName) return;

Expand All @@ -773,9 +738,9 @@ function forEachAncestorProject<T>(
kind,
reason,
allowDeferredClosed,
!searchOnlyPotentialSolution ? info.fileName : undefined, // Config Diag event for project if its for default project
/*triggerFile*/ undefined,
reloadedProjects,
searchOnlyPotentialSolution, // Delay load if we are searching for solution
/*delayLoad*/ true,
delayReloadedConfiguredProjects,
);
if (!ancestor) return;
Expand Down Expand Up @@ -1241,7 +1206,7 @@ export class ProjectService {
*/
readonly openFiles: Map<Path, NormalizedPath | undefined> = new Map<Path, NormalizedPath | undefined>();
/** Config files looked up and cached config files for open script info */
private readonly configFileForOpenFiles = new Map<Path, ConfigFileForOpenFile>();
private readonly configFileForOpenFiles = new Map<Path, ConfigFileName>();
/** Set of open script infos that are root of inferred project */
private rootOfInferredProjects = new Set<ScriptInfo>();
/**
Expand Down Expand Up @@ -1280,7 +1245,7 @@ export class ProjectService {
* All the open script info that needs recalculation of the default project,
* this also caches config file info before config file change was detected to use it in case projects are not updated yet
*/
private pendingOpenFileProjectUpdates?: Map<Path, ConfigFileForOpenFile>;
private pendingOpenFileProjectUpdates?: Map<Path, ConfigFileName>;
/** @internal */
pendingEnsureProjectForOpenFiles = false;

Expand Down Expand Up @@ -2290,7 +2255,7 @@ export class ProjectService {
const configFileExistenceInfo = this.configFileExistenceInfoCache.get(canonicalConfigFilePath);

let openFilesImpactedByConfigFile: Set<Path> | undefined;
if (this.openFiles.has(info.path) && (!isAncestorConfigFileInfo(info) || info.isForDefaultProject)) {
if (this.openFiles.has(info.path) && !isAncestorConfigFileInfo(info)) {
// By default the info would get impacted by presence of config file since its in the detection path
// Only adding the info as a root to inferred project will need the existence to be watched by file watcher
if (configFileExistenceInfo) (configFileExistenceInfo.openFilesImpactedByConfigFile ??= new Set()).add(info.path);
Expand Down Expand Up @@ -2483,39 +2448,31 @@ export class ProjectService {

// If projectRootPath doesn't contain info.path, then do normal search for config file
const anySearchPathOk = !projectRootPath || !isSearchPathInProjectRoot();

let searchTsconfig = true;
let searchJsconfig = true;
if (isAncestorConfigFileInfo(info)) {
// For ancestor of config file always ignore itself
if (endsWith(info.fileName, "tsconfig.json")) searchTsconfig = false;
else searchTsconfig = searchJsconfig = false;
}
// For ancestor of config file always ignore its own directory since its going to result in itself
let searchInDirectory = !isAncestorConfigFileInfo(info);
do {
const canonicalSearchPath = normalizedPathToPath(searchPath, this.currentDirectory, this.toCanonicalFileName);
if (searchTsconfig) {
if (searchInDirectory) {
const canonicalSearchPath = normalizedPathToPath(searchPath, this.currentDirectory, this.toCanonicalFileName);
const tsconfigFileName = asNormalizedPath(combinePaths(searchPath, "tsconfig.json"));
const result = action(combinePaths(canonicalSearchPath, "tsconfig.json") as NormalizedPath, tsconfigFileName);
let result = action(combinePaths(canonicalSearchPath, "tsconfig.json") as NormalizedPath, tsconfigFileName);
if (result) return tsconfigFileName;
}

if (searchJsconfig) {
const jsconfigFileName = asNormalizedPath(combinePaths(searchPath, "jsconfig.json"));
const result = action(combinePaths(canonicalSearchPath, "jsconfig.json") as NormalizedPath, jsconfigFileName);
result = action(combinePaths(canonicalSearchPath, "jsconfig.json") as NormalizedPath, jsconfigFileName);
if (result) return jsconfigFileName;
}

// If we started within node_modules, don't look outside node_modules.
// Otherwise, we might pick up a very large project and pull in the world,
// causing an editor delay.
if (isNodeModulesDirectory(canonicalSearchPath)) {
break;
// If we started within node_modules, don't look outside node_modules.
// Otherwise, we might pick up a very large project and pull in the world,
// causing an editor delay.
if (isNodeModulesDirectory(canonicalSearchPath)) {
break;
}
}

const parentPath = asNormalizedPath(getDirectoryPath(searchPath));
if (parentPath === searchPath) break;
searchPath = parentPath;
searchTsconfig = searchJsconfig = true;
searchInDirectory = true;
}
while (anySearchPathOk || isSearchPathInProjectRoot());

Expand Down Expand Up @@ -2550,24 +2507,8 @@ export class ProjectService {
configFileName: NormalizedPath | undefined,
) {
if (!this.openFiles.has(info.path)) return; // Dont cache for closed script infos
const config = configFileName || false;
if (!isAncestorConfigFileInfo(info)) {
// Set value for open script info
this.configFileForOpenFiles.set(info.path, config);
}
else {
// Need to set value for ancestor in ConfigFileMapForOpenFile
let configFileForOpenFile = this.configFileForOpenFiles.get(info.path)!;
if (!configFileForOpenFile || isString(configFileForOpenFile)) {
// We have value for open script info in cache, make a map with that as false key and set new vlaue
this.configFileForOpenFiles.set(
info.path,
configFileForOpenFile = new Map().set(false, configFileForOpenFile),
);
}
// Set value of for ancestor in the map
configFileForOpenFile.set(info.fileName, config);
}
if (isAncestorConfigFileInfo(info)) return; // Dont cache for ancestors
this.configFileForOpenFiles.set(info.path, configFileName || false);
}

/**
Expand Down Expand Up @@ -4293,8 +4234,7 @@ export class ProjectService {
function tryFindDefaultConfiguredProject(project: ConfiguredProject): ConfiguredProject | undefined {
return isDefaultProject(project) ?
defaultProject :
(tryFindDefaultConfiguredProjectFromReferences(project) ??
tryFindDefaultConfiguredProjectFromAncestor(project));
tryFindDefaultConfiguredProjectFromReferences(project);
}

function isDefaultProject(project: ConfiguredProject): ConfiguredProject | undefined {
Expand Down Expand Up @@ -4324,19 +4264,6 @@ export class ProjectService {
reloadedProjects,
);
}

function tryFindDefaultConfiguredProjectFromAncestor(project: ConfiguredProject) {
return forEachAncestorProject( // If not in referenced projects, try ancestors and its references
info,
project,
tryFindDefaultConfiguredProject,
kind,
`Creating possible configured project for ${info.fileName} to open`,
allowDeferredClosed,
reloadedProjects,
/*searchOnlyPotentialSolution*/ false,
);
}
}

/**
Expand Down Expand Up @@ -4381,7 +4308,6 @@ export class ProjectService {
`Creating project possibly referencing default composite project ${defaultProject.getProjectName()} of open file ${info.fileName}`,
allowDeferredClosed,
reloadedProjects,
/*searchOnlyPotentialSolution*/ true,
delayReloadedConfiguredProjects,
);
}
Expand Down
1 change: 0 additions & 1 deletion ...gured-file-update-buts-its-open-file-references-are-all-closed-when-the-update-happens.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ Info seq [hh:mm:ss:mss] request:
"type": "request"
}
Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /a/b/src/file2.ts ProjectRootPath: undefined:: Result: /a/b/tsconfig.json
Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /a/b/tsconfig.json ProjectRootPath: undefined:: Result: undefined
Info seq [hh:mm:ss:mss] event:
{
"seq": 0,
Expand Down
1 change: 0 additions & 1 deletion ...red-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ Info seq [hh:mm:ss:mss] request:
"type": "request"
}
Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /a/b/src/file2.ts ProjectRootPath: undefined:: Result: /a/b/tsconfig.json
Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /a/b/tsconfig.json ProjectRootPath: undefined:: Result: undefined
Info seq [hh:mm:ss:mss] event:
{
"seq": 0,
Expand Down
3 changes: 0 additions & 3 deletions ...rver/configuredProjects/add-and-then-remove-a-config-file-in-a-folder-with-loose-files.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@ Info seq [hh:mm:ss:mss] FileName: /user/username/projects/myproject/commonFile
Info seq [hh:mm:ss:mss] Projects: /user/username/projects/myproject/tsconfig.json
Info seq [hh:mm:ss:mss] FileName: /user/username/projects/myproject/commonFile2.ts ProjectRootPath: undefined
Info seq [hh:mm:ss:mss] Projects: /dev/null/inferredProject2*
Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined
Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 2 projectProgramVersion: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
Expand Down Expand Up @@ -646,7 +645,6 @@ Info seq [hh:mm:ss:mss] FileName: /user/username/projects/myproject/commonFile
Info seq [hh:mm:ss:mss] Projects: /dev/null/inferredProject1*,/user/username/projects/myproject/tsconfig.json
Info seq [hh:mm:ss:mss] FileName: /user/username/projects/myproject/commonFile2.ts ProjectRootPath: undefined
Info seq [hh:mm:ss:mss] Projects: /dev/null/inferredProject2*
Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined
Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 4 projectProgramVersion: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
Expand Down Expand Up @@ -1596,7 +1594,6 @@ Info seq [hh:mm:ss:mss] FileName: /user/username/projects/myproject/commonFile
Info seq [hh:mm:ss:mss] Projects: /user/username/projects/myproject/tsconfig.json
Info seq [hh:mm:ss:mss] FileName: /user/username/projects/myproject/commonFile2.ts ProjectRootPath: undefined
Info seq [hh:mm:ss:mss] Projects: /dev/null/inferredProject4*
Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined
Info seq [hh:mm:ss:mss] After ensureProjectForOpenFiles:
Info seq [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
Info seq [hh:mm:ss:mss] Files (2)
Expand Down
Loading

0 comments on commit bce0272

Please sign in to comment.