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

[SourceKit] Only call sortCompletionResults where it's needed

Browse Source 
This sort is only for codeComplete, not for codeCompleteOpen, but we
were doing it indiscrimiately leading to ~15% performance penalty in the
latter code path.

rdar://problem/25887631
This commit is contained in:
Ben Langmuir
2016-04-25 08:17:27 -07:00
parent b8bbed8c13
commit 44d422e294
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp
View File

@@ -77,8 +77,8 @@ struct SwiftToSourceKitCompletionAdapter {
struct SwiftCodeCompletionConsumer
: public ide::SimpleCachingCodeCompletionConsumer {
using HandlerFunc = std::function<void(ArrayRef<CodeCompletionResult *>,
SwiftCompletionInfo &)>;
using HandlerFunc = std::function<void(
MutableArrayRef<CodeCompletionResult *>, SwiftCompletionInfo &)>;
HandlerFunc handleResultsImpl;
SwiftCompletionInfo swiftContext;
@@ -218,7 +218,8 @@ void SwiftLangSupport::codeComplete(llvm::MemoryBuffer *UnresolvedInputFile,
SourceKit::CodeCompletionConsumer &SKConsumer,
ArrayRef<const char *> Args) {
SwiftCodeCompletionConsumer SwiftConsumer([&](
ArrayRef<CodeCompletionResult *> Results, SwiftCompletionInfo &) {
MutableArrayRef<CodeCompletionResult *> Results, SwiftCompletionInfo &) {
CodeCompletionContext::sortCompletionResults(Results);
for (auto *Result : Results) {
if (!SwiftToSourceKitCompletionAdapter::handleResult(SKConsumer, Result))
break;
@@ -987,7 +988,8 @@ static void transformAndForwardResults(
bool hasQDot = false;
bool hasInit = false;
SwiftCodeCompletionConsumer swiftConsumer([&](
ArrayRef<CodeCompletionResult *> results, SwiftCompletionInfo &info) {
MutableArrayRef<CodeCompletionResult *> results,
SwiftCompletionInfo &info) {
auto topResults = filterInnerResults(results, options.addInnerResults,
options.addInnerOperators, hasDot,
hasQDot, hasInit);
@@ -1080,7 +1082,8 @@ void SwiftLangSupport::codeCompleteOpen(
bool hasExpectedTypes = false;
SwiftCodeCompletionConsumer swiftConsumer(
[&](ArrayRef<CodeCompletionResult *> results, SwiftCompletionInfo &info) {
[&](MutableArrayRef<CodeCompletionResult *> results,
SwiftCompletionInfo &info) {
completionKind = info.completionContext->CodeCompletionKind;
hasExpectedTypes = info.completionContext->HasExpectedTypeRelation;
completions =