Skip to content

Commit 88a002a

Browse files
typescript-botAndaristMichaelMitchell-at
authored
🤖 Pick PR #61261 (Fixed accidentally reused comments ...) into release-5.8 (#61290)
Co-authored-by: Mateusz BurzyÅ„ski <[email protected]> Co-authored-by: michaelm <[email protected]>
1 parent 021dba5 commit 88a002a

14 files changed

+374
-10
lines changed

‎src/compiler/checker.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6209,6 +6209,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
62096209
const context = syntacticContext as NodeBuilderContext;
62106210
if (context.bundled || context.enclosingFile !== getSourceFileOfNode(lit)) {
62116211
let name = lit.text;
6212+
const originalName = name;
62126213
const nodeSymbol = getNodeLinks(parent).resolvedSymbol;
62136214
const meaning = parent.isTypeOf ? SymbolFlags.Value : SymbolFlags.Type;
62146215
const parentSymbol = nodeSymbol
@@ -6229,7 +6230,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
62296230
context.tracker.reportLikelyUnsafeImportRequiredError(name);
62306231
}
62316232
}
6232-
return name;
6233+
if (name !== originalName) {
6234+
return name;
6235+
}
62336236
}
62346237
},
62356238
canReuseTypeNode(context, typeNode) {
@@ -8834,10 +8837,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
88348837
return setTextRange(context, setEmitFlags(name, EmitFlags.NoAsciiEscaping), node);
88358838
}
88368839
const updated = visitEachChildWorker(node, c => attachSymbolToLeftmostIdentifier(c), /*context*/ undefined);
8837-
if (updated !== node) {
8838-
setTextRange(context, updated, node);
8839-
}
8840-
return updated;
8840+
return setTextRange(context, updated, node);
88418841
}
88428842
}
88438843

‎src/compiler/expressionToTypeNode.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -435,9 +435,11 @@ export function createSyntacticTypeNodeBuilder(
435435
if (!resolver.canReuseTypeNode(context, node)) {
436436
return resolver.serializeExistingTypeNode(context, node);
437437
}
438+
const specifier = rewriteModuleSpecifier(node, node.argument.literal);
439+
const literal = specifier === node.argument.literal ? reuseNode(context, node.argument.literal) : specifier;
438440
return factory.updateImportTypeNode(
439441
node,
440-
factory.updateLiteralTypeNode(node.argument, rewriteModuleSpecifier(node, node.argument.literal)),
442+
literal === node.argument.literal ? reuseNode(context, node.argument) : factory.createLiteralTypeNode(literal),
441443
visitNode(node.attributes, visitExistingNodeTreeSymbols, isImportAttributes),
442444
visitNode(node.qualifier, visitExistingNodeTreeSymbols, isEntityName),
443445
visitNodes(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode),
@@ -612,10 +614,7 @@ export function createSyntacticTypeNodeBuilder(
612614

613615
function rewriteModuleSpecifier(parent: ImportTypeNode, lit: StringLiteral) {
614616
const newName = resolver.getModuleSpecifierOverride(context, parent, lit);
615-
if (newName) {
616-
return setOriginalNode(factory.createStringLiteral(newName), lit);
617-
}
618-
return visitNode(lit, visitExistingNodeTreeSymbols, isStringLiteral)!;
617+
return newName ? setOriginalNode(factory.createStringLiteral(newName), lit) : lit;
619618
}
620619
}
621620
}

‎tests/baselines/reference/declarationEmitNoInvalidCommentReuse1.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse1.ts] ////
2+
3+
//// [a.ts]
4+
import { object } from "./obj";
5+
6+
export const _ = object;
7+
8+
///////////
9+
/**
10+
* huh
11+
*/
12+
//// [obj.d.ts]
13+
export declare const object: import("./id").Id<{
14+
foo: import("./id" ).Id<{}>;
15+
}>;
16+
17+
//// [id.d.ts]
18+
export type Id<T> = T;
19+
20+
21+
22+
23+
//// [a.d.ts]
24+
export declare const _: {
25+
foo: import("./id").Id<{}>;
26+
};
27+
/**
28+
* huh
29+
*/

