Skip to content

Commit e1daa47

Browse files
sheetalkamatsheetalkamat
authored
Merge pull request #26983 from Tyriar/26850_invert_gutter
Invert gutter instead of setting colors
2 parents 08c970a + 745f5be commit e1daa47

13 files changed

+161
-161
lines changed

‎src/compiler/program.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ namespace ts {
250250
Blue = "\u001b[94m",
251251
Cyan = "\u001b[96m"
252252
}
253-
const gutterStyleSequence = "\u001b[30;47m";
253+
const gutterStyleSequence = "\u001b[7m";
254254
const gutterSeparator = " ";
255255
const resetEscapeSequence = "\u001b[0m";
256256
const ellipsis = "...";

‎tests/baselines/reference/deeplyNestedAssignabilityIssue.errors.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:22:17 - error TS2322: Type '{}' is not assignable to type 'A'.
22
Property 'a' is missing in type '{}'.
33

4-
22 thing: {}
5-
   ~~~~~
4+
22 thing: {}
5+
   ~~~~~
66

77
tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:9:17
8-
9 thing: A;
9-
   ~~~~~
8+
9 thing: A;
9+
   ~~~~~
1010
The expected type comes from property 'thing' which is declared here on type '{ thing: A; }'
1111
tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:25:17 - error TS2322: Type '{}' is not assignable to type 'A'.
1212
Property 'a' is missing in type '{}'.
1313

14-
25 another: {}
15-
   ~~~~~~~
14+
25 another: {}
15+
   ~~~~~~~
1616

1717
tests/cases/compiler/deeplyNestedAssignabilityIssue.ts:12:17
18-
12 another: A;
19-
   ~~~~~~~
18+
12 another: A;
19+
   ~~~~~~~
2020
The expected type comes from property 'another' which is declared here on type '{ another: A; }'
2121

2222

‎tests/baselines/reference/duplicateIdentifierRelatedSpans1.errors.txt

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
11
tests/cases/compiler/file1.ts:1:7 - error TS2300: Duplicate identifier 'Foo'.
22

3-
1 class Foo { }
4-
   ~~~
3+
1 class Foo { }
4+
   ~~~
55

66
tests/cases/compiler/file2.ts:1:6
7-
1 type Foo = number;
8-
   ~~~
7+
1 type Foo = number;
8+
   ~~~
99
'Foo' was also declared here.
1010
tests/cases/compiler/file3.ts:1:6
11-
1 type Foo = 54;
12-
   ~~~
11+
1 type Foo = 54;
12+
   ~~~
1313
and here.
1414
tests/cases/compiler/file1.ts:2:7 - error TS2451: Cannot redeclare block-scoped variable 'Bar'.
1515

16-
2 const Bar = 3;
17-
   ~~~
16+
2 const Bar = 3;
17+
   ~~~
1818

1919
tests/cases/compiler/file2.ts:2:7
20-
2 class Bar {}
21-
   ~~~
20+
2 class Bar {}
21+
   ~~~
2222
'Bar' was also declared here.
2323
tests/cases/compiler/file3.ts:2:5
24-
2 let Bar = 42
25-
   ~~~
24+
2 let Bar = 42
25+
   ~~~
2626
and here.
2727
tests/cases/compiler/file2.ts:1:6 - error TS2300: Duplicate identifier 'Foo'.
2828

29-
1 type Foo = number;
30-
   ~~~
29+
1 type Foo = number;
30+
   ~~~
3131

3232
tests/cases/compiler/file1.ts:1:7
33-
1 class Foo { }
34-
   ~~~
33+
1 class Foo { }
34+
   ~~~
3535
'Foo' was also declared here.
3636
tests/cases/compiler/file2.ts:2:7 - error TS2451: Cannot redeclare block-scoped variable 'Bar'.
3737

38-
2 class Bar {}
39-
   ~~~
38+
2 class Bar {}
39+
   ~~~
4040

4141
tests/cases/compiler/file1.ts:2:7
42-
2 const Bar = 3;
43-
   ~~~
42+
2 const Bar = 3;
43+
   ~~~
4444
'Bar' was also declared here.
4545
tests/cases/compiler/file3.ts:1:6 - error TS2300: Duplicate identifier 'Foo'.
4646

47-
1 type Foo = 54;
48-
   ~~~
47+
1 type Foo = 54;
48+
   ~~~
4949

5050
tests/cases/compiler/file1.ts:1:7
51-
1 class Foo { }
52-
   ~~~
51+
1 class Foo { }
52+
   ~~~
