Skip to content

Commit cbf15bb

Browse files
sandersnsandersn
authored
feat(38225): change diagnostic message for remove braces from arrow function body (microsoft#38226)
2 parents 5895493 + 57f161e commit cbf15bb

15 files changed

+37
-37
lines changed

‎src/compiler/diagnosticMessages.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5657,7 +5657,7 @@
56575657
"category": "Message",
56585658
"code": 95111
56595659
},
5660-
"Remove block body braces": {
5660+
"Remove braces from arrow function body": {
56615661
"category": "Message",
56625662
"code": 95112
56635663
},
@@ -5669,15 +5669,15 @@
56695669
"category": "Message",
56705670
"code": 95114
56715671
},
5672-
"Remove all incorrect body block braces": {
5672+
"Remove braces from all arrow function bodies with relevant issues": {
56735673
"category": "Message",
56745674
"code": 95115
56755675
},
56765676
"Wrap all object literal with parentheses": {
56775677
"category": "Message",
56785678
"code": 95116
56795679
},
5680-
5680+
56815681
"No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer.": {
56825682
"category": "Error",
56835683
"code": 18004

‎src/services/codefixes/returnValueCorrect.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
namespace ts.codefix {
33
const fixId = "returnValueCorrect";
44
const fixIdAddReturnStatement = "fixAddReturnStatement";
5-
const fixIdRemoveBlockBodyBrace = "fixRemoveBlockBodyBrace";
5+
const fixRemoveBracesFromArrowFunctionBody = "fixRemoveBracesFromArrowFunctionBody";
66
const fixIdWrapTheBlockWithParen = "fixWrapTheBlockWithParen";
77
const errorCodes = [
88
Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value.code,
@@ -35,7 +35,7 @@ namespace ts.codefix {
3535

3636
registerCodeFix({
3737
errorCodes,
38-
fixIds: [fixIdAddReturnStatement, fixIdRemoveBlockBodyBrace, fixIdWrapTheBlockWithParen],
38+
fixIds: [fixIdAddReturnStatement, fixRemoveBracesFromArrowFunctionBody, fixIdWrapTheBlockWithParen],
3939
getCodeActions: context => {
4040
const { program, sourceFile, span: { start }, errorCode } = context;
4141
const info = getInfo(program.getTypeChecker(), sourceFile, start, errorCode);
@@ -44,7 +44,7 @@ namespace ts.codefix {
4444
if (info.kind === ProblemKind.MissingReturnStatement) {
4545
return append(
4646
[getActionForfixAddReturnStatement(context, info.expression, info.statement)],
47-
isArrowFunction(info.declaration) ? getActionForfixRemoveBlockBodyBrace(context, info.declaration, info.expression, info.commentSource): undefined);
47+
isArrowFunction(info.declaration) ? getActionForFixRemoveBracesFromArrowFunctionBody(context, info.declaration, info.expression, info.commentSource): undefined);
4848
}
4949
else {
5050
return [getActionForfixWrapTheBlockWithParen(context, info.declaration, info.expression)];
@@ -58,7 +58,7 @@ namespace ts.codefix {
5858
case fixIdAddReturnStatement:
5959
addReturnStatement(changes, diag.file, info.expression, info.statement);
6060
break;
61-
case fixIdRemoveBlockBodyBrace:
61+
case fixRemoveBracesFromArrowFunctionBody:
6262
if (!isArrowFunction(info.declaration)) return undefined;
6363
removeBlockBodyBrace(changes, diag.file, info.declaration, info.expression, info.commentSource, /* withParen */ false);
6464
break;
@@ -196,9 +196,9 @@ namespace ts.codefix {
196196
return createCodeFixAction(fixId, changes, Diagnostics.Add_a_return_statement, fixIdAddReturnStatement, Diagnostics.Add_all_missing_return_statement);
197197
}
198198

199-
function getActionForfixRemoveBlockBodyBrace(context: CodeFixContext, declaration: ArrowFunction, expression: Expression, commentSource: Node) {
199+
function getActionForFixRemoveBracesFromArrowFunctionBody(context: CodeFixContext, declaration: ArrowFunction, expression: Expression, commentSource: Node) {
200200
const changes = textChanges.ChangeTracker.with(context, t => removeBlockBodyBrace(t, context.sourceFile, declaration, expression, commentSource, /* withParen */ false));
201-
return createCodeFixAction(fixId, changes, Diagnostics.Remove_block_body_braces, fixIdRemoveBlockBodyBrace, Diagnostics.Remove_all_incorrect_body_block_braces);
201+
return createCodeFixAction(fixId, changes, Diagnostics.Remove_braces_from_arrow_function_body, fixRemoveBracesFromArrowFunctionBody, Diagnostics.Remove_braces_from_all_arrow_function_bodies_with_relevant_issues);
202202
}
203203

204204
function getActionForfixWrapTheBlockWithParen(context: CodeFixContext, declaration: ArrowFunction, expression: Expression) {

‎tests/cases/fourslash/codeFixCorrectReturnValue10.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
//// const a: ((() => number) | (() => undefined)) = () => { 1 }
44

55
verify.codeFixAvailable([
6-
{ description: 'Add a return statement' },
7-
{ description: 'Remove block body braces' }
6+
{ description: ts.Diagnostics.Add_a_return_statement.message },
7+
{ description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message }
88
]);

‎tests/cases/fourslash/codeFixCorrectReturnValue12.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//// })
1010

1111
verify.codeFixAvailable([
12-
{ description: 'Add a return statement' },
13-
{ description: 'Remove block body braces' },
14-
{ description: 'Remove unused label' },
12+
{ description: ts.Diagnostics.Add_a_return_statement.message },
13+
{ description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message },
14+
{ description: ts.Diagnostics.Remove_unused_label.message }
1515
]);

‎tests/cases/fourslash/codeFixCorrectReturnValue13.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
//// }
99

1010
verify.codeFixAvailable([
11-
{ description: 'Add a return statement' },
12-
{ description: 'Remove block body braces' },
13-
{ description: 'Remove unused label' },
11+
{ description: ts.Diagnostics.Add_a_return_statement.message },
12+
{ description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message },
13+
{ description: ts.Diagnostics.Remove_unused_label.message }
1414
]);
1515

1616
interface A {

‎tests/cases/fourslash/codeFixCorrectReturnValue18.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//// var x = <Comp t={() => { 1 }} />;
1212

1313
verify.codeFixAvailable([
14-
{ description: 'Add a return statement' },
15-
{ description: 'Remove block body braces' },
14+
{ description: ts.Diagnostics.Add_a_return_statement.message },
15+
{ description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message },
1616
{ description: `Infer type of 'props' from usage` }
1717
]);

‎tests/cases/fourslash/codeFixCorrectReturnValue20.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
//// }} />;
1717

1818
verify.codeFixAvailable([
19-
{ description: 'Add a return statement' },
20-
{ description: 'Remove block body braces' },
19+
{ description: ts.Diagnostics.Add_a_return_statement.message },
20+
{ description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message },
2121
{ description: `Infer type of 'props' from usage` },
22-
{ description: 'Remove unused label' },
22+
{ description: ts.Diagnostics.Remove_unused_label.message },
2323
]);

‎tests/cases/fourslash/codeFixCorrectReturnValue21.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
//// }
1010

1111
verify.codeFixAvailable([
12-
{ description: 'Add a return statement' },
13-
{ description: 'Remove block body braces' },
12+
{ description: ts.Diagnostics.Add_a_return_statement.message },
13+
{ description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message }
1414
]);

‎tests/cases/fourslash/codeFixCorrectReturnValue22.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
//// }
1212

1313
verify.codeFixAvailable([
14-
{ description: 'Add a return statement' },
15-
{ description: 'Remove block body braces' },
14+
{ description: ts.Diagnostics.Add_a_return_statement.message },
15+
{ description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message }
1616
]);

‎tests/cases/fourslash/codeFixCorrectReturnValue23.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
//// }
66

77
verify.codeFixAvailable([
8-
{ description: 'Add a return statement' },
9-
{ description: 'Remove block body braces' }
8+
{ description: ts.Diagnostics.Add_a_return_statement.message },
9+
{ description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message }
1010
]);

0 commit comments

Comments
 (0)