maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

enable explicit requests for addOrRemoveBracesToArrowFunction

Browse source
This commit is contained in:
Jesse Trinity 2020-04-15 13:49:50 -07:00
parent bac046573f
commit 02fa39a6a9
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/services/refactors/addOrRemoveBracesToArrowFunction.ts
View file

@ -38,7 +38,7 @@ namespace ts.refactor.addOrRemoveBracesToArrowFunction {
function getEditsForAction(context: RefactorContext, actionName: string): RefactorEditInfo | undefined {
const { file, startPosition } = context;
const info = getConvertibleArrowFunctionAtPosition(file, startPosition);
const info = getConvertibleArrowFunctionAtPosition(file, startPosition, /*triggerReason*/ { kind: "invoked" });
if (!info) return undefined;
const { expression, returnStatement, func } = info;
@ -73,7 +73,9 @@ namespace ts.refactor.addOrRemoveBracesToArrowFunction {
function getConvertibleArrowFunctionAtPosition(file: SourceFile, startPosition: number, triggerReason?: RefactorTriggerReason): Info | undefined {
const node = getTokenAtPosition(file, startPosition);
const func = getContainingFunction(node);
if (!func || !isArrowFunction(func) || (!rangeContainsRange(func, node) || rangeContainsRange(func.body, node))) return undefined;
// Only offer a refactor in the function body on explicit refactor requests.
if (!func || !isArrowFunction(func) || (!rangeContainsRange(func, node)
|| (rangeContainsRange(func.body, node) && triggerReason?.kind !== "invoked"))) return undefined;
if (isExpression(func.body)) {
return {