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

[CodeComplete] Add option to add calls with no defaults (or not)

Browse Source 
Now that arguments are marked up with whether they have a default or
not, clients may not need the extra call (that has no default
arguments). Add an option to allow not adding this item.

Resolves rdar://85526214.
This commit is contained in:
Ben Barham
2021-12-02 14:30:10 +10:00
parent 4187875ac6
commit 65ef8020de
8 changed files with 90 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/IDE/CodeCompletion.cpp
View File

@@ -2777,8 +2777,9 @@ public:
}
}
static bool hasInterestingDefaultValues(const AbstractFunctionDecl *func) {
if (!func) return false;
bool addItemWithoutDefaultArgs(const AbstractFunctionDecl *func) {
if (!func || !Sink.addCallWithNoDefaultArgs)
return false;
for (auto param : *func->getParameters()) {
if (hasInterestingDefaultValue(param))
return true;
@@ -3078,7 +3079,7 @@ public:
if (isImplicitlyCurriedInstanceMethod) {
addPattern({AFD->getImplicitSelfDecl()}, /*includeDefaultArgs=*/true);
} else {
if (hasInterestingDefaultValues(AFD))
if (addItemWithoutDefaultArgs(AFD))
addPattern(AFD->getParameters()->getArray(),
/*includeDefaultArgs=*/false);
addPattern(AFD->getParameters()->getArray(),
@@ -3282,7 +3283,7 @@ public:
if (trivialTrailingClosure)
addMethodImpl(/*includeDefaultArgs=*/false,
/*trivialTrailingClosure=*/true);
if (hasInterestingDefaultValues(FD))
if (addItemWithoutDefaultArgs(FD))
addMethodImpl(/*includeDefaultArgs=*/false);
addMethodImpl(/*includeDefaultArgs=*/true);
}
@@ -3372,8 +3373,8 @@ public:
}
};
if (ConstructorType && hasInterestingDefaultValues(CD))
addConstructorImpl(/*includeDefaultArgs*/ false);
if (ConstructorType && addItemWithoutDefaultArgs(CD))
addConstructorImpl(/*includeDefaultArgs=*/false);
addConstructorImpl();
}
@@ -6653,8 +6654,8 @@ static void deliverCompletionResults(CodeCompletionContext &CompletionContext,
AccessLevel::Internal, TheModule,
SourceFile::ImportQueryKind::PrivateOnly),
CompletionContext.getAddInitsToTopLevel(),
CompletionContext.getAnnotateResult(),
};
CompletionContext.addCallWithNoDefaultArgs(),
CompletionContext.getAnnotateResult()};
using PairType = llvm::DenseSet<swift::ide::CodeCompletionCache::Key,
llvm::DenseMapInfo<CodeCompletionCache::Key>>::iterator;
@@ -7548,6 +7549,7 @@ void SimpleCachingCodeCompletionConsumer::handleResultsAndModules(
Sink.addInitsToTopLevel = context.getAddInitsToTopLevel();
Sink.enableCallPatternHeuristics = context.getCallPatternHeuristics();
Sink.includeObjectLiterals = context.includeObjectLiterals();
Sink.addCallWithNoDefaultArgs = context.addCallWithNoDefaultArgs();
lookupCodeCompletionResultsFromModule(
(*V)->Sink, R.TheModule, R.Key.AccessPath,
R.Key.ResultsHaveLeadingDot, SF);