Merge pull request microsoft#18622 from amcasey/NoModifiers

amcasey · web-flow · commit f00c78c9b578 · 2017-09-20T17:10:42.000-07:00
JavaScript: handle lack of modifiers on extracted method
diff --git a/src/services/refactors/extractMethod.ts b/src/services/refactors/extractMethod.ts
@@ -664,7 +664,7 @@ namespace ts.refactor.extractMethod {
             }
             newFunction = createMethod(
                 /*decorators*/ undefined,
-                modifiers,
+                modifiers.length ? modifiers : undefined,
                 range.facts & RangeFacts.IsGenerator ? createToken(SyntaxKind.AsteriskToken) : undefined,
                 functionName,
                 /*questionToken*/ undefined,
diff --git a/tests/cases/fourslash/extract-method26.ts b/tests/cases/fourslash/extract-method26.ts
@@ -0,0 +1,30 @@
+/// <reference path='fourslash.ts' />
+
+// Handle having zero modifiers on a method.
+
+// @allowNonTsExtensions: true
+// @Filename: file1.js
+//// class C {
+////     M() {
+////         const q = /*a*/1 + 2/*b*/;
+////         q.toString();
+////     }
+//// }
+
+goTo.select('a', 'b')
+edit.applyRefactor({
+    refactorName: "Extract Method",
+    actionName: "scope_0",
+    actionDescription: "Extract to method in class 'C'",
+    newContent:
+`class C {
+    M() {
+        const q = this./*RENAME*/newFunction();
+        q.toString();
+    }
+
+    newFunction() {
+        return 1 + 2;
+    }
+}`
+});

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ namespace ts.refactor.extractMethod {`
`664`	`664`	`}`
`665`	`665`	`newFunction = createMethod(`
`666`	`666`	`/decorators/ undefined,`
`667`		`- modifiers,`
	`667`	`+ modifiers.length ? modifiers : undefined,`
`668`	`668`	`range.facts & RangeFacts.IsGenerator ? createToken(SyntaxKind.AsteriskToken) : undefined,`
`669`	`669`	`functionName,`
`670`	`670`	`/questionToken/ undefined,`