Skip to content

[Refactoring] Fix an issue where refactoring misses to refactor references after prefix operators #58613

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
merged 1 commit into from
May 5, 2022
Merged

[Refactoring] Fix an issue where refactoring misses to refactor references after prefix operators #58613

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
5 changes: 0 additions & 5 deletions lib/IDE/Refactoring.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,11 +440,6 @@ class Renamer {
HandleLabels = Resolved.LabelType != LabelRangeType::None;
break;
}
} else if (Resolved.LabelType != LabelRangeType::None &&
!Config.IsNonProtocolType &&
// FIXME: Workaround for enum case labels until we support them
Config.Usage != NameUsage::Definition) {
return RegionType::Mismatch;
}

if (HandleLabels) {
Expand Down
8 changes: 5 additions & 3 deletions lib/IDE/SwiftSourceDocInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,12 @@ static Expr *extractNameExpr(Expr *Fn) {

std::pair<bool, ArgumentList *>
NameMatcher::walkToArgumentListPre(ArgumentList *ArgList) {
auto Labels = getCallArgLabelRanges(getSourceMgr(), ArgList,
LabelRangeEndAt::BeforeElemStart);
tryResolve(Parent, ArgList->getStartLoc(), LabelRangeType::CallArg,
if (!ArgList->isImplicit()) {
auto Labels = getCallArgLabelRanges(getSourceMgr(), ArgList,
LabelRangeEndAt::BeforeElemStart);
tryResolve(Parent, ArgList->getStartLoc(), LabelRangeType::CallArg,
Labels.first, Labels.second);
}
if (isDone())
return {false, ArgList};

Expand Down
6 changes: 6 additions & 0 deletions test/refactoring/rename/Outputs/prefix_operator/refactor.swift.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
let bar: Int = 12
let negfoo = -bar
print("opposite of \(bar) is \(negfoo)")



13 changes: 13 additions & 0 deletions test/refactoring/rename/prefix_operator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
let foo: Int = 12
let negfoo = -foo
print("opposite of \(foo) is \(negfoo)")

// RUN: %empty-directory(%t.result)

// RUN: %refactor -rename -source-filename %s -pos=1:5 -new-name bar >> %t.result/def.swift
// RUN: %target-swift-frontend-typecheck %t.result/def.swift
// RUN: diff -u %S/Outputs/prefix_operator/refactor.swift.expected %t.result/def.swift

// RUN: %refactor -rename -source-filename %s -pos=2:15 -new-name bar >> %t.result/operator_ref.swift
// RUN: %target-swift-frontend-typecheck %t.result/operator_ref.swift
// RUN: diff -u %S/Outputs/prefix_operator/refactor.swift.expected %t.result/operator_ref.swift