‎tests/baselines/reference/declarationEmitNoInvalidCommentReuse1.symbols

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse1.ts] ////
2+
3+
=== a.ts ===
4+
import { object } from "./obj";
5+
>object : Symbol(object, Decl(a.ts, 0, 8))
6+
7+
export const _ = object;
8+
>_ : Symbol(_, Decl(a.ts, 2, 12))
9+
>object : Symbol(object, Decl(a.ts, 0, 8))
10+
11+
///////////
12+
/**
13+
* huh
14+
*/
15+
=== obj.d.ts ===
16+
export declare const object: import("./id").Id<{
17+
>object : Symbol(object, Decl(obj.d.ts, 0, 20))
18+
>Id : Symbol(Id, Decl(id.d.ts, 0, 0))
19+
20+
foo: import("./id" ).Id<{}>;
21+
>foo : Symbol(foo, Decl(obj.d.ts, 0, 48))
22+
>Id : Symbol(Id, Decl(id.d.ts, 0, 0))
23+
24+
}>;
25+
26+
=== id.d.ts ===
27+
export type Id<T> = T;
28+
>Id : Symbol(Id, Decl(id.d.ts, 0, 0))
29+
>T : Symbol(T, Decl(id.d.ts, 0, 15))
30+
>T : Symbol(T, Decl(id.d.ts, 0, 15))
31+

‎tests/baselines/reference/declarationEmitNoInvalidCommentReuse1.types

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse1.ts] ////
2+
3+
=== a.ts ===
4+
import { object } from "./obj";
5+
>object : { foo: import("id").Id<{}>; }
6+
> : ^^^^^^^ ^^^
7+
8+
export const _ = object;
9+
>_ : { foo: import("id").Id<{}>; }
10+
> : ^^^^^^^ ^^^
11+
>object : { foo: import("id").Id<{}>; }
12+
> : ^^^^^^^ ^^^
13+
14+
///////////
15+
/**
16+
* huh
17+
*/
18+
=== obj.d.ts ===
19+
export declare const object: import("./id").Id<{
20+
>object : { foo: import("./id").Id<{}>; }
21+
> : ^^^^^^^ ^^^
22+
23+
foo: import("./id" ).Id<{}>;
24+
>foo : {}
25+
> : ^^
26+
27+
}>;
28+
29+
=== id.d.ts ===
30+
export type Id<T> = T;
31+
>Id : T
32+
> : ^
33+

‎tests/baselines/reference/declarationEmitNoInvalidCommentReuse2.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse2.ts] ////
2+
3+
//// [a.ts]
4+
import { object } from "./obj.ts";
5+
6+
export const _ = object;
7+
8+
///////////
9+
/**
10+
* huh
11+
*/
12+
//// [obj.d.ts]
13+
export declare const object: import("./id.ts").Id<{
14+
foo: import("./id.ts" ).Id<{}>;
15+
}>;
16+
17+
//// [id.d.ts]
18+
export type Id<T> = T;
19+
20+
21+
22+
23+
//// [a.d.ts]
24+
export declare const _: {
25+
foo: import("./id").Id<{}>;
26+
};
27+
/**
28+
* huh
29+
*/

‎tests/baselines/reference/declarationEmitNoInvalidCommentReuse2.symbols

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse2.ts] ////
2+
3+
=== a.ts ===
4+
import { object } from "./obj.ts";
5+
>object : Symbol(object, Decl(a.ts, 0, 8))
6+
7+
export const _ = object;
8+
>_ : Symbol(_, Decl(a.ts, 2, 12))
9+
>object : Symbol(object, Decl(a.ts, 0, 8))
10+
11+
///////////
12+
/**
13+
* huh
14+
*/
15+
=== obj.d.ts ===
16+
export declare const object: import("./id.ts").Id<{
17+
>object : Symbol(object, Decl(obj.d.ts, 0, 20))
18+
>Id : Symbol(Id, Decl(id.d.ts, 0, 0))
19+
20+
foo: import("./id.ts" ).Id<{}>;
21+
>foo : Symbol(foo, Decl(obj.d.ts, 0, 51))
22+
>Id : Symbol(Id, Decl(id.d.ts, 0, 0))
23+
24+
}>;
25+
26+
=== id.d.ts ===
27+
export type Id<T> = T;
28+
>Id : Symbol(Id, Decl(id.d.ts, 0, 0))
29+
>T : Symbol(T, Decl(id.d.ts, 0, 15))
30+
>T : Symbol(T, Decl(id.d.ts, 0, 15))
31+

‎tests/baselines/reference/declarationEmitNoInvalidCommentReuse2.types

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse2.ts] ////
2+
3+
=== a.ts ===
4+
import { object } from "./obj.ts";
5+
>object : { foo: import("id").Id<{}>; }
6+
> : ^^^^^^^ ^^^
7+
8+
export const _ = object;
9+
>_ : { foo: import("id").Id<{}>; }
10+
> : ^^^^^^^ ^^^
11+
>object : { foo: import("id").Id<{}>; }
12+
> : ^^^^^^^ ^^^
13+
14+
///////////
15+
/**
16+
* huh
17+
*/
18+
=== obj.d.ts ===
19+
export declare const object: import("./id.ts").Id<{
20+
>object : { foo: import("./id.ts").Id<{}>; }
21+
> : ^^^^^^^ ^^^
22+
23+
foo: import("./id.ts" ).Id<{}>;
24+
>foo : {}
25+
> : ^^
26+
27+
}>;
28+
29+
=== id.d.ts ===
30+
export type Id<T> = T;
31+
>Id : T
32+
> : ^
33+

