averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Refactoring] Unwrap optional chains in async transform

Browse Source 
Remove an optional chain of a success parameter,
as it will no longer be optional, similar to how
we remove a force unwrap.

Note that while this is a locally valid transform
within the optional chain, e.g `foo?.x` -> `foo.x`,
it may change the type of the overall chain, which
could cause errors elsewhere in the code. However
this is generally more useful to the user than
just leaving `foo` as a placeholder. Note this is
only the case when no other optionals are involved
in the chain, e.g `foo?.x?.y` -> `foo.x?.y` is
completely valid.

Resolves rdar://74014826.
This commit is contained in:
Hamish Knight
2021-04-30 14:34:31 +01:00
parent 9def05370b
commit 07cdc2029e
2 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/IDE/Refactoring.cpp
View File

@@ -4701,8 +4701,9 @@ class AsyncConverter : private SourceEntityWalker {
SmallString<0> Buffer;
llvm::raw_svector_ostream OS;
// Decls where any force-unwrap of that decl should be unwrapped, eg. for a
// previously optional closure paramter has become a non-optional local
// Decls where any force unwrap or optional chain of that decl should be
// elided, e.g for a previously optional closure parameter that has become a
// non-optional local.
llvm::DenseSet<const Decl *> Unwraps;
// Decls whose references should be replaced with, either because they no
// longer exist or are a different type. Any replaced code should ideally be
@@ -4813,11 +4814,19 @@ private:
OS << PLACEHOLDER_END;
});
}
} else if (auto *FTE = dyn_cast<ForceValueExpr>(E)) {
if (auto *D = FTE->getReferencedDecl().getDecl()) {
} else if (isa<ForceValueExpr>(E) || isa<BindOptionalExpr>(E)) {
// Remove a force unwrap or optional chain of a returned success value,
// as it will no longer be optional. For force unwraps, this is always a
// valid transform. For optional chains, it is a locally valid transform
// within the optional chain e.g foo?.x -> foo.x, but may change the type
// of the overall chain, which could cause errors elsewhere in the code.
// However this is generally more useful to the user than just leaving
// 'foo' as a placeholder. Note this is only the case when no other
// optionals are involved in the chain, e.g foo?.x?.y -> foo.x?.y is
// completely valid.
if (auto *D = E->getReferencedDecl().getDecl()) {
if (Unwraps.count(D))
return addCustom(FTE->getStartLoc(),
FTE->getEndLoc().getAdvancedLoc(1),
return addCustom(E->getStartLoc(), E->getEndLoc().getAdvancedLoc(1),
[&]() { OS << newNameFor(D, true); });
}
} else if (NestedExprCount == 0) {