microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 08:11:30 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix(47561): use parameter name from enclosing declaration (#47609)

Browse Source
This commit is contained in:
Oleksandr T 2022-01-26 14:00:14 +02:00 committed by GitHub
parent d56d62185f
commit 3206df8e6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 141 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/checker.ts
View File

@ -6397,7 +6397,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) };
}

37
tests/baselines/reference/typeParametersAvailableInNestedScope3.js Normal file
View File

@ -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;
};
};

48
tests/baselines/reference/typeParametersAvailableInNestedScope3.symbols Normal file
View File

@ -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))
}

40
tests/baselines/reference/typeParametersAvailableInNestedScope3.types Normal file
View File

@ -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; }
}

14
tests/cases/conformance/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope3.ts Normal file
View File

@ -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 };
}