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

Merge pull request #39473 from apple/rebranch

Browse Source 
Update swift:main to support llvm-project:stable/20210726 changes (Rebranch merge)
This commit is contained in:
Mishal Shah
2021-10-11 09:00:51 -07:00
committed by GitHub
parent 0f73410100 adf8ba3639
commit c2fd49cebb
183 changed files with 1039 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/IDE/CodeCompletion.cpp
View File

@@ -1462,13 +1462,13 @@ void CodeCompletionContext::sortCompletionResults(
// Sort nameCache, and then transform Results to return the pointers in order.
std::sort(nameCache.begin(), nameCache.end(),
[](const ResultAndName &LHS, const ResultAndName &RHS) {
int Result = StringRef(LHS.name).compare_lower(RHS.name);
// If the case insensitive comparison is equal, then secondary sort order
// should be case sensitive.
if (Result == 0)
Result = LHS.name.compare(RHS.name);
return Result < 0;
});
int Result = StringRef(LHS.name).compare_insensitive(RHS.name);
// If the case insensitive comparison is equal, then secondary
// sort order should be case sensitive.
if (Result == 0)
Result = LHS.name.compare(RHS.name);
return Result < 0;
});
llvm::transform(nameCache, Results.begin(),
[](const ResultAndName &entry) { return entry.result; });