Report error when cannot read file (microsoft#37611)

This also consolidates helper for readFile failure

Author: sheetalkamat

src/compiler/commandLineParser.ts

@@ -1242,10 +1242,9 @@ namespace ts {
         }
 
         function parseResponseFile(fileName: string) {
-            const text = readFile ? readFile(fileName) : sys.readFile(fileName);
-
-            if (!text) {
-                errors.push(createCompilerDiagnostic(Diagnostics.File_0_not_found, fileName));
+            const text = tryReadFile(fileName, readFile || (fileName => sys.readFile(fileName)));
+            if (!isString(text)) {
+                errors.push(text);
                 return;
             }
 
@@ -1466,18 +1465,9 @@ namespace ts {
         extendedConfigCache?: Map<ExtendedConfigCacheEntry>,
         watchOptionsToExtend?: WatchOptions
     ): ParsedCommandLine | undefined {
-        let configFileText: string | undefined;
-        try {
-            configFileText = host.readFile(configFileName);
-        }
-        catch (e) {
-            const error = createCompilerDiagnostic(Diagnostics.Cannot_read_file_0_Colon_1, configFileName, e.message);
-            host.onUnRecoverableConfigFileDiagnostic(error);
-            return undefined;
-        }
-        if (!configFileText) {
-            const error = createCompilerDiagnostic(Diagnostics.File_0_not_found, configFileName);
-            host.onUnRecoverableConfigFileDiagnostic(error);
+        const configFileText = tryReadFile(configFileName, fileName => host.readFile(fileName));
+        if (!isString(configFileText)) {
+            host.onUnRecoverableConfigFileDiagnostic(configFileText);
             return undefined;
         }
 
@@ -1530,15 +1520,16 @@ namespace ts {
         return isString(textOrDiagnostic) ? parseJsonText(fileName, textOrDiagnostic) : <TsConfigSourceFile>{ parseDiagnostics: [textOrDiagnostic] };
     }
 
-    function tryReadFile(fileName: string, readFile: (path: string) => string | undefined): string | Diagnostic {
+    /*@internal*/
+    export function tryReadFile(fileName: string, readFile: (path: string) => string | undefined): string | Diagnostic {
         let text: string | undefined;
         try {
             text = readFile(fileName);
         }
         catch (e) {
             return createCompilerDiagnostic(Diagnostics.Cannot_read_file_0_Colon_1, fileName, e.message);
         }
-        return text === undefined ? createCompilerDiagnostic(Diagnostics.The_specified_path_does_not_exist_Colon_0, fileName) : text;
+        return text === undefined ? createCompilerDiagnostic(Diagnostics.Cannot_read_file_0, fileName) : text;
     }
 
     function commandLineOptionsToMap(options: readonly CommandLineOption[]) {

src/compiler/diagnosticMessages.json

@@ -3461,6 +3461,10 @@
         "category": "Error",
         "code": 5082
     },
+    "Cannot read file '{0}'.": {
+        "category": "Error",
+        "code": 5083
+    },
 
     "Generates a sourcemap for each corresponding '.d.ts' file.": {
         "category": "Message",

src/server/editorServices.ts

@@ -1974,13 +1974,13 @@ namespace ts.server {
             // Read updated contents from disk
             const configFilename = normalizePath(project.getConfigFilePath());
 
-            const configFileContent = this.host.readFile(configFilename) || "";
-
-            const result = parseJsonText(configFilename, configFileContent);
+            const configFileContent = tryReadFile(configFilename, fileName => this.host.readFile(fileName));
+            const result = parseJsonText(configFilename, isString(configFileContent) ? configFileContent : "");
             if (!result.endOfFileToken) {
                 result.endOfFileToken = <EndOfFileToken>{ kind: SyntaxKind.EndOfFileToken };
             }
             const configFileErrors = result.parseDiagnostics as Diagnostic[];
+            if (!isString(configFileContent)) configFileErrors.push(configFileContent);
             const parsedCommandLine = parseJsonSourceFileConfigFileContent(
                 result,
                 project.getCachedDirectoryStructureHost(),

src/testRunner/unittests/tsserver/configuredProjects.ts

@@ -1245,15 +1245,26 @@ declare var console: {
                 content: "let t = 10;"
             };
 
-            const host = createServerHost([file1, configFile]);
-            const projectService = createProjectService(host);
+            const host = createServerHost([file1, libFile, configFile]);
+            const { session, events } = createSessionWithEventTracking<server.ConfigFileDiagEvent>(host, server.ConfigFileDiagEvent);
             const originalReadFile = host.readFile;
             host.readFile = f => {
                 return f === configFile.path ?
                     undefined :
                     originalReadFile.call(host, f);
             };
-            projectService.openClientFile(file1.path);
+            openFilesForSession([file1], session);
+
+            assert.deepEqual(events, [{
+                eventName: server.ConfigFileDiagEvent,
+                data: {
+                    triggerFile: file1.path,
+                    configFileName: configFile.path,
+                    diagnostics: [
+                        createCompilerDiagnostic(Diagnostics.Cannot_read_file_0, configFile.path)
+                    ]
+                }
+            }]);
         });
     });
 }

tests/baselines/reference/tsbuild/configFileErrors/initial-build/when-tsconfig-extends-the-missing-file.js

@@ -1,10 +1,10 @@
 //// [/lib/initial-buildOutput.txt]
 /lib/tsc --b /src/tsconfig.json
-[91merror[0m[90m TS5058: [0mThe specified path does not exist: '/src/foobar.json'.
+[91merror[0m[90m TS5083: [0mCannot read file '/src/foobar.json'.
 
 error TS18003: No inputs were found in config file '/src/tsconfig.first.json'. Specified 'include' paths were '["**/*"]' and 'exclude' paths were '[]'.
 
-[91merror[0m[90m TS5058: [0mThe specified path does not exist: '/src/foobar.json'.
+[91merror[0m[90m TS5083: [0mCannot read file '/src/foobar.json'.
 
 error TS18003: No inputs were found in config file '/src/tsconfig.second.json'. Specified 'include' paths were '["**/*"]' and 'exclude' paths were '[]'.
 

tests/baselines/reference/tsbuild/exitCodeOnBogusFile/initial-build/test-exit-code.js

@@ -1,6 +1,6 @@
 //// [/lib/initial-buildOutput.txt]
 /lib/tsc -b bogus.json
-[91merror[0m[90m TS6053: [0mFile '/bogus.json' not found.
+[91merror[0m[90m TS5083: [0mCannot read file '/bogus.json'.
 
 
 Found 1 error.

tests/baselines/reference/tsbuild/watchMode/programUpdates/watches-config-files-that-are-not-present.js

@@ -146,7 +146,7 @@ Output::
 [12:00:37 AM] Starting compilation in watch mode...
 
 
-[91merror[0m[90m TS6053: [0mFile '/user/username/projects/sample1/logic/tsconfig.json' not found.
+[91merror[0m[90m TS5083: [0mCannot read file '/user/username/projects/sample1/logic/tsconfig.json'.
 
 
 [12:00:52 AM] Found 1 error. Watching for file changes.

tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js

@@ -80,7 +80,7 @@ Output::
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
 
-[91merror[0m[90m TS6053: [0mFile '/a/b/tsconfig.json' not found.
+[91merror[0m[90m TS5083: [0mCannot read file '/a/b/tsconfig.json'.