Skip to content

Commit

Permalink
Always consider type parameters in scope visible to the node builder (#…
Browse files Browse the repository at this point in the history 
…58078)
  • Loading branch information
@weswigham
weswigham authored Apr 4, 2024
1 parent 9f8a231 commit 386cc0f
Show file tree
Hide file tree
Showing 82 changed files with 213 additions and 217 deletions.
10 changes: 6 additions & 4 deletions src/compiler/checker.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8672,10 +8672,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
const meaning = getMeaningOfEntityNameReference(node);
const sym = resolveEntityName(leftmost, meaning, /*ignoreErrors*/ true, /*dontResolveAlias*/ true);
if (sym) {
if (isSymbolAccessible(sym, context.enclosingDeclaration, meaning, /*shouldComputeAliasesToMakeVisible*/ false).accessibility !== SymbolAccessibility.Accessible) {
if (!isDeclarationName(node)) {
introducesError = true;
}
if (
!(sym.flags & SymbolFlags.TypeParameter) && // Type parameters are visible in the curent context if they are are resolvable
!isDeclarationName(node) &&
isSymbolAccessible(sym, context.enclosingDeclaration, meaning, /*shouldComputeAliasesToMakeVisible*/ false).accessibility !== SymbolAccessibility.Accessible
) {
introducesError = true;
}
else {
context.tracker.trackSymbol(sym, context.enclosingDeclaration, meaning);
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/1.0lib-noErrors.types
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2412,7 +2412,7 @@ interface Array<T> {
}
declare var Array: {
>Array : { (arrayLength?: number): any[]; <T>(arrayLength: number): T[]; <T_1>(...items: T_1[]): T_1[]; new (arrayLength?: number): any[]; new <T_2>(arrayLength: number): T_2[]; new <T_3>(...items: T_3[]): T_3[]; isArray(arg: any): boolean; prototype: Array<any>; }
> : ^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^ ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^^^^^^^ ^^^
> : ^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^ ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^ ^^^^^^^^^^^^^^^ ^^^ ^^^^^^^ ^^^^^^^^^^^^ ^^^ ^^^^^^^^^^^^^^^ ^^^ ^^^^^^^^^^^^^ ^^^

new (arrayLength?: number): any[];
>arrayLength : number
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/assignmentCompatWithCallSignatures4.types
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ module Errors {

(x: {
>x : { <T extends Derived>(a: T): T; <T_1 extends Base>(a: T_1): T_1; }
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

<T extends Derived>(a: T): T;
>a : T
Expand All @@ -173,7 +173,7 @@ module Errors {
}): any[];
(x: {
>x : { <T extends Derived2>(a: T): T; <T_1 extends Base>(a: T_1): T_1; }
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

<T extends Derived2>(a: T): T;
>a : T
Expand Down
6 changes: 3 additions & 3 deletions tests/baselines/reference/assignmentCompatWithCallSignatures5.types
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ var a16: <T extends Base>(x: { a: T; b: T }) => T[];

var a17: {
>a17 : { <T extends Derived>(x: (a: T) => T): T[]; <T_1 extends Base>(x: (a: T_1) => T_1): T_1[]; }
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

<T extends Derived>(x: (a: T) => T): T[];
>x : (a: T) => T
Expand All @@ -132,7 +132,7 @@ var a18: {

(x: {
>x : { <T extends Derived>(a: T): T; <T_1 extends Base>(a: T_1): T_1; }
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

<T extends Derived>(a: T): T;
>a : T
Expand All @@ -145,7 +145,7 @@ var a18: {
}): any[];
(x: {
>x : { <T extends Derived2>(a: T): T; <T_1 extends Base>(a: T_1): T_1; }
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

<T extends Derived2>(a: T): T;
>a : T
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/assignmentCompatWithConstructSignatures4.types
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ module Errors {

new (x: {
>x : { new <T extends Derived>(a: T): T; new <T_1 extends Base>(a: T_1): T_1; }
> : ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

new <T extends Derived>(a: T): T;
>a : T
Expand All @@ -173,7 +173,7 @@ module Errors {
}): any[];
new (x: {
>x : { new <T extends Derived2>(a: T): T; new <T_1 extends Base>(a: T_1): T_1; }
> : ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

new <T extends Derived2>(a: T): T;
>a : T
Expand Down
6 changes: 3 additions & 3 deletions tests/baselines/reference/assignmentCompatWithConstructSignatures5.types
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ var a16: new <T extends Base>(x: { a: T; b: T }) => T[];

var a17: {
>a17 : { new <T extends Derived>(x: new (a: T) => T): T[]; new <T_1 extends Base>(x: new (a: T_1) => T_1): T_1[]; }
> : ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

new <T extends Derived>(x: new (a: T) => T): T[];
>x : new (a: T) => T
Expand All @@ -132,7 +132,7 @@ var a18: {

new (x: {
>x : { new <T extends Derived>(a: T): T; new <T_1 extends Base>(a: T_1): T_1; }
> : ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

new <T extends Derived>(a: T): T;
>a : T
Expand All @@ -145,7 +145,7 @@ var a18: {
}): any[];
new (x: {
>x : { new <T extends Derived2>(a: T): T; new <T_1 extends Base>(a: T_1): T_1; }
> : ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

new <T extends Derived2>(a: T): T;
>a : T
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/callSignatureAssignabilityInInheritance3.types
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ module Errors {

(x: {
>x : { <T extends Derived>(a: T): T; <T_1 extends Base>(a: T_1): T_1; }
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

<T extends Derived>(a: T): T;
>a : T
Expand All @@ -173,7 +173,7 @@ module Errors {
}): any[];
(x: {
>x : { <T extends Derived2>(a: T): T; <T_1 extends Base>(a: T_1): T_1; }
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

<T extends Derived2>(a: T): T;
>a : T
Expand Down
6 changes: 3 additions & 3 deletions tests/baselines/reference/callSignatureAssignabilityInInheritance4.types
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ interface A { // T

a17: {
>a17 : { <T extends Derived>(x: (a: T) => T): T[]; <T_1 extends Base>(x: (a: T_1) => T_1): T_1[]; }
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

<T extends Derived>(x: (a: T) => T): T[];
>x : (a: T) => T
Expand All @@ -134,7 +134,7 @@ interface A { // T

(x: {
>x : { <T extends Derived>(a: T): T; <T_1 extends Base>(a: T_1): T_1; }
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

<T extends Derived>(a: T): T;
>a : T
Expand All @@ -147,7 +147,7 @@ interface A { // T
}): any[];
(x: {
>x : { <T extends Derived2>(a: T): T; <T_1 extends Base>(a: T_1): T_1; }
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^^ ^^^ ^^^ ^^^^^^^^^^^^^^^^^^ ^^^ ^^^

<T extends Derived2>(a: T): T;
>a : T
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/callSignaturesThatDifferOnlyByReturnType.types
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ var a: {

var a2: {
>a2 : { <T>(x: T): number; <T_1>(x: T_1): string; }
> : ^^^ ^^^^^ ^^^ ^^^ ^^^^^^^^^^^ ^^^
> : ^^^ ^^^^^ ^^^ ^^^ ^^^^^ ^^^ ^^^

<T>(x: T): number;
>x : T
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/circularInlineMappedGenericTupleTypeNoCrash.types
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ class Foo<Elements extends readonly unknown[]> {

public readonly elements: { [P in keyof Elements]: { bar: Elements[P] } };
>elements : { [P in keyof Elements]: { bar: Elements[P]; }; }
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^
>bar : Elements[P]
> : ^^^^^^^^^^^

public constructor(
...elements: { [P in keyof Elements]: { bar: Elements[P] } }
>elements : { [P in keyof Elements]: { bar: Elements[P]; }; }
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> : ^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^
>bar : Elements[P]
> : ^^^^^^^^^^^

Expand Down
Loading

0 comments on commit 386cc0f

Please sign in to comment.