Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-01-19 03:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reflect string_view and fix workspace/symbol

Browse Source
This commit is contained in:
Fangrui Song 2018-02-01 13:38:46 -08:00
parent 0d715e7bcf
commit 642975ea17
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/messages/workspace_symbol.cc
View File

@ -124,8 +124,8 @@ gap_penalty(k+1, j) + score[j] : k < j))
The first dimension can be suppressed since we do not need a matching scheme,
which reduces the space complexity from O(N*M) to O(M)
*/
int FuzzyEvaluate(std::string_view pattern,
std::string_view str,
int FuzzyEvaluate(const std::string& pattern,
const std::string& str,
std::vector<int>& score,
std::vector<int>& dp) {
bool pfirst = true, // aligning the first character of pattern
@ -204,7 +204,7 @@ struct WorkspaceSymbolHandler : BaseMessageHandler<Ipc_WorkspaceSymbol> {
for (int i = 0; i < db->detailed_names.size(); ++i) {
if (db->detailed_names[i].find(query) != std::string::npos) {
// Do not show the same entry twice.
if (!inserted_results.insert(std::string(db->detailed_names[i])).second)
if (!inserted_results.insert(db->detailed_names[i]).second)
continue;
if (InsertSymbolIntoResult(db, working_files, db->symbols[i],
@ -227,7 +227,7 @@ struct WorkspaceSymbolHandler : BaseMessageHandler<Ipc_WorkspaceSymbol> {
for (int i = 0; i < db->short_names.size(); ++i) {
if (SubsequenceMatch(query_without_space, db->short_names[i])) {
// Do not show the same entry twice.
if (!inserted_results.insert(std::string(db->detailed_names[i])).second)
if (!inserted_results.insert(db->detailed_names[i]).second)
continue;
if (InsertSymbolIntoResult(db, working_files, db->symbols[i],

4
src/query.cc
View File

@ -943,8 +943,8 @@ void QueryDatabase::ImportOrUpdate(
void QueryDatabase::UpdateDetailedNames(size_t* qualified_name_index,
SymbolKind kind,
size_t symbol_index,
std::string_view short_name,
std::string_view detailed_name) {
const std::string& short_name,
const std::string& detailed_name) {
if (*qualified_name_index == -1) {
short_names.push_back(short_name);
detailed_names.push_back(detailed_name);

8
src/query.h
View File

@ -363,8 +363,8 @@ MAKE_HASHABLE(NormalizedPath, t.path);
struct QueryDatabase {
// Indicies between lookup vectors are related to symbols, ie, index 5 in
// |detailed_names| matches index 5 in |symbols|.
std::vector<std::string_view> detailed_names;
std::vector<std::string_view> short_names;
std::vector<std::string> detailed_names;
std::vector<std::string> short_names;
std::vector<SymbolIdx> symbols;
// Raw data storage. Accessible via SymbolIdx instances.
@ -390,8 +390,8 @@ struct QueryDatabase {
void UpdateDetailedNames(size_t* qualified_name_index,
SymbolKind kind,
size_t symbol_index,
std::string_view short_name,
std::string_view detailed_name);
const std::string& short_name,
const std::string& detailed_name);
// Query the indexing structure to look up symbol id for given Usr.
optional<QueryFileId> GetQueryFileIdFromPath(const std::string& path);

5
src/serializer.cc
View File

@ -119,7 +119,10 @@ void Reflect(Reader&, std::string_view&) {
assert(0);
}
void Reflect(Writer& visitor, std::string_view& data) {
visitor.String(&data[0], (rapidjson::SizeType)data.size());
if (data.empty())
visitor.String("");
else
visitor.String(&data[0], (rapidjson::SizeType)data.size());
}