‎tests/baselines/reference/declarationEmitNoInvalidCommentReuse3.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse3.ts] ////
2+
3+
//// [a.ts]
4+
import { object } from "./obj";
5+
import { id } from "./id";
6+
export const _ = object;
7+
/**
8+
*/
9+
//// [obj.d.ts]
10+
import { id } from "./id";
11+
// ----
12+
export declare const object: id.A<{
13+
foo: id.A<1>
14+
}>;
15+
16+
//// [id.d.ts]
17+
export declare namespace id {
18+
type A<T> = T;
19+
}
20+
21+
22+
23+
//// [a.d.ts]
24+
import { id } from "./id";
25+
export declare const _: {
26+
foo: id.A<1>;
27+
};
28+
/**
29+
*/

‎tests/baselines/reference/declarationEmitNoInvalidCommentReuse3.symbols

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse3.ts] ////
2+
3+
=== a.ts ===
4+
import { object } from "./obj";
5+
>object : Symbol(object, Decl(a.ts, 0, 8))
6+
7+
import { id } from "./id";
8+
>id : Symbol(id, Decl(a.ts, 1, 8))
9+
10+
export const _ = object;
11+
>_ : Symbol(_, Decl(a.ts, 2, 12))
12+
>object : Symbol(object, Decl(a.ts, 0, 8))
13+
14+
/**
15+
*/
16+
=== obj.d.ts ===
17+
import { id } from "./id";
18+
>id : Symbol(id, Decl(obj.d.ts, 0, 8))
19+
20+
// ----
21+
export declare const object: id.A<{
22+
>object : Symbol(object, Decl(obj.d.ts, 2, 20))
23+
>id : Symbol(id, Decl(obj.d.ts, 0, 8))
24+
>A : Symbol(id.A, Decl(id.d.ts, 0, 29))
25+
26+
foo: id.A<1>
27+
>foo : Symbol(foo, Decl(obj.d.ts, 2, 35))
28+
>id : Symbol(id, Decl(obj.d.ts, 0, 8))
29+
>A : Symbol(id.A, Decl(id.d.ts, 0, 29))
30+
31+
}>;
32+
33+
=== id.d.ts ===
34+
export declare namespace id {
35+
>id : Symbol(id, Decl(id.d.ts, 0, 0))
36+
37+
type A<T> = T;
38+
>A : Symbol(A, Decl(id.d.ts, 0, 29))
39+
>T : Symbol(T, Decl(id.d.ts, 1, 11))
40+
>T : Symbol(T, Decl(id.d.ts, 1, 11))
41+
}

‎tests/baselines/reference/declarationEmitNoInvalidCommentReuse3.types

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse3.ts] ////
2+
3+
=== a.ts ===
4+
import { object } from "./obj";
5+
>object : { foo: id.A<1>; }
6+
> : ^^^^^^^ ^^^
7+
8+
import { id } from "./id";
9+
>id : any
10+
> : ^^^
11+
12+
export const _ = object;
13+
>_ : { foo: id.A<1>; }
14+
> : ^^^^^^^ ^^^
15+
>object : { foo: id.A<1>; }
16+
> : ^^^^^^^ ^^^
17+
18+
/**
19+
*/
20+
=== obj.d.ts ===
21+
import { id } from "./id";
22+
>id : any
23+
> : ^^^
24+
25+
// ----
26+
export declare const object: id.A<{
27+
>object : { foo: id.A<1>; }
28+
> : ^^^^^^^ ^^^
29+
>id : any
30+
> : ^^^
31+
32+
foo: id.A<1>
33+
>foo : 1
34+
> : ^
35+
>id : any
36+
> : ^^^
37+
38+
}>;
39+
40+
=== id.d.ts ===
41+
export declare namespace id {
42+
type A<T> = T;
43+
>A : T
44+
> : ^
45+
}

‎tests/cases/compiler/declarationEmitNoInvalidCommentReuse1.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// @strict: true
2+
// @declaration: true
3+
// @emitDeclarationOnly: true
4+
5+
// https://github.com/microsoft/TypeScript/issues/61239
6+
7+
// @filename: a.ts
8+
import { object } from "./obj";
9+
10+
export const _ = object;
11+
12+
///////////
13+
/**
14+
* huh
15+
*/
16+
// @filename: obj.d.ts
17+
export declare const object: import("./id").Id<{
18+
foo: import("./id" ).Id<{}>;
19+
}>;
20+
21+
// @filename: id.d.ts
22+
export type Id<T> = T;

0 commit comments

Comments
 (0)