Skip to content

[NFC][SourceKit] Correct a typo in SwiftEditor.cpp #31946

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 22, 2020
Merged

[NFC][SourceKit] Correct a typo in SwiftEditor.cpp #31946

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
38 changes: 19 additions & 19 deletions tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1697,21 +1697,21 @@ class PlaceholderExpansionScanner {

struct ParamClosureInfo {
Optional<ClosureInfo> placeholderClosure;
bool isNonPlacholderClosure = false;
bool isNonPlaceholderClosure = false;
bool isWrappedWithBraces = false;
};

/// Scan the given TupleExpr collecting parameter closure information and
/// returning the index of the given target placeholder (if found).
Optional<unsigned> scanTupleExpr(TupleExpr *TE, SourceLoc targetPlacholderLoc,
Optional<unsigned> scanTupleExpr(TupleExpr *TE, SourceLoc targetPlaceholderLoc,
std::vector<ParamClosureInfo> &outParams) {
if (TE->getElements().empty())
return llvm::None;

outParams.clear();
outParams.reserve(TE->getNumElements());

Optional<unsigned> targetPlacholderIndex;
Optional<unsigned> targetPlaceholderIndex;

for (Expr *E : TE->getElements()) {
outParams.emplace_back();
Expand All @@ -1720,8 +1720,8 @@ class PlaceholderExpansionScanner {
if (auto CE = dyn_cast<ClosureExpr>(E)) {
if (CE->hasSingleExpressionBody() &&
CE->getSingleExpressionBody()->getStartLoc() ==
targetPlacholderLoc) {
targetPlacholderIndex = outParams.size() - 1;
targetPlaceholderLoc) {
targetPlaceholderIndex = outParams.size() - 1;
if (auto *PHE = dyn_cast<EditorPlaceholderExpr>(
CE->getSingleExpressionBody())) {
outParam.isWrappedWithBraces = true;
Expand All @@ -1732,7 +1732,7 @@ class PlaceholderExpansionScanner {
}
}
// else...
outParam.isNonPlacholderClosure = true;
outParam.isNonPlaceholderClosure = true;
continue;
}

Expand All @@ -1741,15 +1741,15 @@ class PlaceholderExpansionScanner {
if (scanClosureType(PHE, info))
outParam.placeholderClosure = info;
} else if (containClosure(E)) {
outParam.isNonPlacholderClosure = true;
outParam.isNonPlaceholderClosure = true;
}

if (E->getStartLoc() == targetPlacholderLoc) {
targetPlacholderIndex = outParams.size() - 1;
if (E->getStartLoc() == targetPlaceholderLoc) {
targetPlaceholderIndex = outParams.size() - 1;
}
}

return targetPlacholderIndex;
return targetPlaceholderIndex;
}

public:
Expand Down Expand Up @@ -1785,21 +1785,21 @@ class PlaceholderExpansionScanner {
// and if the call parens can be removed in that case.
// We'll first find the enclosing CallExpr, and then do further analysis.
std::vector<ParamClosureInfo> params;
Optional<unsigned> targetPlacholderIndex;
Optional<unsigned> targetPlaceholderIndex;
auto ECE = enclosingCallExprArg(SF, PlaceholderStartLoc);
Expr *Args = ECE.first;
if (Args && ECE.second) {
if (isa<ParenExpr>(Args)) {
params.emplace_back();
params.back().placeholderClosure = TargetClosureInfo;
targetPlacholderIndex = 0;
targetPlaceholderIndex = 0;
} else if (auto *TE = dyn_cast<TupleExpr>(Args)) {
targetPlacholderIndex = scanTupleExpr(TE, PlaceholderStartLoc, params);
targetPlaceholderIndex = scanTupleExpr(TE, PlaceholderStartLoc, params);
}
}

// If there was no appropriate parent call expression, it's non-trailing.
if (!targetPlacholderIndex.hasValue()) {
if (!targetPlaceholderIndex.hasValue()) {
OneClosureCallback(Args, /*useTrailingClosure=*/false,
/*isWrappedWithBraces=*/false, TargetClosureInfo);
return true;
Expand All @@ -1811,23 +1811,23 @@ class PlaceholderExpansionScanner {
// Find the first parameter eligible to be trailing.
while (firstTrailingIndex != 0) {
unsigned i = firstTrailingIndex - 1;
if (params[i].isNonPlacholderClosure ||
if (params[i].isNonPlaceholderClosure ||
!params[i].placeholderClosure.hasValue())
break;
firstTrailingIndex = i;
}

if (firstTrailingIndex > targetPlacholderIndex) {
if (firstTrailingIndex > targetPlaceholderIndex) {
// Target comes before the eligible trailing closures.
OneClosureCallback(Args, /*isTrailing=*/false,
params[*targetPlacholderIndex].isWrappedWithBraces,
params[*targetPlaceholderIndex].isWrappedWithBraces,
TargetClosureInfo);
return true;
} else if (targetPlacholderIndex == end - 1 &&
} else if (targetPlaceholderIndex == end - 1 &&
firstTrailingIndex == end - 1) {
// Target is the only eligible trailing closure.
OneClosureCallback(Args, /*isTrailing=*/true,
params[*targetPlacholderIndex].isWrappedWithBraces,
params[*targetPlaceholderIndex].isWrappedWithBraces,
TargetClosureInfo);
return true;
}
Expand Down