Skip to content

Fix: block optional chain refactor inside binary expressions #62607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix: block optional chain refactor inside binary expressions #62607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb2b085
Fix: block optional chain refactor inside binary expressions
emiedonmokumo Oct 15, 2025
2bdc162
Fix optional chain refactor: block unsafe binary expressions and upda…
emiedonmokumo Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/services/refactors/convertToOptionalChainExpression.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ function getInfo(context: RefactorContext, considerEmptySpans = true): OptionalC
const expression = parent && isValidExpressionOrStatement(parent) ? getExpression(parent) : undefined;
if (!expression) return { error: getLocaleSpecificMessage(Diagnostics.Could_not_find_convertible_access_expression) };

// do not offer refactor inside complex expressions like concatenations...
if (expression.parent && isBinaryExpression(expression.parent)) {
return { error: getLocaleSpecificMessage(Diagnostics.Could_not_find_convertible_access_expression) };
}

const checker = program.getTypeChecker();
return isConditionalExpression(expression) ? getConditionalInfo(expression, checker) : getBinaryInfo(expression);
}
Expand Down
23 changes: 13 additions & 10 deletions tests/cases/fourslash/refactorConvertToOptionalChainExpression_SubexpressionWithSuffix1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@

// verify that we stop at an invalid suffix sequence.
goTo.select("a", "b");
edit.applyRefactor({
refactorName: "Convert to optional chain expression",
actionName: "Convert to optional chain expression",
actionDescription: "Convert to optional chain expression",
newContent:
`let a = { b: { c: 0 } };
let foo;
let bar;
a?.b?.c && foo && bar;`
});
// edit.applyRefactor({
// refactorName: "Convert to optional chain expression",
// actionName: "Convert to optional chain expression",
// actionDescription: "Convert to optional chain expression",
// newContent:
// `let a = { b: { c: 0 } };
// let foo;
// let bar;
// a?.b?.c && foo && bar;`
// });

// the refactor should NOT be available
verify.not.refactorAvailable("Convert to optional chain expression");
Loading