5353
'Foo' was also declared here.
5454
tests/cases/compiler/file3.ts:2:5 - error TS2451: Cannot redeclare block-scoped variable 'Bar'.
5555

56-
2 let Bar = 42
57-
   ~~~
56+
2 let Bar = 42
57+
   ~~~
5858

5959
tests/cases/compiler/file1.ts:2:7
60-
2 const Bar = 3;
61-
   ~~~
60+
2 const Bar = 3;
61+
   ~~~
6262
'Bar' was also declared here.
6363

6464

‎tests/baselines/reference/duplicateIdentifierRelatedSpans2.errors.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
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
22

3-
1 class A { }
4-
  ~~~~~
3+
1 class A { }
4+
  ~~~~~
55

66
tests/cases/compiler/file2.ts:1:1
7-
1 class A { }
8-
  ~~~~~
7+
1 class A { }
8+
  ~~~~~
99
Conflicts are in this file.
1010
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
1111

12-
1 class A { }
13-
  ~~~~~
12+
1 class A { }
13+
  ~~~~~
1414

1515
tests/cases/compiler/file1.ts:1:1
16-
1 class A { }
17-
  ~~~~~
16+
1 class A { }
17+
  ~~~~~
1818
Conflicts are in this file.
1919

2020

‎tests/baselines/reference/duplicateIdentifierRelatedSpans3.errors.txt

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
tests/cases/compiler/file1.ts:2:5 - error TS2300: Duplicate identifier 'duplicate1'.
22

3-
2 duplicate1: () => string;
4-
   ~~~~~~~~~~
3+
2 duplicate1: () => string;
4+
   ~~~~~~~~~~
55

66
tests/cases/compiler/file2.ts:2:5
7-
2 duplicate1(): number;
8-
   ~~~~~~~~~~
7+
2 duplicate1(): number;
8+
   ~~~~~~~~~~
99
'duplicate1' was also declared here.
1010
tests/cases/compiler/file1.ts:3:5 - error TS2300: Duplicate identifier 'duplicate2'.
1111

12-
3 duplicate2: () => string;
13-
   ~~~~~~~~~~
12+
3 duplicate2: () => string;
13+
   ~~~~~~~~~~
1414

1515
tests/cases/compiler/file2.ts:3:5
16-
3 duplicate2(): number;
17-
   ~~~~~~~~~~
16+
3 duplicate2(): number;
17+
   ~~~~~~~~~~
1818
'duplicate2' was also declared here.
1919
tests/cases/compiler/file1.ts:4:5 - error TS2300: Duplicate identifier 'duplicate3'.
2020

21-
4 duplicate3: () => string;
22-
   ~~~~~~~~~~
21+
4 duplicate3: () => string;
22+
   ~~~~~~~~~~
2323

2424
tests/cases/compiler/file2.ts:4:5
25-
4 duplicate3(): number;
26-
   ~~~~~~~~~~
25+
4 duplicate3(): number;
26+
   ~~~~~~~~~~
2727
'duplicate3' was also declared here.
2828
tests/cases/compiler/file2.ts:2:5 - error TS2300: Duplicate identifier 'duplicate1'.
2929

30-
2 duplicate1(): number;
31-
   ~~~~~~~~~~
30+
2 duplicate1(): number;
31+
   ~~~~~~~~~~
3232

3333
tests/cases/compiler/file1.ts:2:5
34-
2 duplicate1: () => string;
35-
   ~~~~~~~~~~
34+
2 duplicate1: () => string;
35+
   ~~~~~~~~~~
3636
'duplicate1' was also declared here.
3737
tests/cases/compiler/file2.ts:3:5 - error TS2300: Duplicate identifier 'duplicate2'.
3838

39-
3 duplicate2(): number;
40-
   ~~~~~~~~~~
39+
3 duplicate2(): number;
40+
   ~~~~~~~~~~
4141

4242
tests/cases/compiler/file1.ts:3:5
43-
3 duplicate2: () => string;
44-
   ~~~~~~~~~~
43+
3 duplicate2: () => string;
44+
   ~~~~~~~~~~
4545
'duplicate2' was also declared here.
4646
tests/cases/compiler/file2.ts:4:5 - error TS2300: Duplicate identifier 'duplicate3'.
4747

48-
4 duplicate3(): number;
49-
   ~~~~~~~~~~
48+
4 duplicate3(): number;
49+
   ~~~~~~~~~~
5050

5151
tests/cases/compiler/file1.ts:4:5
52-
4 duplicate3: () => string;
53-
   ~~~~~~~~~~
