Skip to content

Fix name generation scoping #58418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 6, 2024
Merged

Fix name generation scoping #58418

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22e3c37
Fix name generation scoping
rbuckton May 2, 2024
74bf8b1
Make name generation consistent in signatures and function-likes
rbuckton May 2, 2024
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
Prev Previous commit
Make name generation consistent in signatures and function-likes
  • Loading branch information
@rbuckton
rbuckton committed May 2, 2024
commit 74bf8b1686d3124e51a7066944080e29ebc8b35c
137 changes: 66 additions & 71 deletions src/compiler/emitter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2194,34 +2194,31 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
}

function emitMethodSignature(node: MethodSignature) {
pushNameGenerationScope(node);
emitModifierList(node, node.modifiers);
emit(node.name);
emit(node.questionToken);
emitTypeParameters(node, node.typeParameters);
emitParameters(node, node.parameters);
emitTypeAnnotation(node.type);
writeTrailingSemicolon();
popNameGenerationScope(node);
emitSignatureAndBody(node, emitSignatureHead, emitEmptyFunctionBody);
}

function emitMethodDeclaration(node: MethodDeclaration) {
emitDecoratorsAndModifiers(node, node.modifiers, /*allowDecorators*/ true);
emit(node.asteriskToken);
emit(node.name);
emit(node.questionToken);
emitSignatureAndBody(node, emitSignatureHead);
emitSignatureAndBody(node, emitSignatureHead, emitFunctionBody);
}

function emitClassStaticBlockDeclaration(node: ClassStaticBlockDeclaration) {
writeKeyword("static");
pushNameGenerationScope(node);
emitBlockFunctionBody(node.body);
popNameGenerationScope(node);
}

function emitConstructor(node: ConstructorDeclaration) {
emitDecoratorsAndModifiers(node, node.modifiers, /*allowDecorators*/ false);
writeKeyword("constructor");
emitSignatureAndBody(node, emitSignatureHead);
emitSignatureAndBody(node, emitSignatureHead, emitFunctionBody);
}

function emitAccessorDeclaration(node: AccessorDeclaration) {
Expand All @@ -2230,27 +2227,17 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
emitTokenWithComment(token, pos, writeKeyword, node);
writeSpace();
emit(node.name);
emitSignatureAndBody(node, emitSignatureHead);
emitSignatureAndBody(node, emitSignatureHead, emitFunctionBody);
}

function emitCallSignature(node: CallSignatureDeclaration) {
pushNameGenerationScope(node);
emitTypeParameters(node, node.typeParameters);
emitParameters(node, node.parameters);
emitTypeAnnotation(node.type);
writeTrailingSemicolon();
popNameGenerationScope(node);
emitSignatureAndBody(node, emitSignatureHead, emitEmptyFunctionBody);
}

function emitConstructSignature(node: ConstructSignatureDeclaration) {
pushNameGenerationScope(node);
writeKeyword("new");
writeSpace();
emitTypeParameters(node, node.typeParameters);
emitParameters(node, node.parameters);
emitTypeAnnotation(node.type);
writeTrailingSemicolon();
popNameGenerationScope(node);
emitSignatureAndBody(node, emitSignatureHead, emitEmptyFunctionBody);
}

function emitIndexSignature(node: IndexSignatureDeclaration) {
Expand Down Expand Up @@ -2293,14 +2280,19 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
}

function emitFunctionType(node: FunctionTypeNode) {
pushNameGenerationScope(node);
emitSignatureAndBody(node, emitFunctionTypeHead, emitFunctionTypeBody);
}

function emitFunctionTypeHead(node: FunctionTypeNode | ConstructorTypeNode) {
emitTypeParameters(node, node.typeParameters);
emitParametersForArrow(node, node.parameters);
writeSpace();
writePunctuation("=>");
}

function emitFunctionTypeBody(node: FunctionTypeNode | ConstructorTypeNode) {
writeSpace();
emit(node.type);
popNameGenerationScope(node);
}

