Include both fileName and path, and use in more places

Author: Andy Hanson

src/server/editorServices.ts

@@ -867,7 +867,13 @@ namespace ts.server {
         private doEnsureDefaultProjectForFile(fileName: NormalizedPath): Project {
             this.ensureProjectStructuresUptoDate();
             const scriptInfo = this.getScriptInfoForNormalizedPath(fileName);
-            return scriptInfo ? scriptInfo.getDefaultProject() : Errors.ThrowNoProject();
+            if (scriptInfo) {
+                return scriptInfo.getDefaultProject();
+            }
+            else {
+                this.logger.msg(`Cannot find ${fileName} in ${JSON.stringify(this.allScriptInfoFileNamesForDebug)}`, Msg.Err);
+                return Errors.ThrowNoProject();
+            }
         }
 
         getScriptInfoEnsuringProjectsUptoDate(uncheckedFileName: string) {
@@ -1967,8 +1973,12 @@ namespace ts.server {
         }
 
         /* @internal */
-        allScriptInfoFileNamesForDebug(): ReadonlyArray<string> {
-            return arrayFrom(this.filenameToScriptInfo.keys());
+        allScriptInfoFileNamesForDebug(): ReadonlyArray<{ readonly path: string, readonly fileName: string }> {
+            const out: { readonly path: string, readonly fileName: string }[] = [];
+            this.filenameToScriptInfo.forEach((scriptInfo, path) => {
+                out.push({ path, fileName: scriptInfo.fileName });
+            });
+            return out;
         }
 
         /**

src/server/session.ts

@@ -1157,19 +1157,27 @@ namespace ts.server {
                     this.projectService.getScriptInfoEnsuringProjectsUptoDate(args.file) :
                     this.projectService.getScriptInfo(args.file);
                 if (!scriptInfo) {
-                    return ignoreNoProjectError ? emptyArray : Errors.ThrowNoProject();
+                    if (ignoreNoProjectError) return emptyArray;
+                    this.logErrorForScriptInfoNotFound(args.file);
+                    return Errors.ThrowNoProject();
                 }
                 projects = scriptInfo.containingProjects;
                 symLinkedProjects = this.projectService.getSymlinkedProjects(scriptInfo);
             }
             // filter handles case when 'projects' is undefined
             projects = filter(projects, p => p.languageServiceEnabled && !p.isOrphan());
             if (!ignoreNoProjectError && (!projects || !projects.length) && !symLinkedProjects) {
+                this.logErrorForScriptInfoNotFound(args.file);
                 return Errors.ThrowNoProject();
             }
             return symLinkedProjects ? { projects: projects!, symLinkedProjects } : projects!; // TODO: GH#18217
         }
 
+        private logErrorForScriptInfoNotFound(fileName: string): void {
+            this.logger.msg(`Could not find file ${JSON.stringify(fileName)}.\n` +
+                `All files are: ${JSON.stringify(this.projectService.allScriptInfoFileNamesForDebug())}`, Msg.Err);
+        }
+
         private getDefaultProject(args: protocol.FileRequestArgs) {
             if (args.projectFileName) {
                 const project = this.getProject(args.projectFileName);
@@ -1912,8 +1920,7 @@ namespace ts.server {
             const scriptInfo = this.projectService.getScriptInfoOrConfig(textChanges.fileName);
             if (!!textChanges.isNewFile === !!scriptInfo) {
                 if (!scriptInfo) { // and !isNewFile
-                    this.logger.msg(`Could not find file ${JSON.stringify(textChanges.fileName)} and 'isNewFile' not set.\n` +
-                        `All files are: ${JSON.stringify(this.projectService.allScriptInfoFileNamesForDebug())}`, Msg.Err);
+                    this.logErrorForScriptInfoNotFound(textChanges.fileName);
                 }
                 Debug.fail("Expected isNewFile for (only) new files. " + JSON.stringify({ isNewFile: !!textChanges.isNewFile, hasScriptInfo: !!scriptInfo }));
             }

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

@@ -8826,6 +8826,7 @@ declare namespace ts.server {
         private getProjectInfoWorker;
         private getRenameInfo;
         private getProjects;
+        private logErrorForScriptInfoNotFound;
         private getDefaultProject;
         private getRenameLocations;
         private mapRenameInfo;