fix(55937): 'Infer function return type' offered in preceding trivia (#…

…55938)
microsoft · Oct 2, 2023 · c640c5d · c640c5d
1 parent d9cd2d0
commit c640c5d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/services/refactors/inferFunctionReturnType.ts b/src/services/refactors/inferFunctionReturnType.ts
@@ -10,7 +10,7 @@ import {
     FunctionDeclaration,
     FunctionExpression,
     getLocaleSpecificMessage,
-    getTokenAtPosition,
+    getTouchingPropertyName,
     isArrowFunction,
     isBlock,
     isInJSFile,
@@ -104,7 +104,7 @@ function doChange(sourceFile: SourceFile, changes: textChanges.ChangeTracker, de
 function getInfo(context: RefactorContext): FunctionInfo | RefactorErrorInfo | undefined {
     if (isInJSFile(context.file) || !refactorKindBeginsWith(inferReturnTypeAction.kind, context.kind)) return;
 
-    const token = getTokenAtPosition(context.file, context.startPosition);
+    const token = getTouchingPropertyName(context.file, context.startPosition);
     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;

diff --git a/tests/cases/fourslash/refactorInferFunctionReturnType24.ts b/tests/cases/fourslash/refactorInferFunctionReturnType24.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+////let x = 10;/*a*//*b*/
+////
+////function func() {
+////    return 10;
+////}
+
+goTo.select("a", "b");
+verify.not.refactorAvailable("Infer function return type");