From 57f161eaa8eaf08de3ebf6b14645e50c9ce3e782 Mon Sep 17 00:00:00 2001 From: Alexander T Date: Tue, 28 Apr 2020 10:44:36 +0300 Subject: [PATCH] feat(38225): change diagnostic message for remove braces from arrow function body --- src/compiler/diagnosticMessages.json | 6 +++--- src/services/codefixes/returnValueCorrect.ts | 12 ++++++------ tests/cases/fourslash/codeFixCorrectReturnValue10.ts | 4 ++-- tests/cases/fourslash/codeFixCorrectReturnValue12.ts | 6 +++--- tests/cases/fourslash/codeFixCorrectReturnValue13.ts | 6 +++--- tests/cases/fourslash/codeFixCorrectReturnValue18.ts | 4 ++-- tests/cases/fourslash/codeFixCorrectReturnValue20.ts | 6 +++--- tests/cases/fourslash/codeFixCorrectReturnValue21.ts | 4 ++-- tests/cases/fourslash/codeFixCorrectReturnValue22.ts | 4 ++-- tests/cases/fourslash/codeFixCorrectReturnValue23.ts | 4 ++-- tests/cases/fourslash/codeFixCorrectReturnValue25.ts | 2 +- tests/cases/fourslash/codeFixCorrectReturnValue7.ts | 4 ++-- tests/cases/fourslash/codeFixCorrectReturnValue8.ts | 4 ++-- tests/cases/fourslash/codeFixCorrectReturnValue9.ts | 4 ++-- .../fourslash/codeFixCorrectReturnValue_all2.ts | 4 ++-- 15 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 03f426084545b..a93ea04141c87 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -5633,7 +5633,7 @@ "category": "Message", "code": 95111 }, - "Remove block body braces": { + "Remove braces from arrow function body": { "category": "Message", "code": 95112 }, @@ -5645,7 +5645,7 @@ "category": "Message", "code": 95114 }, - "Remove all incorrect body block braces": { + "Remove braces from all arrow function bodies with relevant issues": { "category": "Message", "code": 95115 }, @@ -5653,7 +5653,7 @@ "category": "Message", "code": 95116 }, - + "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer.": { "category": "Error", "code": 18004 diff --git a/src/services/codefixes/returnValueCorrect.ts b/src/services/codefixes/returnValueCorrect.ts index 947b9933e302e..fb80e296a972b 100644 --- a/src/services/codefixes/returnValueCorrect.ts +++ b/src/services/codefixes/returnValueCorrect.ts @@ -2,7 +2,7 @@ namespace ts.codefix { const fixId = "returnValueCorrect"; const fixIdAddReturnStatement = "fixAddReturnStatement"; - const fixIdRemoveBlockBodyBrace = "fixRemoveBlockBodyBrace"; + const fixRemoveBracesFromArrowFunctionBody = "fixRemoveBracesFromArrowFunctionBody"; const fixIdWrapTheBlockWithParen = "fixWrapTheBlockWithParen"; const errorCodes = [ Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value.code, @@ -35,7 +35,7 @@ namespace ts.codefix { registerCodeFix({ errorCodes, - fixIds: [fixIdAddReturnStatement, fixIdRemoveBlockBodyBrace, fixIdWrapTheBlockWithParen], + fixIds: [fixIdAddReturnStatement, fixRemoveBracesFromArrowFunctionBody, fixIdWrapTheBlockWithParen], getCodeActions: context => { const { program, sourceFile, span: { start }, errorCode } = context; const info = getInfo(program.getTypeChecker(), sourceFile, start, errorCode); @@ -44,7 +44,7 @@ namespace ts.codefix { if (info.kind === ProblemKind.MissingReturnStatement) { return append( [getActionForfixAddReturnStatement(context, info.expression, info.statement)], - isArrowFunction(info.declaration) ? getActionForfixRemoveBlockBodyBrace(context, info.declaration, info.expression, info.commentSource): undefined); + isArrowFunction(info.declaration) ? getActionForFixRemoveBracesFromArrowFunctionBody(context, info.declaration, info.expression, info.commentSource): undefined); } else { return [getActionForfixWrapTheBlockWithParen(context, info.declaration, info.expression)]; @@ -58,7 +58,7 @@ namespace ts.codefix { case fixIdAddReturnStatement: addReturnStatement(changes, diag.file, info.expression, info.statement); break; - case fixIdRemoveBlockBodyBrace: + case fixRemoveBracesFromArrowFunctionBody: if (!isArrowFunction(info.declaration)) return undefined; removeBlockBodyBrace(changes, diag.file, info.declaration, info.expression, info.commentSource, /* withParen */ false); break; @@ -196,9 +196,9 @@ namespace ts.codefix { return createCodeFixAction(fixId, changes, Diagnostics.Add_a_return_statement, fixIdAddReturnStatement, Diagnostics.Add_all_missing_return_statement); } - function getActionForfixRemoveBlockBodyBrace(context: CodeFixContext, declaration: ArrowFunction, expression: Expression, commentSource: Node) { + function getActionForFixRemoveBracesFromArrowFunctionBody(context: CodeFixContext, declaration: ArrowFunction, expression: Expression, commentSource: Node) { const changes = textChanges.ChangeTracker.with(context, t => removeBlockBodyBrace(t, context.sourceFile, declaration, expression, commentSource, /* withParen */ false)); - return createCodeFixAction(fixId, changes, Diagnostics.Remove_block_body_braces, fixIdRemoveBlockBodyBrace, Diagnostics.Remove_all_incorrect_body_block_braces); + return createCodeFixAction(fixId, changes, Diagnostics.Remove_braces_from_arrow_function_body, fixRemoveBracesFromArrowFunctionBody, Diagnostics.Remove_braces_from_all_arrow_function_bodies_with_relevant_issues); } function getActionForfixWrapTheBlockWithParen(context: CodeFixContext, declaration: ArrowFunction, expression: Expression) { diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue10.ts b/tests/cases/fourslash/codeFixCorrectReturnValue10.ts index cdbf416984d58..61523d804b1a7 100644 --- a/tests/cases/fourslash/codeFixCorrectReturnValue10.ts +++ b/tests/cases/fourslash/codeFixCorrectReturnValue10.ts @@ -3,6 +3,6 @@ //// const a: ((() => number) | (() => undefined)) = () => { 1 } verify.codeFixAvailable([ - { description: 'Add a return statement' }, - { description: 'Remove block body braces' } + { description: ts.Diagnostics.Add_a_return_statement.message }, + { description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message } ]); diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue12.ts b/tests/cases/fourslash/codeFixCorrectReturnValue12.ts index d242e4f4cf87e..8a4c0dbf92333 100644 --- a/tests/cases/fourslash/codeFixCorrectReturnValue12.ts +++ b/tests/cases/fourslash/codeFixCorrectReturnValue12.ts @@ -9,7 +9,7 @@ //// }) verify.codeFixAvailable([ - { description: 'Add a return statement' }, - { description: 'Remove block body braces' }, - { description: 'Remove unused label' }, + { description: ts.Diagnostics.Add_a_return_statement.message }, + { description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message }, + { description: ts.Diagnostics.Remove_unused_label.message } ]); diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue13.ts b/tests/cases/fourslash/codeFixCorrectReturnValue13.ts index a1e2cc553ccac..cdc7c51982a14 100644 --- a/tests/cases/fourslash/codeFixCorrectReturnValue13.ts +++ b/tests/cases/fourslash/codeFixCorrectReturnValue13.ts @@ -8,9 +8,9 @@ //// } verify.codeFixAvailable([ - { description: 'Add a return statement' }, - { description: 'Remove block body braces' }, - { description: 'Remove unused label' }, + { description: ts.Diagnostics.Add_a_return_statement.message }, + { description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message }, + { description: ts.Diagnostics.Remove_unused_label.message } ]); interface A { diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue18.ts b/tests/cases/fourslash/codeFixCorrectReturnValue18.ts index ffa038a48fc5c..633a009600388 100644 --- a/tests/cases/fourslash/codeFixCorrectReturnValue18.ts +++ b/tests/cases/fourslash/codeFixCorrectReturnValue18.ts @@ -11,7 +11,7 @@ //// var x = { 1 }} />; verify.codeFixAvailable([ - { description: 'Add a return statement' }, - { description: 'Remove block body braces' }, + { description: ts.Diagnostics.Add_a_return_statement.message }, + { description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message }, { description: `Infer type of 'props' from usage` } ]); diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue20.ts b/tests/cases/fourslash/codeFixCorrectReturnValue20.ts index f552edaee6713..a9b9a6cd1ce9f 100644 --- a/tests/cases/fourslash/codeFixCorrectReturnValue20.ts +++ b/tests/cases/fourslash/codeFixCorrectReturnValue20.ts @@ -16,8 +16,8 @@ //// }} />; verify.codeFixAvailable([ - { description: 'Add a return statement' }, - { description: 'Remove block body braces' }, + { description: ts.Diagnostics.Add_a_return_statement.message }, + { description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message }, { description: `Infer type of 'props' from usage` }, - { description: 'Remove unused label' }, + { description: ts.Diagnostics.Remove_unused_label.message }, ]); diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue21.ts b/tests/cases/fourslash/codeFixCorrectReturnValue21.ts index 1a248f77909f2..fc0fef8872bfa 100644 --- a/tests/cases/fourslash/codeFixCorrectReturnValue21.ts +++ b/tests/cases/fourslash/codeFixCorrectReturnValue21.ts @@ -9,6 +9,6 @@ //// } verify.codeFixAvailable([ - { description: 'Add a return statement' }, - { description: 'Remove block body braces' }, + { description: ts.Diagnostics.Add_a_return_statement.message }, + { description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message } ]); diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue22.ts b/tests/cases/fourslash/codeFixCorrectReturnValue22.ts index 372513592afb8..59f1e9cc4b6ee 100644 --- a/tests/cases/fourslash/codeFixCorrectReturnValue22.ts +++ b/tests/cases/fourslash/codeFixCorrectReturnValue22.ts @@ -11,6 +11,6 @@ //// } verify.codeFixAvailable([ - { description: 'Add a return statement' }, - { description: 'Remove block body braces' }, + { description: ts.Diagnostics.Add_a_return_statement.message }, + { description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message } ]); diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue23.ts b/tests/cases/fourslash/codeFixCorrectReturnValue23.ts index 14fde02533799..859749e754bad 100644 --- a/tests/cases/fourslash/codeFixCorrectReturnValue23.ts +++ b/tests/cases/fourslash/codeFixCorrectReturnValue23.ts @@ -5,6 +5,6 @@ //// } verify.codeFixAvailable([ - { description: 'Add a return statement' }, - { description: 'Remove block body braces' } + { description: ts.Diagnostics.Add_a_return_statement.message }, + { description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message } ]); diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue25.ts b/tests/cases/fourslash/codeFixCorrectReturnValue25.ts index 3d7f750367305..1cb93bf3ecf3d 100644 --- a/tests/cases/fourslash/codeFixCorrectReturnValue25.ts +++ b/tests/cases/fourslash/codeFixCorrectReturnValue25.ts @@ -4,7 +4,7 @@ //// Foo(() => { /* leading */ 1 /* trailing */ }) verify.codeFix({ - description: "Remove block body braces", + description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message, index: 1, newFileContent: `function Foo (a: () => number) { a() } diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue7.ts b/tests/cases/fourslash/codeFixCorrectReturnValue7.ts index bd0bfd3b343b3..0125238c8a4b2 100644 --- a/tests/cases/fourslash/codeFixCorrectReturnValue7.ts +++ b/tests/cases/fourslash/codeFixCorrectReturnValue7.ts @@ -4,6 +4,6 @@ //// Foo(() => { 1 }) verify.codeFixAvailable([ - { description: 'Add a return statement' }, - { description: 'Remove block body braces' } + { description: ts.Diagnostics.Add_a_return_statement.message }, + { description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message } ]); diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue8.ts b/tests/cases/fourslash/codeFixCorrectReturnValue8.ts index cde3ab2e42ff6..640f84af4d047 100644 --- a/tests/cases/fourslash/codeFixCorrectReturnValue8.ts +++ b/tests/cases/fourslash/codeFixCorrectReturnValue8.ts @@ -4,6 +4,6 @@ //// Foo(() => { 1 }) verify.codeFixAvailable([ - { description: 'Add a return statement' }, - { description: 'Remove block body braces' } + { description: ts.Diagnostics.Add_a_return_statement.message }, + { description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message } ]); diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue9.ts b/tests/cases/fourslash/codeFixCorrectReturnValue9.ts index 104fd785f00a1..97e684b0c0fe5 100644 --- a/tests/cases/fourslash/codeFixCorrectReturnValue9.ts +++ b/tests/cases/fourslash/codeFixCorrectReturnValue9.ts @@ -3,6 +3,6 @@ //// const a: () => number = () => { 1 } verify.codeFixAvailable([ - { description: 'Add a return statement' }, - { description: 'Remove block body braces' } + { description: ts.Diagnostics.Add_a_return_statement.message }, + { description: ts.Diagnostics.Remove_braces_from_arrow_function_body.message } ]); diff --git a/tests/cases/fourslash/codeFixCorrectReturnValue_all2.ts b/tests/cases/fourslash/codeFixCorrectReturnValue_all2.ts index e3b0d1c0b1d39..34b889849ac2d 100644 --- a/tests/cases/fourslash/codeFixCorrectReturnValue_all2.ts +++ b/tests/cases/fourslash/codeFixCorrectReturnValue_all2.ts @@ -58,8 +58,8 @@ //// const test: { a: () => A } = { a: () => { bar: '1' } } verify.codeFixAll({ - fixId: "fixRemoveBlockBodyBrace", - fixAllDescription: "Remove all incorrect body block braces", + fixId: "fixRemoveBracesFromArrowFunctionBody", + fixAllDescription: ts.Diagnostics.Remove_braces_from_all_arrow_function_bodies_with_relevant_issues.message, newFileContent: `interface A { bar: string