function emitJSDocFunctionType(node: JSDocFunctionType) {
Expand All @@ -2326,17 +2318,10 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
}

function emitConstructorType(node: ConstructorTypeNode) {
pushNameGenerationScope(node);
emitModifierList(node, node.modifiers);
writeKeyword("new");
writeSpace();
emitTypeParameters(node, node.typeParameters);
emitParameters(node, node.parameters);
writeSpace();
writePunctuation("=>");
writeSpace();
emit(node.type);
popNameGenerationScope(node);
emitSignatureAndBody(node, emitFunctionTypeHead, emitFunctionTypeBody);
}

function emitTypeQuery(node: TypeQueryNode) {
Expand All @@ -2348,6 +2333,7 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri

function emitTypeLiteral(node: TypeLiteralNode) {
pushNameGenerationScope(node);
forEach(node.members, generateMemberNames);

writePunctuation("{");
const flags = getEmitFlags(node) & EmitFlags.SingleLine ? ListFormat.SingleLineTypeLiteralMembers : ListFormat.MultiLineTypeLiteralMembers;
Expand Down Expand Up @@ -2564,7 +2550,6 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri

function emitObjectLiteralExpression(node: ObjectLiteralExpression) {
pushNameGenerationScope(node);

forEach(node.properties, generateMemberNames);

const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
Expand Down Expand Up @@ -2707,7 +2692,7 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri

function emitArrowFunction(node: ArrowFunction) {
emitModifierList(node, node.modifiers);
emitSignatureAndBody(node, emitArrowFunctionHead);
emitSignatureAndBody(node, emitArrowFunctionHead, emitArrowFunctionBody);
}

function emitArrowFunctionHead(node: ArrowFunction) {
Expand All @@ -2718,6 +2703,16 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
emit(node.equalsGreaterThanToken);
}

function emitArrowFunctionBody(node: ArrowFunction) {
if (isBlock(node.body)) {
emitBlockFunctionBody(node.body);
}
else {
writeSpace();
emitExpression(node.body, parenthesizer.parenthesizeConciseBodyOfArrowFunction);
}
}

function emitDeleteExpression(node: DeleteExpression) {
emitTokenWithComment(SyntaxKind.DeleteKeyword, node.pos, writeKeyword, node);
writeSpace();
Expand Down Expand Up @@ -3298,42 +3293,40 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
emit(node.asteriskToken);
writeSpace();
emitIdentifierName(node.name);
emitSignatureAndBody(node, emitSignatureHead);
emitSignatureAndBody(node, emitSignatureHead, emitFunctionBody);
}

function emitSignatureAndBody<T extends FunctionLikeDeclaration>(node: T, emitSignatureHead: (node: T) => void) {
const body = node.body;
if (body) {
if (isBlock(body)) {
const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
if (indentedFlag) {
increaseIndent();
}
function emitSignatureAndBody<T extends SignatureDeclaration>(node: T, emitSignatureHead: (node: T) => void, emitBody: (node: T) => void) {
const indentedFlag = getEmitFlags(node) & EmitFlags.Indented;
if (indentedFlag) {
increaseIndent();
}

pushNameGenerationScope(node);
forEach(node.parameters, generateNames);
generateNames(node.body);
pushNameGenerationScope(node);
forEach(node.parameters, generateNames);
emitSignatureHead(node);
emitBody(node);
popNameGenerationScope(node);

emitSignatureHead(node);
emitBlockFunctionBody(body);
popNameGenerationScope(node);
if (indentedFlag) {
decreaseIndent();
}
}

if (indentedFlag) {
decreaseIndent();
}
}
else {
emitSignatureHead(node);
writeSpace();
emitExpression(body, parenthesizer.parenthesizeConciseBodyOfArrowFunction);
}
function emitFunctionBody<T extends Exclude<FunctionLikeDeclaration, ArrowFunction>>(node: T) {
const body = node.body;
if (body) {
emitBlockFunctionBody(body);
}
else {
emitSignatureHead(node);
writeTrailingSemicolon();
}
}

function emitEmptyFunctionBody(_node: SignatureDeclaration) {
writeTrailingSemicolon();
}

function emitSignatureHead(node: SignatureDeclaration) {
emitTypeParameters(node, node.typeParameters);
emitParameters(node, node.parameters);
Expand Down Expand Up @@ -3381,6 +3374,7 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
}

function emitBlockFunctionBody(body: Block) {
generateNames(body);
onBeforeEmitNode?.(body);
writeSpace();
writePunctuation("{");
Expand Down Expand Up @@ -3421,10 +3415,6 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
}

function emitClassDeclarationOrExpression(node: ClassDeclaration | ClassExpression) {
pushNameGenerationScope(node);

forEach(node.members, generateMemberNames);

emitDecoratorsAndModifiers(node, node.modifiers, /*allowDecorators*/ true);
emitTokenWithComment(SyntaxKind.ClassKeyword, moveRangePastModifiers(node).pos, writeKeyword, node);
if (node.name) {
Expand All @@ -3439,22 +3429,22 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri

emitTypeParameters(node, node.typeParameters);
emitList(node, node.heritageClauses, ListFormat.ClassHeritageClauses);

writeSpace();
writePunctuation("{");

pushNameGenerationScope(node);
forEach(node.members, generateMemberNames);
emitList(node, node.members, ListFormat.ClassMembers);
popNameGenerationScope(node);

writePunctuation("}");

if (indentedFlag) {
decreaseIndent();
}

popNameGenerationScope(node);
}

function emitInterfaceDeclaration(node: InterfaceDeclaration) {
pushNameGenerationScope(node);

emitDecoratorsAndModifiers(node, node.modifiers, /*allowDecorators*/ false);
writeKeyword("interface");
writeSpace();
Expand All @@ -3463,10 +3453,13 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
emitList(node, node.heritageClauses, ListFormat.HeritageClauses);
writeSpace();
writePunctuation("{");
emitList(node, node.members, ListFormat.InterfaceMembers);
writePunctuation("}");

pushNameGenerationScope(node);
forEach(node.members, generateMemberNames);
emitList(node, node.members, ListFormat.InterfaceMembers);
popNameGenerationScope(node);

writePunctuation("}");
}

function emitTypeAliasDeclaration(node: TypeAliasDeclaration) {
Expand Down Expand Up @@ -4479,7 +4472,7 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
emitList(parentNode, parameters, ListFormat.Parameters);
}

function canEmitSimpleArrowHead(parentNode: FunctionTypeNode | ArrowFunction, parameters: NodeArray<ParameterDeclaration>) {
function canEmitSimpleArrowHead(parentNode: FunctionTypeNode | ConstructorTypeNode | ArrowFunction, parameters: NodeArray<ParameterDeclaration>) {
const parameter = singleOrUndefined(parameters);
return parameter
&& parameter.pos === parentNode.pos // may not have parsed tokens between parent and parameter
Expand All @@ -4495,7 +4488,7 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
&& isIdentifier(parameter.name); // parameter name must be identifier
}

function emitParametersForArrow(parentNode: FunctionTypeNode | ArrowFunction, parameters: NodeArray<ParameterDeclaration>) {
function emitParametersForArrow(parentNode: FunctionTypeNode | ConstructorTypeNode | ArrowFunction, parameters: NodeArray<ParameterDeclaration>) {
if (canEmitSimpleArrowHead(parentNode, parameters)) {
emitList(parentNode, parameters, ListFormat.Parameters & ~ListFormat.Parenthesis);
}
Expand Down Expand Up @@ -5300,7 +5293,9 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
case SyntaxKind.PropertyAssignment:
case SyntaxKind.ShorthandPropertyAssignment:
case SyntaxKind.PropertyDeclaration:
case SyntaxKind.PropertySignature:
case SyntaxKind.MethodDeclaration:
case SyntaxKind.MethodSignature:
case SyntaxKind.GetAccessor:
case SyntaxKind.SetAccessor:
generateNameIfNeeded((node as NamedDeclaration).name);
Expand Down
18 changes: 9 additions & 9 deletions tests/baselines/reference/asyncFunctionDeclarationParameterEvaluation(target=es2015).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,17 @@ function f12() { return (...args_1) => {
function f() {
const a1 = (x_1, ...args_1) => __awaiter(this, [x_1, ...args_1], void 0, function* (x, y = z) { });
const a2 = (_a) => __awaiter(this, [_a], void 0, function* ({ [z]: x }) { });
const a3 = (...args_2) => {
const a3 = (...args_1) => {
var arguments_10 = arguments;
return __awaiter(this, [...args_2], void 0, function* (x = z) { return () => __awaiter(this, void 0, void 0, function* () { return arguments_10; }); });
return __awaiter(this, [...args_1], void 0, function* (x = z) { return () => __awaiter(this, void 0, void 0, function* () { return arguments_10; }); });
};
const a4 = (...args_2) => __awaiter(this, [...args_2], void 0, function* (x = z) { return () => __awaiter(this, void 0, void 0, function* () { return () => __awaiter(this, void 0, void 0, function* () { return arguments_10; }); }); });
const a5 = (...args_3) => __awaiter(this, [...args_3], void 0, function* (x = z, ...args) { });
const a6 = (...args_4) => __awaiter(this, [...args_4], void 0, function* (x = z, ...args) { return () => __awaiter(this, void 0, void 0, function* () { return arguments_10; }); });
const a7 = (...args_5) => __awaiter(this, [...args_5], void 0, function* (x = z, ...args) { return () => __awaiter(this, void 0, void 0, function* () { return () => __awaiter(this, void 0, void 0, function* () { return arguments_10; }); }); });
const a8 = () => __awaiter(this, void 0, void 0, function* () { return (...args_6) => __awaiter(this, [...args_6], void 0, function* (x = z) { return arguments_10; }); });
const a9 = () => __awaiter(this, void 0, void 0, function* () { return (...args_7) => __awaiter(this, [...args_7], void 0, function* (x = z) { return () => __awaiter(this, void 0, void 0, function* () { return arguments_10; }); }); });
const a10 = (...args_8) => __awaiter(this, [...args_8], void 0, function* (x = z) { return () => __awaiter(this, void 0, void 0, function* () { return function () {
const a4 = (...args_1) => __awaiter(this, [...args_1], void 0, function* (x = z) { return () => __awaiter(this, void 0, void 0, function* () { return () => __awaiter(this, void 0, void 0, function* () { return arguments_10; }); }); });
const a5 = (...args_1) => __awaiter(this, [...args_1], void 0, function* (x = z, ...args) { });
const a6 = (...args_1) => __awaiter(this, [...args_1], void 0, function* (x = z, ...args) { return () => __awaiter(this, void 0, void 0, function* () { return arguments_10; }); });
const a7 = (...args_1) => __awaiter(this, [...args_1], void 0, function* (x = z, ...args) { return () => __awaiter(this, void 0, void 0, function* () { return () => __awaiter(this, void 0, void 0, function* () { return arguments_10; }); }); });
const a8 = () => __awaiter(this, void 0, void 0, function* () { return (...args_1) => __awaiter(this, [...args_1], void 0, function* (x = z) { return arguments_10; }); });
const a9 = () => __awaiter(this, void 0, void 0, function* () { return (...args_1) => __awaiter(this, [...args_1], void 0, function* (x = z) { return () => __awaiter(this, void 0, void 0, function* () { return arguments_10; }); }); });
const a10 = (...args_1) => __awaiter(this, [...args_1], void 0, function* (x = z) { return () => __awaiter(this, void 0, void 0, function* () { return function () {
var arguments_11 = arguments;
return __awaiter(this, void 0, void 0, function* () { return () => __awaiter(this, void 0, void 0, function* () { return arguments_11; }); });
}; }); });
Expand Down