@@ -77,8 +77,8 @@ struct SwiftToSourceKitCompletionAdapter {
77
77
78
78
struct SwiftCodeCompletionConsumer
79
79
: public ide::SimpleCachingCodeCompletionConsumer {
80
- using HandlerFunc = std::function<void (ArrayRef<CodeCompletionResult *>,
81
- SwiftCompletionInfo &)>;
80
+ using HandlerFunc = std::function<void (
81
+ MutableArrayRef<CodeCompletionResult *>, SwiftCompletionInfo &)>;
82
82
HandlerFunc handleResultsImpl;
83
83
SwiftCompletionInfo swiftContext;
84
84
@@ -218,7 +218,8 @@ void SwiftLangSupport::codeComplete(llvm::MemoryBuffer *UnresolvedInputFile,
218
218
SourceKit::CodeCompletionConsumer &SKConsumer,
219
219
ArrayRef<const char *> Args) {
220
220
SwiftCodeCompletionConsumer SwiftConsumer ([&](
221
- ArrayRef<CodeCompletionResult *> Results, SwiftCompletionInfo &) {
221
+ MutableArrayRef<CodeCompletionResult *> Results, SwiftCompletionInfo &) {
222
+ CodeCompletionContext::sortCompletionResults (Results);
222
223
for (auto *Result : Results) {
223
224
if (!SwiftToSourceKitCompletionAdapter::handleResult (SKConsumer, Result))
224
225
break ;
@@ -987,7 +988,8 @@ static void transformAndForwardResults(
987
988
bool hasQDot = false ;
988
989
bool hasInit = false ;
989
990
SwiftCodeCompletionConsumer swiftConsumer ([&](
990
- ArrayRef<CodeCompletionResult *> results, SwiftCompletionInfo &info) {
991
+ MutableArrayRef<CodeCompletionResult *> results,
992
+ SwiftCompletionInfo &info) {
991
993
auto topResults = filterInnerResults (results, options.addInnerResults ,
992
994
options.addInnerOperators , hasDot,
993
995
hasQDot, hasInit);
@@ -1080,7 +1082,8 @@ void SwiftLangSupport::codeCompleteOpen(
1080
1082
bool hasExpectedTypes = false ;
1081
1083
1082
1084
SwiftCodeCompletionConsumer swiftConsumer (
1083
- [&](ArrayRef<CodeCompletionResult *> results, SwiftCompletionInfo &info) {
1085
+ [&](MutableArrayRef<CodeCompletionResult *> results,
1086
+ SwiftCompletionInfo &info) {
1084
1087
completionKind = info.completionContext ->CodeCompletionKind ;
1085
1088
hasExpectedTypes = info.completionContext ->HasExpectedTypeRelation ;
1086
1089
completions =
0 commit comments