Skip to content

Commit ddfe28d

Browse files
ahejlsbergahejlsberg
committed
Accepting new baselines
1 parent c990c42 commit ddfe28d

24 files changed

+126
-126
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts(11,16): error TS2341: Property 'clodule.sfn' is inaccessible.
1+
tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts(11,16): error TS2341: Property 'sfn' is private and only accessible within class 'clodule<T>'.
22

33

44
==== tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts (1 errors) ====
@@ -14,7 +14,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMer
1414
export function fn<T>(x: T, y: T): number {
1515
return clodule.sfn('a');
1616
~~~~~~~~~~~
17-
!!! error TS2341: Property 'clodule.sfn' is inaccessible.
17+
!!! error TS2341: Property 'sfn' is private and only accessible within class 'clodule<T>'.
1818
}
1919
}
2020

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(
22
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(4,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
33
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(8,24): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
44
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(9,24): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
5-
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(15,1): error TS2341: Property 'C.x' is inaccessible.
6-
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(16,1): error TS2341: Property 'C.y' is inaccessible.
7-
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(17,1): error TS2341: Property 'C.y' is inaccessible.
8-
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(18,1): error TS2341: Property 'C.foo' is inaccessible.
9-
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(20,1): error TS2341: Property 'C.a' is inaccessible.
10-
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(21,1): error TS2341: Property 'C.b' is inaccessible.
11-
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(22,1): error TS2341: Property 'C.b' is inaccessible.
12-
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(23,1): error TS2341: Property 'C.foo' is inaccessible.
5+
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(15,1): error TS2341: Property 'x' is private and only accessible within class 'C'.
6+
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(16,1): error TS2341: Property 'y' is private and only accessible within class 'C'.
7+
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(17,1): error TS2341: Property 'y' is private and only accessible within class 'C'.
8+
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(18,1): error TS2341: Property 'foo' is private and only accessible within class 'C'.
9+
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(20,1): error TS2341: Property 'a' is private and only accessible within class 'C'.
10+
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(21,1): error TS2341: Property 'b' is private and only accessible within class 'C'.
11+
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(22,1): error TS2341: Property 'b' is private and only accessible within class 'C'.
12+
tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(23,1): error TS2341: Property 'foo' is private and only accessible within class 'C'.
1313

1414

1515
==== tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts (12 errors) ====
@@ -37,26 +37,26 @@ tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(
3737
// all errors
3838
c.x;
3939
~~~
40-
!!! error TS2341: Property 'C.x' is inaccessible.
40+
!!! error TS2341: Property 'x' is private and only accessible within class 'C'.
4141
c.y;
4242
~~~
43-
!!! error TS2341: Property 'C.y' is inaccessible.
43+
!!! error TS2341: Property 'y' is private and only accessible within class 'C'.
4444
c.y = 1;
4545
~~~
46-
!!! error TS2341: Property 'C.y' is inaccessible.
46+
!!! error TS2341: Property 'y' is private and only accessible within class 'C'.
4747
c.foo();
4848
~~~~~
49-
!!! error TS2341: Property 'C.foo' is inaccessible.
49+
!!! error TS2341: Property 'foo' is private and only accessible within class 'C'.
5050

5151
C.a;
5252
~~~
53-
!!! error TS2341: Property 'C.a' is inaccessible.
53+
!!! error TS2341: Property 'a' is private and only accessible within class 'C'.
5454
C.b();
5555
~~~
56-
!!! error TS2341: Property 'C.b' is inaccessible.
56+
!!! error TS2341: Property 'b' is private and only accessible within class 'C'.
5757
C.b = 1;
5858
~~~
59-
!!! error TS2341: Property 'C.b' is inaccessible.
59+
!!! error TS2341: Property 'b' is private and only accessible within class 'C'.
6060
C.foo();
6161
~~~~~
62-
!!! error TS2341: Property 'C.foo' is inaccessible.
62+
!!! error TS2341: Property 'foo' is private and only accessible within class 'C'.

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
tests/cases/conformance/types/members/classWithPrivateProperty.ts(15,18): error TS2341: Property 'C.x' is inaccessible.
2-
tests/cases/conformance/types/members/classWithPrivateProperty.ts(16,18): error TS2341: Property 'C.a' is inaccessible.
3-
tests/cases/conformance/types/members/classWithPrivateProperty.ts(17,18): error TS2341: Property 'C.b' is inaccessible.
4-
tests/cases/conformance/types/members/classWithPrivateProperty.ts(18,18): error TS2341: Property 'C.c' is inaccessible.
5-
tests/cases/conformance/types/members/classWithPrivateProperty.ts(19,18): error TS2341: Property 'C.d' is inaccessible.
6-
tests/cases/conformance/types/members/classWithPrivateProperty.ts(20,18): error TS2341: Property 'C.e' is inaccessible.
7-
tests/cases/conformance/types/members/classWithPrivateProperty.ts(21,18): error TS2341: Property 'C.f' is inaccessible.
8-
tests/cases/conformance/types/members/classWithPrivateProperty.ts(22,18): error TS2341: Property 'C.g' is inaccessible.
1+
tests/cases/conformance/types/members/classWithPrivateProperty.ts(15,18): error TS2341: Property 'x' is private and only accessible within class 'C'.
2+
tests/cases/conformance/types/members/classWithPrivateProperty.ts(16,18): error TS2341: Property 'a' is private and only accessible within class 'C'.
3+
tests/cases/conformance/types/members/classWithPrivateProperty.ts(17,18): error TS2341: Property 'b' is private and only accessible within class 'C'.
4+
tests/cases/conformance/types/members/classWithPrivateProperty.ts(18,18): error TS2341: Property 'c' is private and only accessible within class 'C'.
5+
tests/cases/conformance/types/members/classWithPrivateProperty.ts(19,18): error TS2341: Property 'd' is private and only accessible within class 'C'.
6+
tests/cases/conformance/types/members/classWithPrivateProperty.ts(20,18): error TS2341: Property 'e' is private and only accessible within class 'C'.
7+
tests/cases/conformance/types/members/classWithPrivateProperty.ts(21,18): error TS2341: Property 'f' is private and only accessible within class 'C'.
8+
tests/cases/conformance/types/members/classWithPrivateProperty.ts(22,18): error TS2341: Property 'g' is private and only accessible within class 'C'.
99

1010

1111
==== tests/cases/conformance/types/members/classWithPrivateProperty.ts (8 errors) ====
@@ -25,25 +25,25 @@ tests/cases/conformance/types/members/classWithPrivateProperty.ts(22,18): error
2525
var c = new C();
2626
var r1: string = c.x;
2727
~~~
28-
!!! error TS2341: Property 'C.x' is inaccessible.
28+
!!! error TS2341: Property 'x' is private and only accessible within class 'C'.
2929
var r2: string = c.a;
3030
~~~
31-
!!! error TS2341: Property 'C.a' is inaccessible.
31+
!!! error TS2341: Property 'a' is private and only accessible within class 'C'.
3232
var r3: string = c.b;
3333
~~~
34-
!!! error TS2341: Property 'C.b' is inaccessible.
34+
!!! error TS2341: Property 'b' is private and only accessible within class 'C'.
3535
var r4: string = c.c();
3636
~~~
37-
!!! error TS2341: Property 'C.c' is inaccessible.
37+
!!! error TS2341: Property 'c' is private and only accessible within class 'C'.
3838
var r5: string = c.d();
3939
~~~
40-
!!! error TS2341: Property 'C.d' is inaccessible.
40+
!!! error TS2341: Property 'd' is private and only accessible within class 'C'.
4141
var r6: string = C.e;
4242
~~~
43-
!!! error TS2341: Property 'C.e' is inaccessible.
43+
!!! error TS2341: Property 'e' is private and only accessible within class 'C'.
4444
var r7: string = C.f();
4545
~~~
46-
!!! error TS2341: Property 'C.f' is inaccessible.
46+
!!! error TS2341: Property 'f' is private and only accessible within class 'C'.
4747
var r8: string = C.g();
4848
~~~
49-
!!! error TS2341: Property 'C.g' is inaccessible.
49+
!!! error TS2341: Property 'g' is private and only accessible within class 'C'.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/compiler/cloduleStaticMembers.ts(6,13): error TS2341: Property 'Clod.x' is inaccessible.
1+
tests/cases/compiler/cloduleStaticMembers.ts(6,13): error TS2341: Property 'x' is private and only accessible within class 'Clod'.
22
tests/cases/compiler/cloduleStaticMembers.ts(7,13): error TS2304: Cannot find name 'x'.
33
tests/cases/compiler/cloduleStaticMembers.ts(10,13): error TS2304: Cannot find name 'y'.
44

@@ -11,7 +11,7 @@ tests/cases/compiler/cloduleStaticMembers.ts(10,13): error TS2304: Cannot find n
1111
module Clod {
1212
var p = Clod.x;
1313
~~~~~~
14-
!!! error TS2341: Property 'Clod.x' is inaccessible.
14+
!!! error TS2341: Property 'x' is private and only accessible within class 'Clod'.
1515
var q = x;
1616
~
1717
!!! error TS2304: Cannot find name 'x'.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(8,10): error TS2341: Property 'C.x' is inaccessible.
2-
tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(17,10): error TS2341: Property 'D.x' is inaccessible.
1+
tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(8,10): error TS2341: Property 'x' is private and only accessible within class 'C'.
2+
tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(17,10): error TS2341: Property 'x' is private and only accessible within class 'D<T>'.
33
tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(18,12): error TS2339: Property 'a' does not exist on type 'D<string>'.
44

55

@@ -13,7 +13,7 @@ tests/cases/conformance/classes/constructorDeclarations/constructorParameters/co
1313
var r = c.y;
1414
var r2 = c.x; // error
1515
~~~
16-
!!! error TS2341: Property 'C.x' is inaccessible.
16+
!!! error TS2341: Property 'x' is private and only accessible within class 'C'.
1717

1818
class D<T> {
1919
y: T;
@@ -24,7 +24,7 @@ tests/cases/conformance/classes/constructorDeclarations/constructorParameters/co
2424
var r = d.y;
2525
var r2 = d.x; // error
2626
~~~
27-
!!! error TS2341: Property 'D.x' is inaccessible.
27+
!!! error TS2341: Property 'x' is private and only accessible within class 'D<T>'.
2828
var r3 = d.a; // error
2929
~
3030
!!! error TS2339: Property 'a' does not exist on type 'D<string>'.

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWit
44
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(20,24): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
55
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(13,7): error TS2418: Class static side 'typeof Derived' incorrectly extends base class static side 'typeof Base':
66
Property 'x' is private in type 'typeof Derived' but not in type 'typeof Base'.
7-
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(24,10): error TS2341: Property 'Derived.x' is inaccessible.
8-
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(27,10): error TS2341: Property 'Derived.fn' is inaccessible.
9-
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(32,10): error TS2341: Property 'Derived.a' is inaccessible.
10-
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(33,1): error TS2341: Property 'Derived.a' is inaccessible.
7+
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(24,10): error TS2341: Property 'x' is private and only accessible within class 'Derived'.
8+
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(27,10): error TS2341: Property 'fn' is private and only accessible within class 'Derived'.
9+
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(32,10): error TS2341: Property 'a' is private and only accessible within class 'Derived'.
10+
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(33,1): error TS2341: Property 'a' is private and only accessible within class 'Derived'.
1111

1212

1313
==== tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts (9 errors) ====
@@ -47,19 +47,19 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWit
4747
var r = Base.x; // ok
4848
var r2 = Derived.x; // error
4949
~~~~~~~~~
50-
!!! error TS2341: Property 'Derived.x' is inaccessible.
50+
!!! error TS2341: Property 'x' is private and only accessible within class 'Derived'.
5151

5252
var r3 = Base.fn(); // ok
5353
var r4 = Derived.fn(); // error
5454
~~~~~~~~~~
55-
!!! error TS2341: Property 'Derived.fn' is inaccessible.
55+
!!! error TS2341: Property 'fn' is private and only accessible within class 'Derived'.
5656

5757
var r5 = Base.a; // ok
5858
Base.a = 2; // ok
5959

6060
var r6 = Derived.a; // error
6161
~~~~~~~~~
62-
!!! error TS2341: Property 'Derived.a' is inaccessible.
62+
!!! error TS2341: Property 'a' is private and only accessible within class 'Derived'.
6363
Derived.a = 2; // error
6464
~~~~~~~~~
65-
!!! error TS2341: Property 'Derived.a' is inaccessible.
65+
!!! error TS2341: Property 'a' is private and only accessible within class 'Derived'.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess
2727
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(99,19): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword
2828
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(109,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword
2929
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(110,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword
30-
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(111,9): error TS2341: Property 'SomeBase.privateStaticFunc' is inaccessible.
30+
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(111,9): error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
3131
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(114,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword
3232
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(115,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword
33-
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(116,9): error TS2341: Property 'SomeBase.privateStaticFunc' is inaccessible.
33+
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(116,9): error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
3434
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(120,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword
3535
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(121,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword
36-
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(122,9): error TS2341: Property 'SomeBase.privateStaticFunc' is inaccessible.
36+
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(122,9): error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
3737
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(127,16): error TS2335: 'super' can only be referenced in a derived class.
3838
tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(127,30): error TS2335: 'super' can only be referenced in a derived class.
3939

@@ -205,7 +205,7 @@ tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess
205205
!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword
206206
super.privateStaticFunc();
207207
~~~~~~~~~~~~~~~~~~~~~~~
208-
!!! error TS2341: Property 'SomeBase.privateStaticFunc' is inaccessible.
208+
!!! error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
209209
}
210210
static get a() {
211211
~
@@ -218,7 +218,7 @@ tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess
218218
!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword
219219
super.privateStaticFunc();
220220
~~~~~~~~~~~~~~~~~~~~~~~
221-
!!! error TS2341: Property 'SomeBase.privateStaticFunc' is inaccessible.
221+
!!! error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
222222
return '';
223223
}
224224
static set a(n) {
@@ -232,7 +232,7 @@ tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess
232232
!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword
233233
super.privateStaticFunc();
234234
~~~~~~~~~~~~~~~~~~~~~~~
235-
!!! error TS2341: Property 'SomeBase.privateStaticFunc' is inaccessible.
235+
!!! error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
236236
}
237237
}
238238

0 commit comments

Comments
 (0)