fix(43006): skip trivia in a function name (#43021)

microsoft · Mar 3, 2021 · f1c911b · f1c911b
1 parent c497b48
commit f1c911b
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 2 deletions.
diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts
@@ -402,7 +402,7 @@ namespace ts.codefix {
 
     function addFunctionDeclaration(changes: textChanges.ChangeTracker, context: CodeFixContextBase, info: FunctionInfo) {
         const importAdder = createImportAdder(context.sourceFile, context.program, context.preferences, context.host);
-        const functionDeclaration = createSignatureDeclarationFromCallExpression(SyntaxKind.FunctionDeclaration, context, importAdder, info.call, info.token, info.modifierFlags, info.parentDeclaration) as FunctionDeclaration;
+        const functionDeclaration = createSignatureDeclarationFromCallExpression(SyntaxKind.FunctionDeclaration, context, importAdder, info.call, idText(info.token), info.modifierFlags, info.parentDeclaration) as FunctionDeclaration;
         changes.insertNodeAtEndOfScope(info.sourceFile, info.parentDeclaration, functionDeclaration);
     }
 }
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
@@ -252,7 +252,7 @@ namespace ts.codefix {
         context: CodeFixContextBase,
         importAdder: ImportAdder,
         call: CallExpression,
-        name: Identifier,
+        name: Identifier | string,
         modifierFlags: ModifierFlags,
         contextNode: Node
     ) {

diff --git a/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration17.ts b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration17.ts
@@ -0,0 +1,17 @@
+/// <reference path='fourslash.ts' />
+
+////// comment
+////foo();
+
+verify.codeFix({
+    index: 0,
+    description: [ts.Diagnostics.Add_missing_function_declaration_0.message, "foo"],
+    newFileContent:
+`// comment
+foo();
+
+function foo() {
+    throw new Error("Function not implemented.");
+}
+`
+});
diff --git a/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration18.ts b/tests/cases/fourslash/codeFixAddMissingFunctionDeclaration18.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+/////**
+//// * comment
+//// */
+////foo();
+
+verify.codeFix({
+    index: 0,
+    description: [ts.Diagnostics.Add_missing_function_declaration_0.message, "foo"],
+    newFileContent:
+`/**
+ * comment
+ */
+foo();
+
+function foo() {
+    throw new Error("Function not implemented.");
+}
+`
+});