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

[CodeCompletion] Simplify getPositionInArgs()

Browse Source 
* Don't need to look for CodeCompletionExpr. It's wrong anyway because
  what we are looking for is not neccessarily a 'CodeCompletionExpr'.
* Use getElementLoc(i).isValid() instead of !getElementName(i).empty().
  Just in case users write '_:' for call argument.
* Don't suggest argument labels for implicit call expression. For
  instance, string interpolation segments.
This commit is contained in:
Rintaro Ishizaki
2018-08-08 13:41:45 +09:00
parent 18582d3406
commit 137ca6551b
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/IDE/CodeCompletion.cpp
View File

@@ -3947,19 +3947,12 @@ public:
if (!tuple)
return false;
for (unsigned i = 0, n = tuple->getNumElements(); i != n; ++i) {
if (isa<CodeCompletionExpr>(tuple->getElement(i))) {
HasName = !tuple->getElementName(i).empty();
Position = i;
return true;
}
}
auto &SM = DC.getASTContext().SourceMgr;
for (unsigned i = 0, n = tuple->getNumElements(); i != n; ++i) {
if (SM.isBeforeInBuffer(tuple->getElement(i)->getEndLoc(),
CCExpr->getStartLoc()))
continue;
HasName = !tuple->getElementName(i).empty();
HasName = tuple->getElementNameLoc(i).isValid();
Position = i;
return true;
}
@@ -3983,7 +3976,8 @@ public:
// Collect possible types (or labels) at the position.
{
bool MayNeedName = !HasName && isa<CallExpr>(CallE);
bool MayNeedName =
!HasName && isa<CallExpr>(CallE) && !CallE->isImplicit();
SmallPtrSet<TypeBase *, 4> seenTypes;
SmallPtrSet<Identifier, 4> seenNames;
for (auto Params : Candidates) {