caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[clangd] Simplify ternary expressions with std::optional::value_or (NFC) (#111309)

Browse Source
This commit is contained in:
Kazu Hirata
2024-10-06 14:47:05 -07:00
committed by GitHub
parent 7f65377880
commit b0c070e263
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clang-tools-extra/clangd/FindSymbols.cpp
View File

@@ -111,7 +111,7 @@ getWorkspaceSymbols(llvm::StringRef Query, int Limit,
*Req.Limit *= 5; *Req.Limit *= 5;
} }
TopN<ScoredSymbolInfo, ScoredSymbolGreater> Top( TopN<ScoredSymbolInfo, ScoredSymbolGreater> Top(
Req.Limit ? *Req.Limit : std::numeric_limits<size_t>::max()); Req.Limit.value_or(std::numeric_limits<size_t>::max()));
FuzzyMatcher Filter(Req.Query); FuzzyMatcher Filter(Req.Query);
Index->fuzzyFind(Req, [HintPath, &Top, &Filter, AnyScope = Req.AnyScope, Index->fuzzyFind(Req, [HintPath, &Top, &Filter, AnyScope = Req.AnyScope,

2
clang-tools-extra/clangd/index/MemIndex.cpp
View File

@@ -31,7 +31,7 @@ bool MemIndex::fuzzyFind(
trace::Span Tracer("MemIndex fuzzyFind"); trace::Span Tracer("MemIndex fuzzyFind");
TopN<std::pair<float, const Symbol *>> Top( TopN<std::pair<float, const Symbol *>> Top(
Req.Limit ? *Req.Limit : std::numeric_limits<size_t>::max()); Req.Limit.value_or(std::numeric_limits<size_t>::max()));
FuzzyMatcher Filter(Req.Query); FuzzyMatcher Filter(Req.Query);
bool More = false; bool More = false;
for (const auto &Pair : Index) { for (const auto &Pair : Index) {

2
clang-tools-extra/clangd/index/dex/Dex.cpp
View File

@@ -264,7 +264,7 @@ bool Dex::fuzzyFind(const FuzzyFindRequest &Req,
return LHS.second > RHS.second; return LHS.second > RHS.second;
}; };
TopN<IDAndScore, decltype(Compare)> Top( TopN<IDAndScore, decltype(Compare)> Top(
Req.Limit ? *Req.Limit : std::numeric_limits<size_t>::max(), Compare); Req.Limit.value_or(std::numeric_limits<size_t>::max()), Compare);
for (const auto &IDAndScore : IDAndScores) { for (const auto &IDAndScore : IDAndScores) {
const DocID SymbolDocID = IDAndScore.first; const DocID SymbolDocID = IDAndScore.first;
const auto *Sym = Symbols[SymbolDocID]; const auto *Sym = Symbols[SymbolDocID];