replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[clangd] NFC: Use uint32_t for FuzzyFindRequest limits 

Reviewed By: ioeric

Differential Revision: https://reviews.llvm.org/D51860

llvm-svn: 341921
This commit is contained in:
Kirill Bobyrev 2018-09-11 10:31:38 +00:00
parent 32d8d1bf04
commit 0dee397e06
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clang-tools-extra/clangd/index/Index.cpp
View File

@ -177,29 +177,25 @@ std::shared_ptr<SymbolIndex> SwapIndex::snapshot() const {
bool fromJSON(const llvm::json::Value &Parameters, FuzzyFindRequest &Request) {
json::ObjectMapper O(Parameters);
llvm::Optional<int64_t> MaxCandidateCount;
int64_t MaxCandidateCount;
bool OK =
O && O.map("Query", Request.Query) && O.map("Scopes", Request.Scopes) &&
O.map("MaxCandidateCount", MaxCandidateCount) &&
O.map("RestrictForCodeCompletion", Request.RestrictForCodeCompletion) &&
O.map("ProximityPaths", Request.ProximityPaths) &&
O.map("MaxCandidateCount", MaxCandidateCount);
if (MaxCandidateCount)
Request.MaxCandidateCount = MaxCandidateCount.getValue();
O.map("ProximityPaths", Request.ProximityPaths);
if (OK && MaxCandidateCount <= std::numeric_limits<uint32_t>::max())
Request.MaxCandidateCount = MaxCandidateCount;
return OK;
}
llvm::json::Value toJSON(const FuzzyFindRequest &Request) {
auto Result = json::Object{
return json::Object{
{"Query", Request.Query},
{"Scopes", json::Array{Request.Scopes}},
{"MaxCandidateCount", Request.MaxCandidateCount},
{"RestrictForCodeCompletion", Request.RestrictForCodeCompletion},
{"ProximityPaths", json::Array{Request.ProximityPaths}},
};
// A huge limit means no limit, leave it out.
if (Request.MaxCandidateCount <= std::numeric_limits<int64_t>::max())
Result["MaxCandidateCount"] =
static_cast<int64_t>(Request.MaxCandidateCount);
return std::move(Result);
}
bool SwapIndex::fuzzyFind(const FuzzyFindRequest &R,

4
clang-tools-extra/clangd/index/Index.h
View File

@ -437,7 +437,9 @@ struct FuzzyFindRequest {
std::vector<std::string> Scopes;
/// \brief The number of top candidates to return. The index may choose to
/// return more than this, e.g. if it doesn't know which candidates are best.
size_t MaxCandidateCount = std::numeric_limits<size_t>::max();
// FIXME: Use llvm::Optional; semantically, the absence of MaxCandidateCount
// is equivalent to setting this field to default value as below.
uint32_t MaxCandidateCount = std::numeric_limits<uint32_t>::max();
/// If set to true, only symbols for completion support will be considered.
bool RestrictForCodeCompletion = false;
/// Contextually relevant files (e.g. the file we're code-completing in).