Skip to content

Fixed issue #72085 where BinaryExpr fix-it suggested missing operator. #72090

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

Merged
xedin merged 1 commit into from
Mar 12, 2024
Merged

Fixed issue #72085 where BinaryExpr fix-it suggested missing operator. #72090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions lib/Sema/CSDiagnostics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5863,12 +5863,16 @@ bool OutOfOrderArgumentFailure::diagnoseAsError() {

// Move requires postfix comma only if argument is moved in-between
// other arguments.
bool requiresComma =
!isExpr<BinaryExpr>(anchor) && PrevArgIdx != args->size() - 1;
std::string argumentSeparator;
if (auto *BE = getAsExpr<BinaryExpr>(anchor)) {
auto operatorName = std::string(*getOperatorName(BE->getFn()));
argumentSeparator = " " + operatorName + " ";
} else if (PrevArgIdx != args->size() - 1) {
argumentSeparator = ", ";
}

diag.fixItRemove(removalRange);
diag.fixItInsert(secondRange.Start,
text.str() + (requiresComma ? ", " : ""));
diag.fixItInsert(secondRange.Start, text.str() + argumentSeparator);
};

// There are 4 diagnostic messages variations depending on
Expand Down
3 changes: 2 additions & 1 deletion test/Parse/operators.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ var _ : TheDevil = God()^
var _ : God = ^TheDevil()
var _ : Man = TheDevil() ^ God()
var _ : Man = God()^ ^ ^TheDevil()
let _ = God()^TheDevil() // expected-error{{operator argument #2 must precede operator argument #1}} {{9-9=TheDevil()}} {{14-25=}}
let _ = God()^TheDevil() // expected-error{{operator argument #2 must precede operator argument #1}} {{9-9=TheDevil() ^ }} {{14-25=}}
let _ = God() ^ TheDevil() // expected-error{{operator argument #2 must precede operator argument #1}} {{9-9=TheDevil() ^ }} {{14-27=}}

postfix func ^ (x: Man) -> () -> God {
return { return God() }
Expand Down