Merge pull request #23408 from Microsoft/autoPretty

DanielRosenwasser · web-flow · commit 6ee4989674e8 · 2018-04-18T23:10:02.000-07:00
--pretty-er output by default
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -428,6 +428,7 @@ namespace ts {
         newLine: string;
         useCaseSensitiveFileNames: boolean;
         write(s: string): void;
+        writeOutputIsTTY?(): boolean;
         readFile(path: string, encoding?: string): string | undefined;
         getFileSize?(path: string): number;
         writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
@@ -561,6 +562,9 @@ namespace ts {
                 write(s: string): void {
                     process.stdout.write(s);
                 },
+                writeOutputIsTTY() {
+                    return process.stdout.isTTY;
+                },
                 readFile,
                 writeFile,
                 watchFile: getWatchFile(),
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -19,11 +19,18 @@ namespace ts {
 
     let reportDiagnostic = createDiagnosticReporter(sys);
     function updateReportDiagnostic(options: CompilerOptions) {
-        if (options.pretty) {
+        if (shouldBePretty(options)) {
             reportDiagnostic = createDiagnosticReporter(sys, /*pretty*/ true);
         }
     }
 
+    function shouldBePretty(options: CompilerOptions) {
+        if (typeof options.pretty === "undefined") {
+            return !!sys.writeOutputIsTTY && sys.writeOutputIsTTY();
+        }
+        return options.pretty;
+    }
+
     function padLeft(s: string, length: number) {
         while (s.length < length) {
             s = " " + s;
@@ -159,7 +166,7 @@ namespace ts {
     }
 
     function createWatchStatusReporter(options: CompilerOptions) {
-        return ts.createWatchStatusReporter(sys, !!options.pretty);
+        return ts.createWatchStatusReporter(sys, shouldBePretty(options));
     }
 
     function createWatchOfConfigFile(configParseResult: ParsedCommandLine, optionsToExtend: CompilerOptions) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -4195,7 +4195,7 @@ namespace ts {
         preserveSymlinks?: boolean;
         /* @internal */ preserveWatchOutput?: boolean;
         project?: string;
-        /* @internal */ pretty?: DiagnosticStyle;
+        /* @internal */ pretty?: boolean;
         reactNamespace?: string;
         jsxFactory?: string;
         removeComments?: boolean;
@@ -4293,12 +4293,6 @@ namespace ts {
         JSX,
     }
 
-    /* @internal */
-    export const enum DiagnosticStyle {
-        Simple,
-        Pretty,
-    }
-
     /** Either a parsed command line or a parsed tsconfig.json */
     export interface ParsedCommandLine {
         options: CompilerOptions;
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -2889,6 +2889,7 @@ declare namespace ts {
         newLine: string;
         useCaseSensitiveFileNames: boolean;
         write(s: string): void;
+        writeOutputIsTTY?(): boolean;
         readFile(path: string, encoding?: string): string | undefined;
         getFileSize?(path: string): number;
         writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -2889,6 +2889,7 @@ declare namespace ts {
         newLine: string;
         useCaseSensitiveFileNames: boolean;
         write(s: string): void;
+        writeOutputIsTTY?(): boolean;
         readFile(path: string, encoding?: string): string | undefined;
         getFileSize?(path: string): number;
         writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;

Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,18 @@ namespace ts {`
`19`	`19`
`20`	`20`	`let reportDiagnostic = createDiagnosticReporter(sys);`
`21`	`21`	`function updateReportDiagnostic(options: CompilerOptions) {`
`22`		`- if (options.pretty) {`
	`22`	`+ if (shouldBePretty(options)) {`
`23`	`23`	`reportDiagnostic = createDiagnosticReporter(sys, /pretty/ true);`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ function shouldBePretty(options: CompilerOptions) {`
	`28`	`+ if (typeof options.pretty === "undefined") {`
	`29`	`+ return !!sys.writeOutputIsTTY && sys.writeOutputIsTTY();`
	`30`	`+ }`
	`31`	`+ return options.pretty;`
	`32`	`+ }`
	`33`	`+`
`27`	`34`	`function padLeft(s: string, length: number) {`
`28`	`35`	`while (s.length < length) {`
`29`	`36`	`s = " " + s;`
`@@ -159,7 +166,7 @@ namespace ts {`
`159`	`166`	`}`
`160`	`167`
`161`	`168`	`function createWatchStatusReporter(options: CompilerOptions) {`
`162`		`- return ts.createWatchStatusReporter(sys, !!options.pretty);`
	`169`	`+ return ts.createWatchStatusReporter(sys, shouldBePretty(options));`
`163`	`170`	`}`
`164`	`171`
`165`	`172`	`function createWatchOfConfigFile(configParseResult: ParsedCommandLine, optionsToExtend: CompilerOptions) {`