From 91d73da5e421cbb7927a44c5508595a760f0671a Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 26 Feb 2021 14:21:24 -0800
Subject: [PATCH] Only show `infer return type` refactoring when refactorings
 are requested

Fixes #117799
---
 .../src/languageFeatures/refactor.ts                   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/extensions/typescript-language-features/src/languageFeatures/refactor.ts b/extensions/typescript-language-features/src/languageFeatures/refactor.ts
index b8a4bcfdab0..c9a2a868b4a 100644
--- a/extensions/typescript-language-features/src/languageFeatures/refactor.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/refactor.ts
@@ -309,7 +309,15 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
 			return undefined;
 		}
 
-		const actions = this.convertApplicableRefactors(response.body, document, rangeOrSelection);
+		const actions = this.convertApplicableRefactors(response.body, document, rangeOrSelection).filter(action => {
+			// Don't show 'infer return type' refactoring unless it has been explicitly requested
+			// https://github.com/microsoft/TypeScript/issues/42993
+			if (!context.only && action.kind?.value === 'refactor.rewrite.function.returnType') {
+				return false;
+			}
+			return true;
+		});
+
 		if (!context.only) {
 			return actions;
 		}