Remove changes to e getDefaultProjectForFile (now #25060)

Author: Andy Hanson

src/server/editorServices.ts

@@ -692,19 +692,17 @@ namespace ts.server {
             return this.findExternalProjectByProjectName(projectName) || this.findConfiguredProjectByProjectName(toNormalizedPath(projectName));
         }
 
-        getDefaultProjectForFile(fileName: NormalizedPath, ensureProject = false): Project | undefined {
-            const scriptInfo = this.getScriptInfoForNormalizedPath(fileName);
-            return scriptInfo && !scriptInfo.isOrphan() ? scriptInfo.getDefaultProject() : ensureProject ? this.doEnsureDefaultProjectForFile(fileName) : undefined;
-        }
-
-        ensureDefaultProjectForFile(fileName: NormalizedPath): Project {
-            return this.getDefaultProjectForFile(fileName) || this.doEnsureDefaultProjectForFile(fileName);
-        }
-
-        private doEnsureDefaultProjectForFile(fileName: NormalizedPath): Project {
-            this.ensureProjectStructuresUptoDate();
-            const scriptInfo = this.getScriptInfoForNormalizedPath(fileName);
-            return scriptInfo ? scriptInfo.getDefaultProject() : Errors.ThrowNoProject();
+        getDefaultProjectForFile(fileName: NormalizedPath, ensureProject: boolean): Project | undefined {
+            let scriptInfo = this.getScriptInfoForNormalizedPath(fileName);
+            if (ensureProject && (!scriptInfo || scriptInfo.isOrphan())) {
+                this.ensureProjectStructuresUptoDate();
+                scriptInfo = this.getScriptInfoForNormalizedPath(fileName);
+                if (!scriptInfo) {
+                    return Errors.ThrowNoProject();
+                }
+                return scriptInfo.getDefaultProject();
+            }
+            return scriptInfo && !scriptInfo.isOrphan() ? scriptInfo.getDefaultProject() : undefined;
         }
 
         /* @internal */

src/server/session.ts

@@ -1148,11 +1148,11 @@ namespace ts.server {
 
         private getFileAndProjectForFileRename(args: protocol.GetEditsForFileRenameRequestArgs): FileAndProject {
             const newFilePath = toNormalizedPath(args.newFilePath);
-            const newProject = this.projectService.getDefaultProjectForFile(newFilePath);
+            const newProject = this.projectService.getDefaultProjectForFile(newFilePath, /*ensureProject*/ false);
             if (newProject) return { file: newFilePath, project: newProject };
 
             const oldFilePath = toNormalizedPath(args.oldFilePath);
-            const oldProject = this.projectService.getDefaultProjectForFile(oldFilePath);
+            const oldProject = this.projectService.getDefaultProjectForFile(oldFilePath, /*ensureProject*/ false);
             if (oldProject) return { file: oldFilePath, project: oldProject };
 
             return Debug.assertDefined(this.projectService.tryGetSomeFileInDirectory(newFilePath) || this.projectService.tryGetSomeFileInDirectory(oldFilePath));
@@ -1162,7 +1162,7 @@ namespace ts.server {
             // Since this is syntactic operation, there should always be project for the file
             // we wouldnt have to ensure project but rather throw if we dont get project
             const file = toNormalizedPath(args.file);
-            const project = this.getProject(args.projectFileName) || this.projectService.getDefaultProjectForFile(file);
+            const project = this.getProject(args.projectFileName) || this.projectService.getDefaultProjectForFile(file, /*ensureProject*/ false);
             if (!project) {
                 return Errors.ThrowNoProject();
             }
@@ -1174,7 +1174,7 @@ namespace ts.server {
 
         private getFileAndProjectWorker(uncheckedFileName: string, projectFileName: string | undefined): { file: NormalizedPath, project: Project } {
             const file = toNormalizedPath(uncheckedFileName);
-            const project = this.getProject(projectFileName) || this.projectService.ensureDefaultProjectForFile(file);
+            const project = this.getProject(projectFileName) || this.projectService.getDefaultProjectForFile(file, /*ensureProject*/ true)!; // TODO: GH#18217
             return { file, project };
         }
 
@@ -1466,7 +1466,7 @@ namespace ts.server {
         private createCheckList(fileNames: string[], defaultProject?: Project): PendingErrorCheck[] {
             return mapDefined<string, PendingErrorCheck>(fileNames, uncheckedFileName => {
                 const fileName = toNormalizedPath(uncheckedFileName);
-                const project = defaultProject || this.projectService.getDefaultProjectForFile(fileName);
+                const project = defaultProject || this.projectService.getDefaultProjectForFile(fileName, /*ensureProject*/ false);
                 return project && { fileName, project };
             });
         }
@@ -1864,7 +1864,7 @@ namespace ts.server {
             const lowPriorityFiles: NormalizedPath[] = [];
             const veryLowPriorityFiles: NormalizedPath[] = [];
             const normalizedFileName = toNormalizedPath(fileName);
-            const project = this.projectService.ensureDefaultProjectForFile(normalizedFileName);
+            const project = this.projectService.getDefaultProjectForFile(normalizedFileName, /*ensureProject*/ true)!;
             for (const fileNameInProject of fileNamesInProject) {
                 if (this.getCanonicalFileName(fileNameInProject) === this.getCanonicalFileName(fileName)) {
                     highPriorityFiles.push(fileNameInProject);

src/testRunner/unittests/tsserverProjectSystem.ts

@@ -3097,7 +3097,7 @@ namespace ts.projectSystem {
             checkProjectRootFiles(project, [file.path]);
             checkProjectActualFiles(project, [file.path, libFile.path]);
 
-            assert.strictEqual(projectService.ensureDefaultProjectForFile(server.toNormalizedPath(file.path)), project);
+            assert.strictEqual(projectService.getDefaultProjectForFile(server.toNormalizedPath(file.path), /*ensureProject*/ true), project);
             const indexOfX = file.content.indexOf("x");
             assert.deepEqual(project.getLanguageService(/*ensureSynchronized*/ true).getQuickInfoAtPosition(file.path, indexOfX), {
                 kind: ScriptElementKind.variableElement,