Test for action description of code actions, and simplify description for extracting method to file

src/compiler/diagnosticMessages.json

@@ -3696,7 +3696,7 @@
         "code": 95003
     },
 
-    "Extract function into '{0}'": {
+    "Extract function into {0}": {
         "category": "Message",
         "code": 95004
     }

src/harness/fourslash.ts

@@ -2761,20 +2761,25 @@ namespace FourSlash {
             });
         }
 
-        public verifyRefactorAvailable(negative: boolean, name?: string, subName?: string) {
+        public verifyRefactorAvailable(negative: boolean, name: string, actionName?: string) {
             const selection = this.getSelection();
 
             let refactors = this.languageService.getApplicableRefactors(this.activeFile.fileName, selection) || [];
-            if (name) {
-                refactors = refactors.filter(r => r.name === name && (subName === undefined || r.actions.some(a => a.name === subName)));
-            }
+            refactors = refactors.filter(r => r.name === name && (actionName === undefined || r.actions.some(a => a.name === actionName)));
             const isAvailable = refactors.length > 0;
 
-            if (negative && isAvailable) {
-                this.raiseError(`verifyApplicableRefactorAvailableForRange failed - expected no refactor but found some: ${refactors.map(r => r.name).join(", ")}`);
+            if (negative) {
+                if (isAvailable) {
+                    this.raiseError(`verifyApplicableRefactorAvailableForRange failed - expected no refactor but found: ${refactors.map(r => r.name).join(", ")}`);
+                }
             }
-            else if (!negative && !isAvailable) {
-                this.raiseError(`verifyApplicableRefactorAvailableForRange failed - expected a refactor but found none.`);
+            else {
+                if (!isAvailable) {
+                    this.raiseError(`verifyApplicableRefactorAvailableForRange failed - expected a refactor but found none.`);
+                }
+                if (refactors.length > 1) {
+                    this.raiseError(`2 available refactors both have name ${name} and action ${actionName}`);
+                }
             }
         }
 
@@ -2794,14 +2799,22 @@ namespace FourSlash {
             }
         }
 
-        public applyRefactor(refactorName: string, actionName: string) {
+        public applyRefactor({ refactorName, actionName, actionDescription }: FourSlashInterface.ApplyRefactorOptions) {
             const range = this.getSelection();
             const refactors = this.languageService.getApplicableRefactors(this.activeFile.fileName, range);
-            const refactor = ts.find(refactors, r => r.name === refactorName);
+            const refactor = refactors.find(r => r.name === refactorName);
             if (!refactor) {
                 this.raiseError(`The expected refactor: ${refactorName} is not available at the marker location.`);
             }
 
+            const action = refactor.actions.find(a => a.name === actionName);
+            if (!action) {
+                this.raiseError(`The expected action: ${action} is not included in: ${refactor.actions.map(a => a.name)}`);
+            }
+            if (action.description !== actionDescription) {
+                this.raiseError(`Expected action description to be ${JSON.stringify(actionDescription)}, got: ${JSON.stringify(action.description)}`);
+            }
+
             const editInfo = this.languageService.getEditsForRefactor(this.activeFile.fileName, this.formatCodeSettings, range, refactorName, actionName);
             for (const edit of editInfo.edits) {
                 this.applyEdits(edit.fileName, edit.textChanges, /*isFormattingEdit*/ false);
@@ -3682,8 +3695,8 @@ namespace FourSlashInterface {
             this.state.verifyApplicableRefactorAvailableForRange(this.negative);
         }
 
-        public refactorAvailable(name?: string, subName?: string) {
-            this.state.verifyRefactorAvailable(this.negative, name, subName);
+        public refactorAvailable(name: string, actionName?: string) {
+            this.state.verifyRefactorAvailable(this.negative, name, actionName);
         }
     }
 
@@ -4081,8 +4094,8 @@ namespace FourSlashInterface {
             this.state.enableFormatting = false;
         }
 
-        public applyRefactor(refactorName: string, actionName: string) {
-            this.state.applyRefactor(refactorName, actionName);
+        public applyRefactor(options: ApplyRefactorOptions) {
+            this.state.applyRefactor(options);
         }
     }
 
@@ -4295,4 +4308,10 @@ namespace FourSlashInterface {
             return { classificationType, text, textSpan };
         }
     }
+
+    export interface ApplyRefactorOptions {
+        refactorName: string;
+        actionName: string;
+        actionDescription: string;
+    }
 }

src/services/refactors/extractMethod.ts

@@ -560,32 +560,32 @@ namespace ts.refactor.extractMethod {
                     return "constructor";
                 case SyntaxKind.FunctionExpression:
                     return scope.name
-                        ? `function expression ${scope.name.getText()}`
+                        ? `function expression ${scope.name.text}`
                         : "anonymous function expression";
                 case SyntaxKind.FunctionDeclaration:
-                    return `function ${scope.name.getText()}`;
+                    return `function '${scope.name.text}'`;
                 case SyntaxKind.ArrowFunction:
                     return "arrow function";
                 case SyntaxKind.MethodDeclaration:
-                    return `method ${scope.name.getText()}`;
+                    return `method '${scope.name.getText()}`;
                 case SyntaxKind.GetAccessor:
-                    return `get ${scope.name.getText()}`;
+                    return `'get ${scope.name.getText()}'`;
                 case SyntaxKind.SetAccessor:
-                    return `set ${scope.name.getText()}`;
+                    return `'set ${scope.name.getText()}'`;
             }
         }
         else if (isModuleBlock(scope)) {
-            return `namespace ${scope.parent.name.getText()}`;
+            return `namespace '${scope.parent.name.getText()}'`;
         }
         else if (isClassLike(scope)) {
             return scope.kind === SyntaxKind.ClassDeclaration
-                ? `class ${scope.name.text}`
+                ? `class '${scope.name.text}'`
                 : scope.name.text
-                    ? `class expression ${scope.name.text}`
+                    ? `class expression '${scope.name.text}'`
                     : "anonymous class expression";
         }
         else if (isSourceFile(scope)) {
-            return `file '${scope.fileName}'`;
+            return "this file";
         }
         else {
             return "unknown";

tests/cases/fourslash/extract-method1.ts

@@ -13,8 +13,11 @@
 //// }
 
 goTo.select('start', 'end')
-verify.refactorAvailable('Extract Method');
-edit.applyRefactor('Extract Method', "scope_0");
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: "scope_0",
+    actionDescription: "Extract function into class 'Foo'",
+});
 verify.currentFileContentIs(
 `class Foo {
     someMethod(m: number) {

tests/cases/fourslash/extract-method10.ts

@@ -1,6 +1,10 @@
 /// <reference path='fourslash.ts' />
 
-//// (x => x)(/*1*/x => x/*2*/)(1); 
+//// (x => x)(/*1*/x => x/*2*/)(1);
 
 goTo.select('1', '2');
-edit.applyRefactor('Extract Method', 'scope_0');
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: 'scope_0',
+    actionDescription: "Extract function into this file",
+});

tests/cases/fourslash/extract-method13.ts

@@ -10,10 +10,18 @@
 //// }
 
 goTo.select('a', 'b');
-edit.applyRefactor('Extract Method', 'scope_0');
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: "scope_0",
+    actionDescription: "Extract function into class 'C'",
+});
 
 goTo.select('c', 'd');
-edit.applyRefactor('Extract Method', 'scope_0');
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: "scope_0",
+    actionDescription: "Extract function into class 'C'",
+});
 
 verify.currentFileContentIs(`class C {
     static j = C.newFunction_1();

tests/cases/fourslash/extract-method14.ts

@@ -11,7 +11,11 @@
 //// }
 
 goTo.select('a', 'b');
-edit.applyRefactor('Extract Method', 'scope_1');
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: "scope_1",
+    actionDescription: "Extract function into this file",
+});
 verify.currentFileContentIs(`function foo() {
     var i = 10;
     var __return: any;

tests/cases/fourslash/extract-method15.ts

@@ -9,7 +9,11 @@
 //// }
 
 goTo.select('a', 'b');
-edit.applyRefactor('Extract Method', 'scope_1');
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: "scope_1",
+    actionDescription: "Extract function into this file",
+});
 
 verify.currentFileContentIs(`function foo() {
     var i = 10;

tests/cases/fourslash/extract-method18.ts

@@ -9,8 +9,11 @@
 //// }
 
 goTo.select('a', 'b')
-verify.refactorAvailable('Extract Method');
-edit.applyRefactor('Extract Method', "scope_1");
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: "scope_1",
+    actionDescription: "Extract function into this file",
+});
 verify.currentFileContentIs(`function fn() {
     const x = { m: 1 };
     newFunction(x);

tests/cases/fourslash/extract-method19.ts

@@ -5,12 +5,15 @@
 //// function fn() {
 ////     /*a*/console.log("hi");/*b*/
 //// }
-//// 
+////
 //// function newFunction() { }
 
 goTo.select('a', 'b')
-verify.refactorAvailable('Extract Method');
-edit.applyRefactor('Extract Method', "scope_0");
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: "scope_0",
+    actionDescription: "Extract function into function 'fn'",
+});
 verify.currentFileContentIs(`function fn() {
     newFunction_1();
 

tests/cases/fourslash/extract-method2.ts

@@ -10,8 +10,11 @@
 ////     }
 //// }
 goTo.select('start', 'end')
-verify.refactorAvailable('Extract Method');
-edit.applyRefactor('Extract Method', "scope_2");
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: "scope_2",
+    actionDescription: "Extract function into this file",
+});
 verify.currentFileContentIs(
 `namespace NS {
     class Q {

tests/cases/fourslash/extract-method21.ts

@@ -12,7 +12,11 @@ goTo.select('start', 'end')
 
 verify.refactorAvailable('Extract Method');
 
-edit.applyRefactor('Extract Method', "scope_0");
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: "scope_0",
+    actionDescription: "Extract function into class 'Foo'",
+});
 
 verify.currentFileContentIs(`class Foo {
     static method() {

tests/cases/fourslash/extract-method24.ts

@@ -7,7 +7,11 @@
 //// }
 
 goTo.select('a', 'b')
-edit.applyRefactor('Extract Method', 'scope_1');
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: "scope_1",
+    actionDescription: "Extract function into this file",
+});
 verify.currentFileContentIs(`function M() {
     let a = [1,2,3];
     let x = 0;

tests/cases/fourslash/extract-method25.ts

@@ -8,7 +8,11 @@
 //// }
 
 goTo.select('a', 'b')
-edit.applyRefactor('Extract Method', 'scope_0');
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: "scope_0",
+    actionDescription: "Extract function into function 'fn'",
+});
 verify.currentFileContentIs(`function fn() {
     var q = newFunction()
     q[0]++

tests/cases/fourslash/extract-method3.ts

@@ -10,7 +10,7 @@
 ////     }
 //// }
 
-// Don't offer to to 'extract method' a single identifier
+// Don't offer to 'extract method' a single identifier
 
 goTo.marker('a');
 verify.not.refactorAvailable('Extract Method');

tests/cases/fourslash/extract-method5.ts

@@ -9,7 +9,11 @@
 //// }
 
 goTo.select('start', 'end');
-edit.applyRefactor('Extract Method', 'scope_0');
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: "scope_0",
+    actionDescription: "Extract function into function 'f'",
+});
 verify.currentFileContentIs(
 `function f() {
     var x: 1 | 2 | 3 = newFunction();

tests/cases/fourslash/extract-method7.ts

@@ -7,7 +7,11 @@
 //// }
 
 goTo.select('a', 'b');
-edit.applyRefactor('Extract Method', 'scope_0');
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: "scope_0",
+    actionDescription: "Extract function into this file",
+});
 verify.currentFileContentIs(`function fn(x = newFunction()) {
 }
 function newFunction() {

tests/cases/fourslash/fourslash.ts

@@ -159,7 +159,7 @@ declare namespace FourSlashInterface {
         codeFixDiagnosticsAvailableAtMarkers(markerNames: string[], diagnosticCode?: number): void;
         applicableRefactorAvailableForRange(): void;
 
-        refactorAvailable(name?: string, subName?: string);
+        refactorAvailable(name: string, actionName?: string);
     }
     class verify extends verifyNegatable {
         assertHasRanges(ranges: Range[]): void;
@@ -310,7 +310,7 @@ declare namespace FourSlashInterface {
         enableFormatting(): void;
         disableFormatting(): void;
 
-        applyRefactor(refactorName: string, actionName: string): void;
+        applyRefactor(options: { refactorName: string, actionName: string, actionDescription: string }): void;
     }
     class debug {
         printCurrentParameterHelp(): void;