52+
4 duplicate3: () => string;
53+
   ~~~~~~~~~~
5454
'duplicate3' was also declared here.
5555

5656

‎tests/baselines/reference/duplicateIdentifierRelatedSpans4.errors.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
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
22

3-
1 interface TopLevel {
4-
  ~~~~~~~~~
3+
1 interface TopLevel {
4+
  ~~~~~~~~~
55

66
tests/cases/compiler/file2.ts:1:1
7-
1 interface TopLevel {
8-
  ~~~~~~~~~
7+
1 interface TopLevel {
8+
  ~~~~~~~~~
99
Conflicts are in this file.
1010
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
1111

12-
1 interface TopLevel {
13-
  ~~~~~~~~~
12+
1 interface TopLevel {
13+
  ~~~~~~~~~
1414

1515
tests/cases/compiler/file1.ts:1:1
16-
1 interface TopLevel {
17-
  ~~~~~~~~~
16+
1 interface TopLevel {
17+
  ~~~~~~~~~
1818
Conflicts are in this file.
1919

2020

‎tests/baselines/reference/duplicateIdentifierRelatedSpans5.errors.txt

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
tests/cases/compiler/file1.ts:3:9 - error TS2300: Duplicate identifier 'duplicate1'.
22

3-
3 duplicate1: () => string;
4-
   ~~~~~~~~~~
3+
3 duplicate1: () => string;
4+
   ~~~~~~~~~~
55

66
tests/cases/compiler/file2.ts:4:9
7-
4 duplicate1(): number;
8-
   ~~~~~~~~~~
7+
4 duplicate1(): number;
8+
   ~~~~~~~~~~
99
'duplicate1' was also declared here.
1010
tests/cases/compiler/file1.ts:4:9 - error TS2300: Duplicate identifier 'duplicate2'.
1111

12-
4 duplicate2: () => string;
13-
   ~~~~~~~~~~
12+
4 duplicate2: () => string;
13+
   ~~~~~~~~~~
1414

1515
tests/cases/compiler/file2.ts:5:9
16-
5 duplicate2(): number;
17-
   ~~~~~~~~~~
16+
5 duplicate2(): number;
17+
   ~~~~~~~~~~
1818
'duplicate2' was also declared here.
1919
tests/cases/compiler/file1.ts:5:9 - error TS2300: Duplicate identifier 'duplicate3'.
2020

21-
5 duplicate3: () => string;
22-
   ~~~~~~~~~~
21+
5 duplicate3: () => string;
22+
   ~~~~~~~~~~
2323

2424
tests/cases/compiler/file2.ts:6:9
25-
6 duplicate3(): number;
26-
   ~~~~~~~~~~
25+
6 duplicate3(): number;
26+
   ~~~~~~~~~~
2727
'duplicate3' was also declared here.
2828
tests/cases/compiler/file2.ts:4:9 - error TS2300: Duplicate identifier 'duplicate1'.
2929

30-
4 duplicate1(): number;
31-
   ~~~~~~~~~~
30+
4 duplicate1(): number;
31+
   ~~~~~~~~~~
3232

3333
tests/cases/compiler/file1.ts:3:9
34-
3 duplicate1: () => string;
35-
   ~~~~~~~~~~
34+
3 duplicate1: () => string;
35+
   ~~~~~~~~~~
3636
'duplicate1' was also declared here.
3737
tests/cases/compiler/file2.ts:5:9 - error TS2300: Duplicate identifier 'duplicate2'.
3838

39-
5 duplicate2(): number;
40-
   ~~~~~~~~~~
39+
5 duplicate2(): number;
40+
   ~~~~~~~~~~
4141

4242
tests/cases/compiler/file1.ts:4:9
43-
4 duplicate2: () => string;
44-
   ~~~~~~~~~~
43+
4 duplicate2: () => string;
44+
   ~~~~~~~~~~
4545
'duplicate2' was also declared here.
4646
tests/cases/compiler/file2.ts:6:9 - error TS2300: Duplicate identifier 'duplicate3'.
4747

48-
6 duplicate3(): number;
49-
   ~~~~~~~~~~
48+
6 duplicate3(): number;
49+
   ~~~~~~~~~~
5050

5151
tests/cases/compiler/file1.ts:5:9
52-
5 duplicate3: () => string;
53-
   ~~~~~~~~~~
52+
5 duplicate3: () => string;
53+
   ~~~~~~~~~~
5454
'duplicate3' was also declared here.
5555

5656

0 commit comments

Comments
 (0)