diff --git a/src/compiler/program.ts b/src/compiler/program.ts index c97f1a61d27..c24f570819e 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -250,7 +250,7 @@ namespace ts { Blue = "\u001b[94m", Cyan = "\u001b[96m" } - const gutterStyleSequence = "\u001b[30;47m"; + const gutterStyleSequence = "\u001b[7m"; const gutterSeparator = " "; const resetEscapeSequence = "\u001b[0m"; const ellipsis = "..."; diff --git a/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt b/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt index cf243a1e5bd..772d1e4f5a3 100644 --- a/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt +++ b/tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt @@ -1,22 +1,22 @@ tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:22:17 - error TS2322: Type '{}' is not assignable to type 'A'. Property 'a' is missing in type '{}'. -22 thing: {} -   ~~~~~ +22 thing: {} +   ~~~~~ tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:9:17 - 9 thing: A; -    ~~~~~ + 9 thing: A; +    ~~~~~ The expected type comes from property 'thing' which is declared here on type '{ thing: A; }' tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:25:17 - error TS2322: Type '{}' is not assignable to type 'A'. Property 'a' is missing in type '{}'. -25 another: {} -   ~~~~~~~ +25 another: {} +   ~~~~~~~ tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:12:17 - 12 another: A; -    ~~~~~~~ + 12 another: A; +    ~~~~~~~ The expected type comes from property 'another' which is declared here on type '{ another: A; }' diff --git a/tests/baselines/reference/duplicateIdentifierRelatedSpans1.errors.txt b/tests/baselines/reference/duplicateIdentifierRelatedSpans1.errors.txt index 62b4774f4f7..9a963614b61 100644 --- a/tests/baselines/reference/duplicateIdentifierRelatedSpans1.errors.txt +++ b/tests/baselines/reference/duplicateIdentifierRelatedSpans1.errors.txt @@ -1,64 +1,64 @@ tests/cases/compiler/file1.ts:1:7 - error TS2300: Duplicate identifier 'Foo'. -1 class Foo { } -   ~~~ +1 class Foo { } +   ~~~ tests/cases/compiler/file2.ts:1:6 - 1 type Foo = number; -    ~~~ + 1 type Foo = number; +    ~~~ 'Foo' was also declared here. tests/cases/compiler/file3.ts:1:6 - 1 type Foo = 54; -    ~~~ + 1 type Foo = 54; +    ~~~ and here. tests/cases/compiler/file1.ts:2:7 - error TS2451: Cannot redeclare block-scoped variable 'Bar'. -2 const Bar = 3; -   ~~~ +2 const Bar = 3; +   ~~~ tests/cases/compiler/file2.ts:2:7 - 2 class Bar {} -    ~~~ + 2 class Bar {} +    ~~~ 'Bar' was also declared here. tests/cases/compiler/file3.ts:2:5 - 2 let Bar = 42 -    ~~~ + 2 let Bar = 42 +    ~~~ and here. tests/cases/compiler/file2.ts:1:6 - error TS2300: Duplicate identifier 'Foo'. -1 type Foo = number; -   ~~~ +1 type Foo = number; +   ~~~ tests/cases/compiler/file1.ts:1:7 - 1 class Foo { } -    ~~~ + 1 class Foo { } +    ~~~ 'Foo' was also declared here. tests/cases/compiler/file2.ts:2:7 - error TS2451: Cannot redeclare block-scoped variable 'Bar'. -2 class Bar {} -   ~~~ +2 class Bar {} +   ~~~ tests/cases/compiler/file1.ts:2:7 - 2 const Bar = 3; -    ~~~ + 2 const Bar = 3; +    ~~~ 'Bar' was also declared here. tests/cases/compiler/file3.ts:1:6 - error TS2300: Duplicate identifier 'Foo'. -1 type Foo = 54; -   ~~~ +1 type Foo = 54; +   ~~~ tests/cases/compiler/file1.ts:1:7 - 1 class Foo { } -    ~~~ + 1 class Foo { } +    ~~~ 'Foo' was also declared here. tests/cases/compiler/file3.ts:2:5 - error TS2451: Cannot redeclare block-scoped variable 'Bar'. -2 let Bar = 42 -   ~~~ +2 let Bar = 42 +   ~~~ tests/cases/compiler/file1.ts:2:7 - 2 const Bar = 3; -    ~~~ + 2 const Bar = 3; +    ~~~ 'Bar' was also declared here. diff --git a/tests/baselines/reference/duplicateIdentifierRelatedSpans2.errors.txt b/tests/baselines/reference/duplicateIdentifierRelatedSpans2.errors.txt index 2925b636d2d..c6d6291e66a 100644 --- a/tests/baselines/reference/duplicateIdentifierRelatedSpans2.errors.txt +++ b/tests/baselines/reference/duplicateIdentifierRelatedSpans2.errors.txt @@ -1,20 +1,20 @@ tests/cases/compiler/file1.ts:1:1 - error TS6200: Definitions of the following identifiers conflict with those in another file: A, B, C, D, E, F, G, H, I -1 class A { } -  ~~~~~ +1 class A { } +  ~~~~~ tests/cases/compiler/file2.ts:1:1 - 1 class A { } -   ~~~~~ + 1 class A { } +   ~~~~~ Conflicts are in this file. tests/cases/compiler/file2.ts:1:1 - error TS6200: Definitions of the following identifiers conflict with those in another file: A, B, C, D, E, F, G, H, I -1 class A { } -  ~~~~~ +1 class A { } +  ~~~~~ tests/cases/compiler/file1.ts:1:1 - 1 class A { } -   ~~~~~ + 1 class A { } +   ~~~~~ Conflicts are in this file. diff --git a/tests/baselines/reference/duplicateIdentifierRelatedSpans3.errors.txt b/tests/baselines/reference/duplicateIdentifierRelatedSpans3.errors.txt index a97ce217928..2fb1879933c 100644 --- a/tests/baselines/reference/duplicateIdentifierRelatedSpans3.errors.txt +++ b/tests/baselines/reference/duplicateIdentifierRelatedSpans3.errors.txt @@ -1,56 +1,56 @@ tests/cases/compiler/file1.ts:2:5 - error TS2300: Duplicate identifier 'duplicate1'. -2 duplicate1: () => string; -   ~~~~~~~~~~ +2 duplicate1: () => string; +   ~~~~~~~~~~ tests/cases/compiler/file2.ts:2:5 - 2 duplicate1(): number; -    ~~~~~~~~~~ + 2 duplicate1(): number; +    ~~~~~~~~~~ 'duplicate1' was also declared here. tests/cases/compiler/file1.ts:3:5 - error TS2300: Duplicate identifier 'duplicate2'. -3 duplicate2: () => string; -   ~~~~~~~~~~ +3 duplicate2: () => string; +   ~~~~~~~~~~ tests/cases/compiler/file2.ts:3:5 - 3 duplicate2(): number; -    ~~~~~~~~~~ + 3 duplicate2(): number; +    ~~~~~~~~~~ 'duplicate2' was also declared here. tests/cases/compiler/file1.ts:4:5 - error TS2300: Duplicate identifier 'duplicate3'. -4 duplicate3: () => string; -   ~~~~~~~~~~ +4 duplicate3: () => string; +   ~~~~~~~~~~ tests/cases/compiler/file2.ts:4:5 - 4 duplicate3(): number; -    ~~~~~~~~~~ + 4 duplicate3(): number; +    ~~~~~~~~~~ 'duplicate3' was also declared here. tests/cases/compiler/file2.ts:2:5 - error TS2300: Duplicate identifier 'duplicate1'. -2 duplicate1(): number; -   ~~~~~~~~~~ +2 duplicate1(): number; +   ~~~~~~~~~~ tests/cases/compiler/file1.ts:2:5 - 2 duplicate1: () => string; -    ~~~~~~~~~~ + 2 duplicate1: () => string; +    ~~~~~~~~~~ 'duplicate1' was also declared here. tests/cases/compiler/file2.ts:3:5 - error TS2300: Duplicate identifier 'duplicate2'. -3 duplicate2(): number; -   ~~~~~~~~~~ +3 duplicate2(): number; +   ~~~~~~~~~~ tests/cases/compiler/file1.ts:3:5 - 3 duplicate2: () => string; -    ~~~~~~~~~~ + 3 duplicate2: () => string; +    ~~~~~~~~~~ 'duplicate2' was also declared here. tests/cases/compiler/file2.ts:4:5 - error TS2300: Duplicate identifier 'duplicate3'. -4 duplicate3(): number; -   ~~~~~~~~~~ +4 duplicate3(): number; +   ~~~~~~~~~~ tests/cases/compiler/file1.ts:4:5 - 4 duplicate3: () => string; -    ~~~~~~~~~~ + 4 duplicate3: () => string; +    ~~~~~~~~~~ 'duplicate3' was also declared here. diff --git a/tests/baselines/reference/duplicateIdentifierRelatedSpans4.errors.txt b/tests/baselines/reference/duplicateIdentifierRelatedSpans4.errors.txt index da50e3ad4a3..9512e55733e 100644 --- a/tests/baselines/reference/duplicateIdentifierRelatedSpans4.errors.txt +++ b/tests/baselines/reference/duplicateIdentifierRelatedSpans4.errors.txt @@ -1,20 +1,20 @@ tests/cases/compiler/file1.ts:1:1 - error TS6200: Definitions of the following identifiers conflict with those in another file: duplicate1, duplicate2, duplicate3, duplicate4, duplicate5, duplicate6, duplicate7, duplicate8 -1 interface TopLevel { -  ~~~~~~~~~ +1 interface TopLevel { +  ~~~~~~~~~ tests/cases/compiler/file2.ts:1:1 - 1 interface TopLevel { -   ~~~~~~~~~ + 1 interface TopLevel { +   ~~~~~~~~~ Conflicts are in this file. tests/cases/compiler/file2.ts:1:1 - error TS6200: Definitions of the following identifiers conflict with those in another file: duplicate1, duplicate2, duplicate3, duplicate4, duplicate5, duplicate6, duplicate7, duplicate8 -1 interface TopLevel { -  ~~~~~~~~~ +1 interface TopLevel { +  ~~~~~~~~~ tests/cases/compiler/file1.ts:1:1 - 1 interface TopLevel { -   ~~~~~~~~~ + 1 interface TopLevel { +   ~~~~~~~~~ Conflicts are in this file. diff --git a/tests/baselines/reference/duplicateIdentifierRelatedSpans5.errors.txt b/tests/baselines/reference/duplicateIdentifierRelatedSpans5.errors.txt index 2cbd4fa9629..497a0642296 100644 --- a/tests/baselines/reference/duplicateIdentifierRelatedSpans5.errors.txt +++ b/tests/baselines/reference/duplicateIdentifierRelatedSpans5.errors.txt @@ -1,56 +1,56 @@ tests/cases/compiler/file1.ts:3:9 - error TS2300: Duplicate identifier 'duplicate1'. -3 duplicate1: () => string; -   ~~~~~~~~~~ +3 duplicate1: () => string; +   ~~~~~~~~~~ tests/cases/compiler/file2.ts:4:9 - 4 duplicate1(): number; -    ~~~~~~~~~~ + 4 duplicate1(): number; +    ~~~~~~~~~~ 'duplicate1' was also declared here. tests/cases/compiler/file1.ts:4:9 - error TS2300: Duplicate identifier 'duplicate2'. -4 duplicate2: () => string; -   ~~~~~~~~~~ +4 duplicate2: () => string; +   ~~~~~~~~~~ tests/cases/compiler/file2.ts:5:9 - 5 duplicate2(): number; -    ~~~~~~~~~~ + 5 duplicate2(): number; +    ~~~~~~~~~~ 'duplicate2' was also declared here. tests/cases/compiler/file1.ts:5:9 - error TS2300: Duplicate identifier 'duplicate3'. -5 duplicate3: () => string; -   ~~~~~~~~~~ +5 duplicate3: () => string; +   ~~~~~~~~~~ tests/cases/compiler/file2.ts:6:9 - 6 duplicate3(): number; -    ~~~~~~~~~~ + 6 duplicate3(): number; +    ~~~~~~~~~~ 'duplicate3' was also declared here. tests/cases/compiler/file2.ts:4:9 - error TS2300: Duplicate identifier 'duplicate1'. -4 duplicate1(): number; -   ~~~~~~~~~~ +4 duplicate1(): number; +   ~~~~~~~~~~ tests/cases/compiler/file1.ts:3:9 - 3 duplicate1: () => string; -    ~~~~~~~~~~ + 3 duplicate1: () => string; +    ~~~~~~~~~~ 'duplicate1' was also declared here. tests/cases/compiler/file2.ts:5:9 - error TS2300: Duplicate identifier 'duplicate2'. -5 duplicate2(): number; -   ~~~~~~~~~~ +5 duplicate2(): number; +   ~~~~~~~~~~ tests/cases/compiler/file1.ts:4:9 - 4 duplicate2: () => string; -    ~~~~~~~~~~ + 4 duplicate2: () => string; +    ~~~~~~~~~~ 'duplicate2' was also declared here. tests/cases/compiler/file2.ts:6:9 - error TS2300: Duplicate identifier 'duplicate3'. -6 duplicate3(): number; -   ~~~~~~~~~~ +6 duplicate3(): number; +   ~~~~~~~~~~ tests/cases/compiler/file1.ts:5:9 - 5 duplicate3: () => string; -    ~~~~~~~~~~ + 5 duplicate3: () => string; +    ~~~~~~~~~~ 'duplicate3' was also declared here. diff --git a/tests/baselines/reference/duplicateIdentifierRelatedSpans6.errors.txt b/tests/baselines/reference/duplicateIdentifierRelatedSpans6.errors.txt index afe6ebe9f42..db980204718 100644 --- a/tests/baselines/reference/duplicateIdentifierRelatedSpans6.errors.txt +++ b/tests/baselines/reference/duplicateIdentifierRelatedSpans6.errors.txt @@ -1,56 +1,56 @@ tests/cases/compiler/file1.ts:3:9 - error TS2300: Duplicate identifier 'duplicate1'. -3 duplicate1: () => string; -   ~~~~~~~~~~ +3 duplicate1: () => string; +   ~~~~~~~~~~ tests/cases/compiler/file2.ts:5:9 - 5 duplicate1(): number; -    ~~~~~~~~~~ + 5 duplicate1(): number; +    ~~~~~~~~~~ 'duplicate1' was also declared here. tests/cases/compiler/file1.ts:4:9 - error TS2300: Duplicate identifier 'duplicate2'. -4 duplicate2: () => string; -   ~~~~~~~~~~ +4 duplicate2: () => string; +   ~~~~~~~~~~ tests/cases/compiler/file2.ts:6:9 - 6 duplicate2(): number; -    ~~~~~~~~~~ + 6 duplicate2(): number; +    ~~~~~~~~~~ 'duplicate2' was also declared here. tests/cases/compiler/file1.ts:5:9 - error TS2300: Duplicate identifier 'duplicate3'. -5 duplicate3: () => string; -   ~~~~~~~~~~ +5 duplicate3: () => string; +   ~~~~~~~~~~ tests/cases/compiler/file2.ts:7:9 - 7 duplicate3(): number; -    ~~~~~~~~~~ + 7 duplicate3(): number; +    ~~~~~~~~~~ 'duplicate3' was also declared here. tests/cases/compiler/file2.ts:5:9 - error TS2300: Duplicate identifier 'duplicate1'. -5 duplicate1(): number; -   ~~~~~~~~~~ +5 duplicate1(): number; +   ~~~~~~~~~~ tests/cases/compiler/file1.ts:3:9 - 3 duplicate1: () => string; -    ~~~~~~~~~~ + 3 duplicate1: () => string; +    ~~~~~~~~~~ 'duplicate1' was also declared here. tests/cases/compiler/file2.ts:6:9 - error TS2300: Duplicate identifier 'duplicate2'. -6 duplicate2(): number; -   ~~~~~~~~~~ +6 duplicate2(): number; +   ~~~~~~~~~~ tests/cases/compiler/file1.ts:4:9 - 4 duplicate2: () => string; -    ~~~~~~~~~~ + 4 duplicate2: () => string; +    ~~~~~~~~~~ 'duplicate2' was also declared here. tests/cases/compiler/file2.ts:7:9 - error TS2300: Duplicate identifier 'duplicate3'. -7 duplicate3(): number; -   ~~~~~~~~~~ +7 duplicate3(): number; +   ~~~~~~~~~~ tests/cases/compiler/file1.ts:5:9 - 5 duplicate3: () => string; -    ~~~~~~~~~~ + 5 duplicate3: () => string; +    ~~~~~~~~~~ 'duplicate3' was also declared here. diff --git a/tests/baselines/reference/duplicateIdentifierRelatedSpans7.errors.txt b/tests/baselines/reference/duplicateIdentifierRelatedSpans7.errors.txt index 76bb3d9c750..7b568736ff3 100644 --- a/tests/baselines/reference/duplicateIdentifierRelatedSpans7.errors.txt +++ b/tests/baselines/reference/duplicateIdentifierRelatedSpans7.errors.txt @@ -1,20 +1,20 @@ tests/cases/compiler/file1.ts:1:1 - error TS6200: Definitions of the following identifiers conflict with those in another file: duplicate1, duplicate2, duplicate3, duplicate4, duplicate5, duplicate6, duplicate7, duplicate8, duplicate9 -1 declare module "someMod" { -  ~~~~~~~ +1 declare module "someMod" { +  ~~~~~~~ tests/cases/compiler/file2.ts:3:1 - 3 declare module "someMod" { -   ~~~~~~~ + 3 declare module "someMod" { +   ~~~~~~~ Conflicts are in this file. tests/cases/compiler/file2.ts:3:1 - error TS6200: Definitions of the following identifiers conflict with those in another file: duplicate1, duplicate2, duplicate3, duplicate4, duplicate5, duplicate6, duplicate7, duplicate8, duplicate9 -3 declare module "someMod" { -  ~~~~~~~ +3 declare module "someMod" { +  ~~~~~~~ tests/cases/compiler/file1.ts:1:1 - 1 declare module "someMod" { -   ~~~~~~~ + 1 declare module "someMod" { +   ~~~~~~~ Conflicts are in this file. diff --git a/tests/baselines/reference/esModuleInteropPrettyErrorRelatedInformation.errors.txt b/tests/baselines/reference/esModuleInteropPrettyErrorRelatedInformation.errors.txt index 1d1c983162f..14c054c466c 100644 --- a/tests/baselines/reference/esModuleInteropPrettyErrorRelatedInformation.errors.txt +++ b/tests/baselines/reference/esModuleInteropPrettyErrorRelatedInformation.errors.txt @@ -1,12 +1,12 @@ tests/cases/compiler/index.ts:3:8 - error TS2345: Argument of type '{ default: () => void; }' is not assignable to parameter of type '() => void'. Type '{ default: () => void; }' provides no match for the signature '(): void'. -3 invoke(foo); -   ~~~ +3 invoke(foo); +   ~~~ tests/cases/compiler/index.ts:1:1 - 1 import * as foo from "./foo"; -   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 1 import * as foo from "./foo"; +   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Type originates at this import. A namespace-style import cannot be called or constructed, and will cause a failure at runtime. Consider using a default import or import require here instead. diff --git a/tests/baselines/reference/multiLineContextDiagnosticWithPretty.errors.txt b/tests/baselines/reference/multiLineContextDiagnosticWithPretty.errors.txt index c6b8095d15b..525f30415d1 100644 --- a/tests/baselines/reference/multiLineContextDiagnosticWithPretty.errors.txt +++ b/tests/baselines/reference/multiLineContextDiagnosticWithPretty.errors.txt @@ -1,12 +1,12 @@ tests/cases/compiler/multiLineContextDiagnosticWithPretty.ts:2:5 - error TS2322: Type '{ a: { b: string; }; }' is not assignable to type '{ c: string; }'. Object literal may only specify known properties, and 'a' does not exist in type '{ c: string; }'. -2 a: { -   ~~~~ -3 b: '', -  ~~~~~~~~~~~~~~ -4 } -  ~~~~~ +2 a: { +   ~~~~ +3 b: '', +  ~~~~~~~~~~~~~~ +4 } +  ~~~~~ ==== tests/cases/compiler/multiLineContextDiagnosticWithPretty.ts (1 errors) ==== diff --git a/tests/baselines/reference/prettyContextNotDebugAssertion.errors.txt b/tests/baselines/reference/prettyContextNotDebugAssertion.errors.txt index 57b4f5d62f7..d983f0d973e 100644 --- a/tests/baselines/reference/prettyContextNotDebugAssertion.errors.txt +++ b/tests/baselines/reference/prettyContextNotDebugAssertion.errors.txt @@ -1,7 +1,7 @@ tests/cases/compiler/index.ts:2:1 - error TS1005: '}' expected. -2 -   +2 +   ==== tests/cases/compiler/index.ts (1 errors) ==== diff --git a/tests/baselines/reference/typedefCrossModule5.errors.txt b/tests/baselines/reference/typedefCrossModule5.errors.txt index b75652a31d5..2784f0e1896 100644 --- a/tests/baselines/reference/typedefCrossModule5.errors.txt +++ b/tests/baselines/reference/typedefCrossModule5.errors.txt @@ -1,38 +1,38 @@ tests/cases/conformance/jsdoc/mod1.js:1:23 - error TS2300: Duplicate identifier 'Foo'. -1 /** @typedef {number} Foo */ -   ~~~ +1 /** @typedef {number} Foo */ +   ~~~ tests/cases/conformance/jsdoc/mod2.js:1:7 - 1 class Foo { } // should error -    ~~~ + 1 class Foo { } // should error +    ~~~ 'Foo' was also declared here. tests/cases/conformance/jsdoc/mod1.js:2:7 - error TS2451: Cannot redeclare block-scoped variable 'Bar'. -2 class Bar {} -   ~~~ +2 class Bar {} +   ~~~ tests/cases/conformance/jsdoc/mod2.js:2:7 - 2 const Bar = 3; -    ~~~ + 2 const Bar = 3; +    ~~~ 'Bar' was also declared here. tests/cases/conformance/jsdoc/mod2.js:1:7 - error TS2300: Duplicate identifier 'Foo'. -1 class Foo { } // should error -   ~~~ +1 class Foo { } // should error +   ~~~ tests/cases/conformance/jsdoc/mod1.js:1:23 - 1 /** @typedef {number} Foo */ -    ~~~ + 1 /** @typedef {number} Foo */ +    ~~~ 'Foo' was also declared here. tests/cases/conformance/jsdoc/mod2.js:2:7 - error TS2451: Cannot redeclare block-scoped variable 'Bar'. -2 const Bar = 3; -   ~~~ +2 const Bar = 3; +   ~~~ tests/cases/conformance/jsdoc/mod1.js:2:7 - 2 class Bar {} -    ~~~ + 2 class Bar {} +    ~~~ 'Bar' was also declared here.