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

[Completion] Use statically-known size for completion ordering

Browse Source 
We know the size of these arrays statically, there's no point
calculating them at runtime.

Resolves rdar://119938834.
This commit is contained in:
Ben Barham
2024-01-02 17:30:25 -08:00
parent 9019d07fd7
commit f3426eb8a6
1 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.cpp
View File

@@ -701,6 +701,13 @@ static ResultBucket getResultBucket(Item &item, bool hasRequiredTypes,
}
}
template <class T, size_t N>
static size_t getIndex(const T (&array)[N], T element) {
auto I = std::find(array, &array[N], element);
assert(I != &array[N]);
return std::distance(array, I);
}
static int compareHighPriorityKeywords(Item &a_, Item &b_) {
static CodeCompletionKeywordKind order[] = {
CodeCompletionKeywordKind::kw_let,
@@ -711,16 +718,9 @@ static int compareHighPriorityKeywords(Item &a_, Item &b_) {
CodeCompletionKeywordKind::kw_return,
CodeCompletionKeywordKind::kw_func,
};
auto size = sizeof(order) / sizeof(order[0]);
auto getIndex = [=](Item &item) {
auto I = std::find(order, &order[size], cast<Result>(item).value->getKeywordKind());
assert(I != &order[size]);
return std::distance(order, I);
};
auto a = getIndex(a_);
auto b = getIndex(b_);
auto a = getIndex(order, cast<Result>(a_).value->getKeywordKind());
auto b = getIndex(order, cast<Result>(b_).value->getKeywordKind());
return a < b ? -1 : (b < a ? 1 : 0);
}
@@ -736,16 +736,9 @@ static int compareLiterals(Item &a_, Item &b_) {
CodeCompletionLiteralKind::Tuple,
CodeCompletionLiteralKind::NilLiteral,
};
auto size = sizeof(order) / sizeof(order[0]);
auto getIndex = [=](Item &item) {
auto I = std::find(order, &order[size], cast<Result>(item).value->getLiteralKind());
assert(I != &order[size]);
return std::distance(order, I);
};
auto a = getIndex(a_);
auto b = getIndex(b_);
auto a = getIndex(order, cast<Result>(a_).value->getLiteralKind());
auto b = getIndex(order, cast<Result>(b_).value->getLiteralKind());
if (a != b)
return a < b ? -1 : 1;
@@ -816,17 +809,9 @@ static int compareOperators(Item &a_, Item &b_) {
CCOK::NotEqEq, // !==
CCOK::TildeEq, // ~=
};
auto size = sizeof(order) / sizeof(order[0]);
auto getIndex = [=](Item &item) {
auto I = std::find(order, &order[size],
cast<Result>(item).value->getOperatorKind());
assert(I != &order[size]);
return std::distance(order, I);
};
auto a = getIndex(a_);
auto b = getIndex(b_);
auto a = getIndex(order, cast<Result>(a_).value->getOperatorKind());
auto b = getIndex(order, cast<Result>(b_).value->getOperatorKind());
return a < b ? -1 : (b < a ? 1 : 0);
}