Skip to content

[6.2] [Refactoring] Handle argument count mismatches in renameLabelsLenient #82967

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
Jul 11, 2025
Merged

[6.2] [Refactoring] Handle argument count mismatches in renameLabelsLenient #82967

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
11 changes: 5 additions & 6 deletions lib/Refactoring/SyntacticRenameRangeDetails.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,12 @@ bool RenameRangeDetailCollector::renameLabelsLenient(
LabelRanges = LabelRanges.take_front(*FirstTrailingLabel);

for (auto LabelIndex : llvm::reverse(indices(TrailingLabels))) {
if (OldNames.empty())
return true;

CharSourceRange Label = TrailingLabels[LabelIndex];

if (Label.getByteLength()) {
if (OldNames.empty())
return true;

while (!labelRangeMatches(Label, LabelRangeType::CompoundName,
OldNames.back())) {
if ((OldNames = OldNames.drop_back()).empty())
Expand All @@ -302,9 +302,6 @@ bool RenameRangeDetailCollector::renameLabelsLenient(

// empty labelled trailing closure label
if (LabelIndex) {
if (OldNames.empty())
return true;

while (!OldNames.back().empty()) {
if ((OldNames = OldNames.drop_back()).empty())
return true;
Expand All @@ -330,6 +327,8 @@ bool RenameRangeDetailCollector::renameLabelsLenient(

// first name pos
if (!NameIndex) {
if (NameIndex >= OldNames.size())
return true;
while (!OldNames[NameIndex].empty()) {
if (++NameIndex >= OldNames.size())
return true;
Expand Down
105 changes: 105 additions & 0 deletions test/SourceKit/Refactoring/rdar155549979.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
// RUN: %empty-directory(%t)
// RUN: split-file %s %t
// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %t/spec.json %t/main.swift | %FileCheck %s

// REQUIRES: swift_swift_parser

//--- main.swift
func foo() {}

// Make sure we don't crash on the unrelated comment refs:
// foo()
// foo(0)
// foo(a: 0)
// foo {}
// foo {} a: {}

// Nor when written in code:
foo()
foo(0)
foo(a: 0)
foo {}
foo {} a: {}

// CHECK: source.edit.kind.active:
// CHECK-NEXT: 1:6-1:9 source.refactoring.range.kind.basename
// CHECK-NEXT: source.edit.kind.comment:
// CHECK-NEXT: 4:4-4:7 source.refactoring.range.kind.basename
// CHECK-NEXT: source.edit.kind.unknown:
// CHECK-NEXT: 5:4-5:7 source.refactoring.range.kind.basename
// CHECK-NEXT: source.edit.kind.unknown:
// CHECK-NEXT: 6:4-6:7 source.refactoring.range.kind.basename
// CHECK-NEXT: source.edit.kind.unknown:
// CHECK-NEXT: 7:4-7:7 source.refactoring.range.kind.basename
// CHECK-NEXT: source.edit.kind.unknown:
// CHECK-NEXT: 8:4-8:7 source.refactoring.range.kind.basename
// CHECK-NEXT: source.edit.kind.active:
// CHECK-NEXT: 11:1-11:4 source.refactoring.range.kind.basename
// CHECK-NEXT: source.edit.kind.mismatch:
// CHECK-NEXT: source.edit.kind.mismatch:
// CHECK-NEXT: source.edit.kind.mismatch:
// CHECK-NEXT: source.edit.kind.mismatch:

//--- spec.json
[
{
"key.name": "foo()",
"key.locations": [
{
"key.line": 1,
"key.column": 6,
"key.nametype": source.syntacticrename.definition
},
{
"key.line": 4,
"key.column": 4,
"key.nametype": source.syntacticrename.unknown
},
{
"key.line": 5,
"key.column": 4,
"key.nametype": source.syntacticrename.unknown
},
{
"key.line": 6,
"key.column": 4,
"key.nametype": source.syntacticrename.unknown
},
{
"key.line": 7,
"key.column": 4,
"key.nametype": source.syntacticrename.unknown
},
{
"key.line": 8,
"key.column": 4,
"key.nametype": source.syntacticrename.unknown
},
{
"key.line": 11,
"key.column": 1,
"key.nametype": source.syntacticrename.call
},
{
"key.line": 12,
"key.column": 1,
"key.nametype": source.syntacticrename.call
},
{
"key.line": 13,
"key.column": 1,
"key.nametype": source.syntacticrename.call
},
{
"key.line": 14,
"key.column": 1,
"key.nametype": source.syntacticrename.call
},
{
"key.line": 15,
"key.column": 1,
"key.nametype": source.syntacticrename.call
},
]
}
]