Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6393,7 +6393,8 @@ namespace ts {
includePrivateSymbol?.(sym);
}
if (isIdentifier(node)) {
const name = sym.flags & SymbolFlags.TypeParameter ? typeParameterToName(getDeclaredTypeOfSymbol(sym), context) : factory.cloneNode(node);
const type = getDeclaredTypeOfSymbol(sym);
const name = sym.flags & SymbolFlags.TypeParameter && !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration) ? typeParameterToName(type, context) : factory.cloneNode(node);
name.symbol = sym; // for quickinfo, which uses identifier symbol information
return { introducesError, node: setEmitFlags(setOriginalNode(name, node), EmitFlags.NoAsciiEscaping) };
}
Expand Down
37 changes: 37 additions & 0 deletions tests/baselines/reference/typeParametersAvailableInNestedScope3.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
//// [typeParametersAvailableInNestedScope3.ts]
function foo<T>(v: T) {
function a<T>(a: T) { return a; }
function b(): T { return v; }

function c<T>(v: T) {
function a<T>(a: T) { return a; }
function b(): T { return v; }
return { a, b };
}

return { a, b, c };
}


//// [typeParametersAvailableInNestedScope3.js]
function foo(v) {
function a(a) { return a; }
function b() { return v; }
function c(v) {
function a(a) { return a; }
function b() { return v; }
return { a: a, b: b };
}
return { a: a, b: b, c: c };
}


//// [typeParametersAvailableInNestedScope3.d.ts]
declare function foo<T>(v: T): {
a: <T_1>(a: T_1) => T_1;
b: () => T;
c: <T_2>(v: T_2) => {
a: <T_3>(a: T_3) => T_3;
b: () => T_2;
};
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
=== tests/cases/conformance/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope3.ts ===
function foo<T>(v: T) {
>foo : Symbol(foo, Decl(typeParametersAvailableInNestedScope3.ts, 0, 0))
>T : Symbol(T, Decl(typeParametersAvailableInNestedScope3.ts, 0, 13))
>v : Symbol(v, Decl(typeParametersAvailableInNestedScope3.ts, 0, 16))
>T : Symbol(T, Decl(typeParametersAvailableInNestedScope3.ts, 0, 13))

function a<T>(a: T) { return a; }
>a : Symbol(a, Decl(typeParametersAvailableInNestedScope3.ts, 0, 23))
>T : Symbol(T, Decl(typeParametersAvailableInNestedScope3.ts, 1, 15))
>a : Symbol(a, Decl(typeParametersAvailableInNestedScope3.ts, 1, 18))
>T : Symbol(T, Decl(typeParametersAvailableInNestedScope3.ts, 1, 15))
>a : Symbol(a, Decl(typeParametersAvailableInNestedScope3.ts, 1, 18))

function b(): T { return v; }
>b : Symbol(b, Decl(typeParametersAvailableInNestedScope3.ts, 1, 37))
>T : Symbol(T, Decl(typeParametersAvailableInNestedScope3.ts, 0, 13))
>v : Symbol(v, Decl(typeParametersAvailableInNestedScope3.ts, 0, 16))

function c<T>(v: T) {
>c : Symbol(c, Decl(typeParametersAvailableInNestedScope3.ts, 2, 33))
>T : Symbol(T, Decl(typeParametersAvailableInNestedScope3.ts, 4, 15))
>v : Symbol(v, Decl(typeParametersAvailableInNestedScope3.ts, 4, 18))
>T : Symbol(T, Decl(typeParametersAvailableInNestedScope3.ts, 4, 15))

function a<T>(a: T) { return a; }
>a : Symbol(a, Decl(typeParametersAvailableInNestedScope3.ts, 4, 25))
>T : Symbol(T, Decl(typeParametersAvailableInNestedScope3.ts, 5, 19))
>a : Symbol(a, Decl(typeParametersAvailableInNestedScope3.ts, 5, 22))
>T : Symbol(T, Decl(typeParametersAvailableInNestedScope3.ts, 5, 19))
>a : Symbol(a, Decl(typeParametersAvailableInNestedScope3.ts, 5, 22))

function b(): T { return v; }
>b : Symbol(b, Decl(typeParametersAvailableInNestedScope3.ts, 5, 41))
>T : Symbol(T, Decl(typeParametersAvailableInNestedScope3.ts, 4, 15))
>v : Symbol(v, Decl(typeParametersAvailableInNestedScope3.ts, 4, 18))

return { a, b };
>a : Symbol(a, Decl(typeParametersAvailableInNestedScope3.ts, 7, 16))
>b : Symbol(b, Decl(typeParametersAvailableInNestedScope3.ts, 7, 19))
}

return { a, b, c };
>a : Symbol(a, Decl(typeParametersAvailableInNestedScope3.ts, 10, 12))
>b : Symbol(b, Decl(typeParametersAvailableInNestedScope3.ts, 10, 15))
>c : Symbol(c, Decl(typeParametersAvailableInNestedScope3.ts, 10, 18))
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
=== tests/cases/conformance/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope3.ts ===
function foo<T>(v: T) {
>foo : <T>(v: T) => { a: <T>(a: T) => T; b: () => T; c: <T>(v: T) => { a: <T>(a: T) => T; b: () => T; }; }
>v : T

function a<T>(a: T) { return a; }
>a : <T>(a: T) => T
>a : T
>a : T

function b(): T { return v; }
>b : () => T
>v : T

function c<T>(v: T) {
>c : <T>(v: T) => { a: <T>(a: T) => T; b: () => T; }
>v : T

function a<T>(a: T) { return a; }
>a : <T>(a: T) => T
>a : T
>a : T

function b(): T { return v; }
>b : () => T
>v : T

return { a, b };
>{ a, b } : { a: <T>(a: T) => T; b: () => T; }
>a : <T>(a: T) => T
>b : () => T
}

return { a, b, c };
>{ a, b, c } : { a: <T>(a: T) => T; b: () => T; c: <T>(v: T) => { a: <T>(a: T) => T; b: () => T; }; }
>a : <T>(a: T) => T
>b : () => T
>c : <T>(v: T) => { a: <T>(a: T) => T; b: () => T; }
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// @declaration: true

function foo<T>(v: T) {
function a<T>(a: T) { return a; }
function b(): T { return v; }

function c<T>(v: T) {
function a<T>(a: T) { return a; }
function b(): T { return v; }
return { a, b };
}

return { a, b, c };
}