fix(42714): do not show inferFunctionReturnType QF on function body

Author: a-tarasyuk

src/services/refactors/inferFunctionReturnType.ts

@@ -59,7 +59,9 @@ namespace ts.refactor.inferFunctionReturnType {
         if (isInJSFile(context.file) || !refactorKindBeginsWith(inferReturnTypeAction.kind, context.kind)) return;
 
         const token = getTokenAtPosition(context.file, context.startPosition);
-        const declaration = findAncestor(token, isConvertibleDeclaration);
+        const declaration = findAncestor(token, n =>
+            isBlock(n) || n.parent && isArrowFunction(n.parent) && (n.kind === SyntaxKind.EqualsGreaterThanToken || n.parent.body === n) ? "quit" :
+                isConvertibleDeclaration(n)) as ConvertibleDeclaration | undefined;
         if (!declaration || !declaration.body || declaration.type) {
             return { error: getLocaleSpecificMessage(Diagnostics.Return_type_must_be_inferred_from_a_function) };
         }

tests/cases/fourslash/refactorInferFunctionReturnType16.ts

@@ -0,0 +1,26 @@
+/// <reference path='fourslash.ts' />
+
+////function /*a*/f1()/*b*/ {
+////    return { x: 1, y: 1 };
+////}
+////function f2/*c*/()/*d*/ {
+////    return { x: 1, y: 1 };
+////}
+////function f3() /*e*/{
+////    return { x: 1, y: 1 };
+////}/*f*/
+////function f4() {
+////    /*g*/return { x: 1, y: 1 };/*h*/
+////}
+
+goTo.select("a", "b");
+verify.refactorAvailable("Infer function return type");
+
+goTo.select("c", "d");
+verify.refactorAvailable("Infer function return type");
+
+goTo.select("e", "f");
+verify.not.refactorAvailable("Infer function return type");
+
+goTo.select("g", "h");
+verify.not.refactorAvailable("Infer function return type");

tests/cases/fourslash/refactorInferFunctionReturnType17.ts

@@ -0,0 +1,34 @@
+/// <reference path='fourslash.ts' />
+
+////class F1 {
+////    /*a*/method()/*b*/ {
+////        return { x: 1, y: 1 };
+////    }
+////}
+////class F2 {
+////    method/*c*/()/*d*/{
+////        return { x: 1, y: 1 };
+////    }
+////}
+////class F3 {
+////    method() /*e*/{
+////        return { x: 1, y: 1 };
+////    }/*f*/
+////}
+////class F4 {
+////    method() {
+////        /*g*/return { x: 1, y: 1 };/*h*/
+////    }
+////}
+
+goTo.select("a", "b");
+verify.refactorAvailable("Infer function return type");
+
+goTo.select("c", "d");
+verify.refactorAvailable("Infer function return type");
+
+goTo.select("e", "f");
+verify.not.refactorAvailable("Infer function return type");
+
+goTo.select("g", "h");
+verify.not.refactorAvailable("Infer function return type");

tests/cases/fourslash/refactorInferFunctionReturnType18.ts

@@ -0,0 +1,26 @@
+/// <reference path='fourslash.ts' />
+
+////const f1 = /*a*/function()/*b*/ {
+////    return { x: 1, y: 1 };
+////}
+////const f2 = function/*c*/()/*d*/{
+////    return { x: 1, y: 1 };
+////}
+////const f3 = function () /*e*/{
+////    return { x: 1, y: 1 };
+////}/*f*/
+////const f4 = function () {
+////    /*g*/return { x: 1, y: 1 };/*h*/
+////}
+
+goTo.select("a", "b");
+verify.refactorAvailable("Infer function return type");
+
+goTo.select("c", "d");
+verify.refactorAvailable("Infer function return type");
+
+goTo.select("e", "f");
+verify.not.refactorAvailable("Infer function return type");
+
+goTo.select("g", "h");
+verify.not.refactorAvailable("Infer function return type");

tests/cases/fourslash/refactorInferFunctionReturnType19.ts

@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+////const f1 = /*a*/()/*b*/ =>{
+////    return { x: 1, y: 1 };
+////}
+////const f2 = () => /*c*/{
+////    return { x: 1, y: 1 };
+////}/*d*/
+////const f3 = () => {
+////    /*e*/return { x: 1, y: 1 };/*f*/
+////}
+
+goTo.select("a", "b");
+verify.refactorAvailable("Infer function return type");
+
+goTo.select("c", "d");
+verify.not.refactorAvailable("Infer function return type");
+
+goTo.select("e", "f");
+verify.not.refactorAvailable("Infer function return type");

tests/cases/fourslash/refactorInferFunctionReturnType20.ts

@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+////function f1(/*a*/x/*b*/, { y }) {
+////    return { x, y: 1 };
+////}
+////function f2(x, { /*c*/y/*d*/ }) {
+////    return { x, y: 1 };
+////}
+////function f3(x, /*e*/{ y }/*f*/) {
+////    return { x, y: 1 };
+////}
+
+goTo.select("a", "b");
+verify.refactorAvailable("Infer function return type");
+
+goTo.select("c", "d");
+verify.refactorAvailable("Infer function return type");
+
+goTo.select("e", "f");
+verify.refactorAvailable("Infer function return type");

tests/cases/fourslash/refactorInferFunctionReturnType21.ts

@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts' />
+
+////const f1 = /*a*/(x)/*b*/ => x;
+////const f2 = (x) /*c*/=>/*d*/ x;
+////const f3 = (x) => /*e*/x/*f*/
+////const f4= (x) => /*g*/x/*h*/
+
+goTo.select("a", "b");
+verify.refactorAvailable("Infer function return type");
+
+goTo.select("c", "d");
+verify.not.refactorAvailable("Infer function return type");
+
+goTo.select("e", "f");
+verify.not.refactorAvailable("Infer function return type");
+
+goTo.select("g", "h");
+verify.not.refactorAvailable("Infer function return type");

tests/cases/fourslash/refactorKind_rewriteFunction.ts

@@ -7,6 +7,5 @@ verify.refactorKindAvailable("refactor.rewrite",
 [
     "refactor.rewrite.arrow.braces.add",
     "refactor.rewrite.function.named",
-    "refactor.rewrite.function.anonymous",
-    "refactor.rewrite.function.returnType"
+    "refactor.rewrite.function.anonymous"
 ]);