Do not show the additional file/errors table when there's 1 file with many errors (microsoft#47345)

* Use relative paths for the end of compile report

* Have a tighter suffix for multiple errors in one file

* Review feedback

* Refactors, and adds color

* Update baselinies

Author: Orta Therox

src/compiler/diagnosticMessages.json

@@ -4165,7 +4165,6 @@
         "category": "Message",
         "code": 6041
     },
-    
     "Generates corresponding '.map' file.": {
         "category": "Message",
         "code": 6043
@@ -4949,7 +4948,7 @@
         "category": "Message",
         "code": 6259
     },
-    "Found {0} errors in 1 file.": {
+    "Found {0} errors in the same file, starting at: {1}": {
         "category": "Message",
         "code": 6260
     },

src/compiler/watch.ts

@@ -130,6 +130,15 @@ namespace ts {
             Diagnostics.Found_0_errors_Watching_for_file_changes;
     }
 
+    function prettyPathForFileError(error: ReportFileInError, cwd: string) {
+        const line = formatColorAndReset(":" + error.line, ForegroundColorEscapeSequences.Grey);
+        if (pathIsAbsolute(error.fileName) && pathIsAbsolute(cwd)) {
+            return getRelativePathFromDirectory(cwd, error.fileName, /* ignoreCase */ false) + line;
+        }
+
+        return error.fileName + line;
+    }
+
     export function getErrorSummaryText(
         errorCount: number,
         filesInError: readonly (ReportFileInError | undefined)[],
@@ -140,22 +149,27 @@ namespace ts {
         const nonNilFiles = filesInError.filter(fileInError => fileInError !== undefined);
         const distinctFileNamesWithLines = nonNilFiles.map(fileInError => `${fileInError!.fileName}:${fileInError!.line}`)
             .filter((value, index, self) => self.indexOf(value) === index);
+
+        const firstFileReference = nonNilFiles[0] && prettyPathForFileError(nonNilFiles[0], host.getCurrentDirectory());
+
         const d = errorCount === 1 ?
             createCompilerDiagnostic(
                 filesInError[0] !== undefined ?
                     Diagnostics.Found_1_error_in_1 :
                     Diagnostics.Found_1_error,
                 errorCount,
-                distinctFileNamesWithLines[0]) :
+                firstFileReference) :
             createCompilerDiagnostic(
                 distinctFileNamesWithLines.length === 0 ?
                     Diagnostics.Found_0_errors :
                     distinctFileNamesWithLines.length === 1 ?
-                        Diagnostics.Found_0_errors_in_1_file :
+                        Diagnostics.Found_0_errors_in_the_same_file_starting_at_Colon_1 :
                         Diagnostics.Found_0_errors_in_1_files,
                 errorCount,
-                distinctFileNamesWithLines.length);
-        return `${newLine}${flattenDiagnosticMessageText(d.messageText, newLine)}${newLine}${newLine}${errorCount > 1 ? createTabularErrorsDisplay(nonNilFiles, host) : ""}`;
+                distinctFileNamesWithLines.length === 1 ? firstFileReference : distinctFileNamesWithLines.length);
+
+        const suffix = distinctFileNamesWithLines.length > 1 ? createTabularErrorsDisplay(nonNilFiles, host) : "";
+        return `${newLine}${flattenDiagnosticMessageText(d.messageText, newLine)}${newLine}${newLine}${suffix}`;
     }
 
     function createTabularErrorsDisplay(filesInError: (ReportFileInError | undefined)[], host: HasCurrentDirectory) {
@@ -180,8 +194,8 @@ namespace ts {
                 " ".repeat(leftPaddingGoal - errorCountDigitsLength)
                 : "";
 
-            const relativePath = getRelativePathFromDirectory(host.getCurrentDirectory(), file!.fileName, /* ignoreCase */ false);
-            tabularData += `${leftPadding}${errorCount}  ${relativePath}:${file!.line}\n`;
+            const fileRef = prettyPathForFileError(file!, host.getCurrentDirectory());
+            tabularData += `${leftPadding}${errorCount}  ${fileRef}\n`;
         });
 
         return tabularData;

tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt

@@ -65,7 +65,5 @@
         }
     }
 
-Found 2 errors in 1 file.
+Found 2 errors in the same file, starting at: tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:22
 
-Errors  Files
-     2  tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:22

tests/baselines/reference/duplicateIdentifierRelatedSpans1.errors.txt

@@ -95,6 +95,6 @@
 Found 6 errors in 3 files.
 
 Errors  Files
-     2  tests/cases/compiler/file1.ts:1
-     2  tests/cases/compiler/file2.ts:1
-     2  tests/cases/compiler/file3.ts:1
+     2  tests/cases/compiler/file1.ts:1
+     2  tests/cases/compiler/file2.ts:1
+     2  tests/cases/compiler/file3.ts:1

tests/baselines/reference/duplicateIdentifierRelatedSpans2.errors.txt

@@ -48,5 +48,5 @@
 Found 2 errors in 2 files.
 
 Errors  Files
-     1  tests/cases/compiler/file1.ts:1
-     1  tests/cases/compiler/file2.ts:1
+     1  tests/cases/compiler/file1.ts:1
+     1  tests/cases/compiler/file2.ts:1

tests/baselines/reference/duplicateIdentifierRelatedSpans3.errors.txt

@@ -88,5 +88,5 @@
 Found 6 errors in 2 files.
 
 Errors  Files
-     3  tests/cases/compiler/file1.ts:2
-     3  tests/cases/compiler/file2.ts:2
+     3  tests/cases/compiler/file1.ts:2
+     3  tests/cases/compiler/file2.ts:2

tests/baselines/reference/duplicateIdentifierRelatedSpans4.errors.txt

@@ -50,5 +50,5 @@
 Found 2 errors in 2 files.
 
 Errors  Files
-     1  tests/cases/compiler/file1.ts:1
-     1  tests/cases/compiler/file2.ts:1
+     1  tests/cases/compiler/file1.ts:1
+     1  tests/cases/compiler/file2.ts:1

tests/baselines/reference/duplicateIdentifierRelatedSpans5.errors.txt

@@ -95,5 +95,5 @@
 Found 6 errors in 2 files.
 
 Errors  Files
-     3  tests/cases/compiler/file1.ts:3
-     3  tests/cases/compiler/file2.ts:4
+     3  tests/cases/compiler/file1.ts:3
+     3  tests/cases/compiler/file2.ts:4

tests/baselines/reference/duplicateIdentifierRelatedSpans6.errors.txt

@@ -95,5 +95,5 @@
 Found 6 errors in 2 files.
 
 Errors  Files
-     3  tests/cases/compiler/file1.ts:3
-     3  tests/cases/compiler/file2.ts:5
+     3  tests/cases/compiler/file1.ts:3
+     3  tests/cases/compiler/file2.ts:5

tests/baselines/reference/duplicateIdentifierRelatedSpans7.errors.txt

@@ -59,5 +59,5 @@
 Found 2 errors in 2 files.
 
 Errors  Files
-     1  tests/cases/compiler/file1.ts:1
-     1  tests/cases/compiler/file2.ts:3
+     1  tests/cases/compiler/file1.ts:1
+     1  tests/cases/compiler/file2.ts:3