Skip to content

[Refactoring] Do not try to unique '_' #38981

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
Aug 24, 2021
Merged

[Refactoring] Do not try to unique '_' #38981

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
9 changes: 6 additions & 3 deletions lib/IDE/Refactoring.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7238,7 +7238,7 @@ class AsyncConverter : private SourceEntityWalker {
/*Success=*/true);

addAwaitCall(CE, ArgList.ref(), Blocks.SuccessBlock, SuccessParams,
InlinePatterns, HandlerDesc, /*AddDeclarations*/ true);
InlinePatterns, HandlerDesc, /*AddDeclarations=*/true);
printOutOfLineBindingPatterns(Blocks.SuccessBlock, InlinePatterns);
convertNodes(Blocks.SuccessBlock.nodesToPrint());
clearNames(SuccessParams);
Expand All @@ -7249,7 +7249,8 @@ class AsyncConverter : private SourceEntityWalker {

// Always use the ErrParam name if none is bound.
prepareNames(Blocks.ErrorBlock, llvm::makeArrayRef(ErrParam),
ErrInlinePatterns, HandlerDesc.Type != HandlerType::RESULT);
ErrInlinePatterns,
/*AddIfMissing=*/HandlerDesc.Type != HandlerType::RESULT);
preparePlaceholdersAndUnwraps(HandlerDesc, SuccessParams, ErrParam,
/*Success=*/false);

Expand Down Expand Up @@ -7530,7 +7531,7 @@ class AsyncConverter : private SourceEntityWalker {
void addCatch(const ParamDecl *ErrParam) {
OS << "\n" << tok::r_brace << " " << tok::kw_catch << " ";
auto ErrName = newNameFor(ErrParam, false);
if (!ErrName.empty()) {
if (!ErrName.empty() && ErrName != "_") {
OS << tok::kw_let << " " << ErrName << " ";
}
OS << tok::l_brace;
Expand Down Expand Up @@ -7614,6 +7615,8 @@ class AsyncConverter : private SourceEntityWalker {
/// other names in the current scope.
Identifier createUniqueName(StringRef Name) {
Identifier Ident = getASTContext().getIdentifier(Name);
if (Name == "_")
return Ident;

auto &CurrentNames = Scopes.back().Names;
if (CurrentNames.count(Ident)) {
Expand Down
43 changes: 43 additions & 0 deletions test/refactoring/ConvertAsync/convert_function.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,3 +622,46 @@ func twoCompletionHandlerCalls(completion: @escaping (String?, Error?) -> Void)
// TWO-COMPLETION-HANDLER-CALLS-NEXT: return res
// TWO-COMPLETION-HANDLER-CALLS-NEXT: return res
// TWO-COMPLETION-HANDLER-CALLS-NEXT: }

// RUN: %refactor-check-compiles -convert-to-async -dump-text -source-filename %s -pos=%(line+1):1 | %FileCheck -check-prefix=NESTED-IGNORED %s
func nestedIgnored() throws {
simple { _ in
print("done")
simple { _ in
print("done")
}
}
}
// NESTED-IGNORED: func nestedIgnored() async throws {
// NESTED-IGNORED-NEXT: let _ = await simple()
// NESTED-IGNORED-NEXT: print("done")
// NESTED-IGNORED-NEXT: let _ = await simple()
// NESTED-IGNORED-NEXT: print("done")
// NESTED-IGNORED-NEXT: }

// RUN: %refactor-check-compiles -convert-to-async -dump-text -source-filename %s -pos=%(line+1):1 | %FileCheck -check-prefix=IGNORED-ERR %s
func nestedIgnoredErr() throws {
simpleErr(arg: "") { str, _ in
if str == nil {
print("error")
}

simpleErr(arg: "") { str, _ in
if str == nil {
print("error")
}
}
}
}
// IGNORED-ERR: func nestedIgnoredErr() async throws {
// IGNORED-ERR-NEXT: do {
// IGNORED-ERR-NEXT: let str = try await simpleErr(arg: "")
// IGNORED-ERR-NEXT: do {
// IGNORED-ERR-NEXT: let str1 = try await simpleErr(arg: "")
// IGNORED-ERR-NEXT: } catch {
// IGNORED-ERR-NEXT: print("error")
// IGNORED-ERR-NEXT: }
// IGNORED-ERR-NEXT: } catch {
// IGNORED-ERR-NEXT: print("error")
// IGNORED-ERR-NEXT: }
// IGNORED-ERR-NEXT: }