Updates the color logic

Author: orta

src/executeCommandLine/executeCommandLine.ts

@@ -90,10 +90,7 @@ namespace ts {
     }
 
     function createColors(sys: System) {
-        // https://no-color.org
-        const supportsRicherColors = sys.getEnvironmentVariable("COLORTERM") === "truecolor" || sys.getEnvironmentVariable("TERM") === "xterm-256color";
-
-        const showColors = defaultIsPretty(sys);
+        const showColors = defaultIsPretty(sys) || !!sys.getEnvironmentVariable("NO_COLOR");
         if (!showColors) {
             return {
                 bold: (str: string) => str,
@@ -103,15 +100,30 @@ namespace ts {
             };
         }
 
+        // There are ~3 types of terminal color support: 16 colors, 256 and 16m colors
+        // If there is richer color support, e.g. 256+ we can use extended ANSI codes which are not just generic 'blue'
+        // but a 'lighter blue' which is closer to the blue in the TS logo.
+        const supportsRicherColors = sys.getEnvironmentVariable("COLORTERM") === "truecolor" || sys.getEnvironmentVariable("TERM") === "xterm-256color";
+
         function bold(str: string) {
             return `\x1b[1m${str}\x1b[22m`;
         }
         function blue(str: string) {
             if (supportsRicherColors) {
+                // https://jonasjacek.github.io/colors/ - SteelBlue3 ANSI 68
                 return `\x1B[38;5;68m${str}\x1B[39;49m`;
             }
             else {
-                return `\x1b[94m${str}\x1b[39m`;
+                // This should probably only hit both Console and Powershell on Windows, as anything more modern supports more colors.
+                // Those two colorthemes treat 'blue' as navy blue against a black background.
+                // https://en.wikipedia.org/wiki/ANSI_escape_code#3-bit_and_4-bit
+                const useThemeBlue = sys.getEnvironmentVariable("OS") && stringContains(sys.getEnvironmentVariable("OS").toLowerCase(), "windows");
+                if (useThemeBlue) {
+                    return `\x1b[44m${str}\x1b[39m`;
+                }
+                else {
+                    return `\x1b[94m${str}\x1b[39m`;
+                }
             }
         }
         function blueBackground(str: string) {

tests/baselines/reference/tsConfig/Default initialized TSConfig/tsconfig.json

@@ -49,7 +49,7 @@
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
     // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
-    // "noEmit": true,                                   /* Disable emitting file from a compilation. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
     // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */

tests/baselines/reference/tsConfig/Initialized TSConfig with advanced options/tsconfig.json

@@ -49,7 +49,7 @@
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
     // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
-    // "noEmit": true,                                   /* Disable emitting file from a compilation. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
     // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */

tests/baselines/reference/tsConfig/Initialized TSConfig with boolean value compiler options/tsconfig.json

@@ -49,7 +49,7 @@
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
     // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
-    // "noEmit": true,                                   /* Disable emitting file from a compilation. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
     // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */

tests/baselines/reference/tsConfig/Initialized TSConfig with enum value compiler options/tsconfig.json

@@ -49,7 +49,7 @@
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
     // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
-    // "noEmit": true,                                   /* Disable emitting file from a compilation. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
     // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */

tests/baselines/reference/tsConfig/Initialized TSConfig with files options/tsconfig.json

@@ -49,7 +49,7 @@
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
     // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
-    // "noEmit": true,                                   /* Disable emitting file from a compilation. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
     // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */

tests/baselines/reference/tsConfig/Initialized TSConfig with incorrect compiler option value/tsconfig.json

@@ -49,7 +49,7 @@
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
     // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
-    // "noEmit": true,                                   /* Disable emitting file from a compilation. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
     // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */

tests/baselines/reference/tsConfig/Initialized TSConfig with incorrect compiler option/tsconfig.json

@@ -49,7 +49,7 @@
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
     // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
-    // "noEmit": true,                                   /* Disable emitting file from a compilation. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
     // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */

tests/baselines/reference/tsConfig/Initialized TSConfig with list compiler options with enum value/tsconfig.json

@@ -49,7 +49,7 @@
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
     // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
-    // "noEmit": true,                                   /* Disable emitting file from a compilation. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
     // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */

tests/baselines/reference/tsConfig/Initialized TSConfig with list compiler options/tsconfig.json

@@ -49,7 +49,7 @@
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
     // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
-    // "noEmit": true,                                   /* Disable emitting file from a compilation. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
     // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */

tests/baselines/reference/tsc/runWithoutArgs/initial-build/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped-when-host-can't-provide-terminal-width.js

@@ -11,134 +11,134 @@ tsc: The TypeScript Compiler - Version FakeTSVersion
 
 COMMON COMMANDS
 
-  [34mtsc[39m
+  [94mtsc[39m
   Compiles the current project (tsconfig.json in the working directory.)
 
-  [34mtsc app.ts util.ts[39m
-  Ignoring tsconfig.json, compiles the specified files with default compiler options
+  [94mtsc app.ts util.ts[39m
+  Ignoring tsconfig.json, compiles the specified files with default compiler options.
 
-  [34mtsc -b[39m
+  [94mtsc -b[39m
   Build a composite project in the working directory.
 
-  [34mtsc --init[39m
+  [94mtsc --init[39m
   Creates a tsconfig.json with the recommended settings in the working directory.
 
-  [34mtsc -p .path/to/tsconfig.json[39m
-  Compiles the TypeScript project located at the specified path
+  [94mtsc -p ./path/to/tsconfig.json[39m
+  Compiles the TypeScript project located at the specified path.
 
-  [34mtsc --help --all[39m
+  [94mtsc --help --all[39m
   An expanded version of this information, showing all possible compiler options
 
-  [34mtsc --noEmit[39m
-  [34mtsc --target esnext[39m
-  Compiles the current project, with additional settings
+  [94mtsc --noEmit[39m
+  [94mtsc --target esnext[39m
+  Compiles the current project, with additional settings.
 
 COMMAND LINE FLAGS
 
-[34m--help, -h[39m
+[94m--help, -h[39m
 Print this message.
 
-[34m--watch, -w[39m
+[94m--watch, -w[39m
 Watch input files.
 
-[34m--all[39m
+[94m--all[39m
 Show all compiler options.
 
-[34m--version, -v[39m
+[94m--version, -v[39m
 Print the compiler's version.
 
-[34m--init[39m
+[94m--init[39m
 Initializes a TypeScript project and creates a tsconfig.json file.
 
-[34m--project, -p[39m
+[94m--project, -p[39m
 Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.
 
-[34m--build, -b[39m
+[94m--build, -b[39m
 Build one or more projects and their dependencies, if out of date
 
-[34m--showConfig[39m
+[94m--showConfig[39m
 Print the final configuration instead of building.
 
 COMMON COMPILER OPTIONS
 
-[34m--pretty[39m
-Enable color and formatting in output to make compiler errors easier to read
+[94m--pretty[39m
+Enable color and formatting in the output to make compiler errors easier to read
 type: boolean
 default: true
 
-[34m--target, -t[39m
+[94m--target, -t[39m
 Set the JavaScript language version for emitted JavaScript and include compatible library declarations.
 one of: es3, es5, es6, es2015, es2016, es2017, es2018, es2019, es2020, es2021, esnext
 default: ES3
 
-[34m--module, -m[39m
+[94m--module, -m[39m
 Specify what module code is generated.
 one of: none, commonjs, amd, system, umd, es6, es2015, es2020, esnext
 
-[34m--lib[39m
+[94m--lib[39m
 Specify a set of bundled library declaration files that describe the target runtime environment.
 one or more: es5, es6, es2015, es7, es2016, es2017, es2018, es2019, es2020, es2021, esnext, dom, dom.iterable, webworker, webworker.importscripts, webworker.iterable, scripthost, es2015.core, es2015.collection, es2015.generator, es2015.iterable, es2015.promise, es2015.proxy, es2015.reflect, es2015.symbol, es2015.symbol.wellknown, es2016.array.include, es2017.object, es2017.sharedmemory, es2017.string, es2017.intl, es2017.typedarrays, es2018.asyncgenerator, es2018.asynciterable, es2018.intl, es2018.promise, es2018.regexp, es2019.array, es2019.object, es2019.string, es2019.symbol, es2020.bigint, es2020.promise, es2020.sharedmemory, es2020.string, es2020.symbol.wellknown, es2020.intl, es2021.promise, es2021.string, es2021.weakref, esnext.array, esnext.symbol, esnext.asynciterable, esnext.intl, esnext.bigint, esnext.string, esnext.promise, esnext.weakref
 
-[34m--allowJs[39m
+[94m--allowJs[39m
 Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files.
 type: boolean
 default: false
 
-[34m--checkJs[39m
+[94m--checkJs[39m
 Enable error reporting in type-checked JavaScript files.
 type: boolean
 default: false
 
-[34m--jsx[39m
+[94m--jsx[39m
 Specify what JSX code is generated.
 one of: preserve, react-native, react, react-jsx, react-jsxdev
 default: undefined
 
-[34m--declaration, -d[39m
+[94m--declaration, -d[39m
 Generate .d.ts files from TypeScript and JavaScript files in your project.
 type: boolean
 default: `false`, unless `composite` is set
 
-[34m--declarationMap[39m
+[94m--declarationMap[39m
 Create sourcemaps for d.ts files.
 type: boolean
 default: false
 
-[34m--emitDeclarationOnly[39m
+[94m--emitDeclarationOnly[39m
 Only output d.ts files and not JavaScript files.
 type: boolean
 default: false
 
-[34m--sourceMap[39m
+[94m--sourceMap[39m
 Create source map files for emitted JavaScript files.
 type: boolean
 default: false
 
-[34m--outFile[39m
+[94m--outFile[39m
 Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output.
 
-[34m--outDir[39m
+[94m--outDir[39m
 Specify an output folder for all emitted files.
 
-[34m--removeComments[39m
+[94m--removeComments[39m
 Disable emitting comments.
 type: boolean
 default: false
 
-[34m--noEmit[39m
-Disable emitting file from a compilation.
+[94m--noEmit[39m
+Disable emitting files from a compilation.
 type: boolean
 default: false
 
-[34m--strict[39m
+[94m--strict[39m
 Enable all strict type-checking options.
 type: boolean
 default: false
 
-[34m--types[39m
+[94m--types[39m
 Specify type package names to be included without being referenced in a source file.
 
-[34m--esModuleInterop[39m
+[94m--esModuleInterop[39m
 Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility.
 type: boolean
 default: false