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] Return result sink as code completion results

Browse Source 
Previously the code completion methods just returned an `ArrayRef` that pointed into the result sink that contained the results but no effort was made to actually keep that that result sink alive, e.g. when transforming results in `transformAndForwardResults`.

Instead, return the `CodeCompletionResultSink` from the code compleiton methods now and adopt that sink from the inner results created in `transformAndForwardResults`.
This commit is contained in:
Alex Hoppen
2022-01-04 10:58:11 +01:00
parent 91966deeb7
commit ee99666f91
7 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/IDE/CodeCompletion.cpp
View File

@@ -1354,18 +1354,6 @@ void CodeCompletionResultBuilder::finishResult() {
Sink.Results.push_back(takeResult());
}
MutableArrayRef<CodeCompletionResult *> CodeCompletionContext::takeResults() {
// Copy pointers to the results.
const size_t Count = CurrentResults.Results.size();
CodeCompletionResult **Results =
CurrentResults.Allocator->Allocate<CodeCompletionResult *>(Count);
std::copy(CurrentResults.Results.begin(), CurrentResults.Results.end(),
Results);
CurrentResults.Results.clear();
return MutableArrayRef<CodeCompletionResult *>(Results, Count);
}
Optional<unsigned> CodeCompletionString::getFirstTextChunkIndex(
bool includeLeadingPunctuation) const {
for (auto i : indices(getChunks())) {
@@ -1451,8 +1439,11 @@ CodeCompletionString::getFirstTextChunk(bool includeLeadingPunctuation) const {
return StringRef();
}
void CodeCompletionContext::sortCompletionResults(
MutableArrayRef<CodeCompletionResult *> Results) {
std::vector<CodeCompletionResult *>
CodeCompletionContext::sortCompletionResults(
ArrayRef<CodeCompletionResult *> Results) {
std::vector<CodeCompletionResult *> SortedResults(Results.begin(),
Results.end());
struct ResultAndName {
CodeCompletionResult *result;
std::string name;
@@ -1460,16 +1451,17 @@ void CodeCompletionContext::sortCompletionResults(
// Caching the name of each field is important to avoid unnecessary calls to
// CodeCompletionString::getName().
std::vector<ResultAndName> nameCache(Results.size());
for (unsigned i = 0, n = Results.size(); i < n; ++i) {
auto *result = Results[i];
std::vector<ResultAndName> nameCache(SortedResults.size());
for (unsigned i = 0, n = SortedResults.size(); i < n; ++i) {
auto *result = SortedResults[i];
nameCache[i].result = result;
llvm::raw_string_ostream OS(nameCache[i].name);
printCodeCompletionResultFilterName(*result, OS);
OS.flush();
}
// Sort nameCache, and then transform Results to return the pointers in order.
// Sort nameCache, and then transform SortedResults to return the pointers in
// order.
std::sort(nameCache.begin(), nameCache.end(),
[](const ResultAndName &LHS, const ResultAndName &RHS) {
int Result = StringRef(LHS.name).compare_insensitive(RHS.name);
@@ -1480,8 +1472,9 @@ void CodeCompletionContext::sortCompletionResults(
return Result < 0;
});
llvm::transform(nameCache, Results.begin(),
llvm::transform(nameCache, SortedResults.begin(),
[](const ResultAndName &entry) { return entry.result; });
return SortedResults;
}
namespace {