Merge branch 'main' of https://github.com/microsoft/TypeScript into 57026

Author: NamHaiBui

.github/workflows/ci.yml

@@ -95,7 +95,7 @@ jobs:
           name: coverage
           path: coverage
 
-      - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
+      - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
         with:
           use_oidc: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork) }}
           disable_search: true
@@ -137,7 +137,7 @@ jobs:
           node-version: 'lts/*'
       - run: npm ci
 
-      - uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
+      - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
         with:
           path: ~/.cache/dprint
           key: ${{ runner.os }}-dprint-${{ hashFiles('package-lock.json', '.dprint.jsonc') }}

src/compiler/expressionToTypeNode.ts

@@ -1122,15 +1122,16 @@ export function createSyntacticTypeNodeBuilder(
         );
     }
     function reuseTypeParameters(typeParameters: NodeArray<TypeParameterDeclaration> | undefined, context: SyntacticTypeNodeBuilderContext) {
-        return typeParameters?.map(tp =>
-            factory.updateTypeParameterDeclaration(
+        return typeParameters?.map(tp => {
+            const { node: tpName } = resolver.trackExistingEntityName(context, tp.name);
+            return factory.updateTypeParameterDeclaration(
                 tp,
                 tp.modifiers?.map(m => reuseNode(context, m)),
-                reuseNode(context, tp.name),
+                tpName,
                 serializeExistingTypeNodeWithFallback(tp.constraint, context),
                 serializeExistingTypeNodeWithFallback(tp.default, context),
-            )
-        );
+            );
+        });
     }
 
     function typeFromObjectLiteralMethod(method: MethodDeclaration, name: PropertyName, context: SyntacticTypeNodeBuilderContext, isConstContext: boolean) {

tests/baselines/reference/declarationEmitShadowing.js

@@ -0,0 +1,41 @@
+//// [tests/cases/compiler/declarationEmitShadowing.ts] ////
+
+//// [declarationEmitShadowing.ts]
+export class A<T = any> {
+  public readonly ShadowedButDoesNotRequireRenaming = <T>(): T => {
+      return null as any
+  }
+}
+
+export function needsRenameForShadowing<T>() {
+  type A = T
+  return function O<T>(t: A, t2: T) {
+  }
+}
+
+
+//// [declarationEmitShadowing.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.A = void 0;
+exports.needsRenameForShadowing = needsRenameForShadowing;
+var A = /** @class */ (function () {
+    function A() {
+        this.ShadowedButDoesNotRequireRenaming = function () {
+            return null;
+        };
+    }
+    return A;
+}());
+exports.A = A;
+function needsRenameForShadowing() {
+    return function O(t, t2) {
+    };
+}
+
+
+//// [declarationEmitShadowing.d.ts]
+export declare class A<T = any> {
+    readonly ShadowedButDoesNotRequireRenaming: <T_1>() => T_1;
+}
+export declare function needsRenameForShadowing<T>(): <T_1>(t: T, t2: T_1) => void;

tests/baselines/reference/declarationEmitShadowing.symbols

@@ -0,0 +1,34 @@
+//// [tests/cases/compiler/declarationEmitShadowing.ts] ////
+
+=== declarationEmitShadowing.ts ===
+export class A<T = any> {
+>A : Symbol(A, Decl(declarationEmitShadowing.ts, 0, 0))
+>T : Symbol(T, Decl(declarationEmitShadowing.ts, 0, 15))
+
+  public readonly ShadowedButDoesNotRequireRenaming = <T>(): T => {
+>ShadowedButDoesNotRequireRenaming : Symbol(A.ShadowedButDoesNotRequireRenaming, Decl(declarationEmitShadowing.ts, 0, 25))
+>T : Symbol(T, Decl(declarationEmitShadowing.ts, 1, 55))
+>T : Symbol(T, Decl(declarationEmitShadowing.ts, 1, 55))
+
+      return null as any
+  }
+}
+
+export function needsRenameForShadowing<T>() {
+>needsRenameForShadowing : Symbol(needsRenameForShadowing, Decl(declarationEmitShadowing.ts, 4, 1))
+>T : Symbol(T, Decl(declarationEmitShadowing.ts, 6, 40))
+
+  type A = T
+>A : Symbol(A, Decl(declarationEmitShadowing.ts, 6, 46))
+>T : Symbol(T, Decl(declarationEmitShadowing.ts, 6, 40))
+
+  return function O<T>(t: A, t2: T) {
+>O : Symbol(O, Decl(declarationEmitShadowing.ts, 8, 8))
+>T : Symbol(T, Decl(declarationEmitShadowing.ts, 8, 20))
+>t : Symbol(t, Decl(declarationEmitShadowing.ts, 8, 23))
+>A : Symbol(A, Decl(declarationEmitShadowing.ts, 6, 46))
+>t2 : Symbol(t2, Decl(declarationEmitShadowing.ts, 8, 28))
+>T : Symbol(T, Decl(declarationEmitShadowing.ts, 8, 20))
+  }
+}
+

tests/baselines/reference/declarationEmitShadowing.types

@@ -0,0 +1,38 @@
+//// [tests/cases/compiler/declarationEmitShadowing.ts] ////
+
+=== declarationEmitShadowing.ts ===
+export class A<T = any> {
+>A : A<T>
+>  : ^^^^
+
+  public readonly ShadowedButDoesNotRequireRenaming = <T>(): T => {
+>ShadowedButDoesNotRequireRenaming : <T_1>() => T_1
+>                                  : ^^^^^^^^^^^   
+><T>(): T => {      return null as any  } : <T_1>() => T_1
+>                                         : ^^^^^^^^^^^   
+
+      return null as any
+>null as any : any
+  }
+}
+
+export function needsRenameForShadowing<T>() {
+>needsRenameForShadowing : <T>() => <T_1>(t: T, t2: T_1) => void
+>                        : ^ ^^^^^^^^   ^^   ^^^       ^^^^^^^^^
+
+  type A = T
+>A : T
+>  : ^
+
+  return function O<T>(t: A, t2: T) {
+>function O<T>(t: A, t2: T) {  } : <T_1>(t: T, t2: T_1) => void
+>                                : ^^^^^^ ^^^^^  ^^   ^^^^^^^^^
+>O : <T>(t: T_1, t2: T) => void
+>  : ^ ^^ ^^^^^^^  ^^ ^^^^^^^^^
+>t : T_1
+>  : ^^^
+>t2 : T
+>   : ^
+  }
+}
+

tests/cases/compiler/declarationEmitShadowing.ts

@@ -0,0 +1,13 @@
+// @declaration: true
+
+export class A<T = any> {
+  public readonly ShadowedButDoesNotRequireRenaming = <T>(): T => {
+      return null as any
+  }
+}
+
+export function needsRenameForShadowing<T>() {
+  type A = T
+  return function O<T>(t: A, t2: T) {
+  }
+}