extractMethod: Don't try to extract an ExpressionStatement consisting of a single token (microsoft#18450)

Andy · web-flow · commit 6e512a495f23 · 2017-09-14T11:16:21.000-07:00
* extractMethod: Don't try to extract an ExpressionStatement consisting of a single token

* Move to unit test
diff --git a/src/harness/unittests/extractMethods.ts b/src/harness/unittests/extractMethods.ts
@@ -410,6 +410,8 @@ function test(x: number) {
             "Statement or expression expected."
         ]);
 
+        testExtractRangeFailed("extract-method-not-for-token-expression-statement", `[#|a|]`, ["Select more than a single token."]);
+
         testExtractMethod("extractMethod1",
             `namespace A {
     let x = 1;
diff --git a/src/services/refactors/extractMethod.ts b/src/services/refactors/extractMethod.ts
@@ -231,7 +231,7 @@ namespace ts.refactor.extractMethod {
         }
 
         function checkRootNode(node: Node): Diagnostic[] | undefined {
-            if (isToken(node)) {
+            if (isToken(isExpressionStatement(node) ? node.expression : node)) {
                 return [createDiagnosticForNode(node, Messages.InsufficientSelection)];
             }
             return undefined;

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ namespace ts.refactor.extractMethod {`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`function checkRootNode(node: Node): Diagnostic[] \| undefined {`
`234`		`- if (isToken(node)) {`
	`234`	`+ if (isToken(isExpressionStatement(node) ? node.expression : node)) {`
`235`	`235`	`return [createDiagnosticForNode(node, Messages.InsufficientSelection)];`
`236`	`236`	`}`
`237`	`237`	`return undefined;`