Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-06-07 16:54:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor document_symbol, replace void*

Browse Source
This commit is contained in:
Ludovic Jozeau 2020-06-26 18:04:25 +02:00
parent 8cf8a3c4a4
commit d0edae6ef4
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/messages/textDocument_document.cc
View File

@ -6,6 +6,7 @@
#include "query.hh" #include "query.hh"
#include <algorithm> #include <algorithm>
#include <type_traits>
MAKE_HASHABLE(ccls::SymbolIdx, t.usr, t.kind); MAKE_HASHABLE(ccls::SymbolIdx, t.usr, t.kind);
@ -166,7 +167,11 @@ void MessageHandler::textDocument_documentSymbol(JsonReader &reader,
reply(result); reply(result);
} else if (g_config->client.hierarchicalDocumentSymbolSupport) { } else if (g_config->client.hierarchicalDocumentSymbolSupport) {
std::unordered_map<SymbolIdx, std::unique_ptr<DocumentSymbol>> sym2ds; std::unordered_map<SymbolIdx, std::unique_ptr<DocumentSymbol>> sym2ds;
std::vector<std::pair<std::vector<const void *>, DocumentSymbol *>> funcs, std::vector<
std::pair<std::vector<const QueryFunc::Def *>, DocumentSymbol *>>
funcs;
std::vector<
std::pair<std::vector<const QueryType::Def *>, DocumentSymbol *>>
types; types;
for (auto [sym, refcnt] : file->symbol2refcnt) { for (auto [sym, refcnt] : file->symbol2refcnt) {
if (refcnt <= 0 || !sym.extent.valid()) if (refcnt <= 0 || !sym.extent.valid())
@ -190,51 +195,53 @@ void MessageHandler::textDocument_documentSymbol(JsonReader &reader,
} }
if (!r.second) if (!r.second)
continue; continue;
std::vector<const void *> def_ptrs; withEntity(db, sym, [&, sym = sym](const auto &entity) {
SymbolKind kind = SymbolKind::Unknown;
withEntity(db, sym, [&](const auto &entity) {
auto *def = entity.anyDef(); auto *def = entity.anyDef();
using Def = std::remove_cv_t<std::remove_reference_t<decltype(*def)>>;
if (!def) if (!def)
return; return;
ds->name = def->name(false); ds->name = def->name(false);
ds->detail = def->detailed_name; ds->detail = def->detailed_name;
std::vector<const Def *> def_ptrs;
for (auto &def : entity.def) for (auto &def : entity.def)
if (def.file_id == file_id && !ignore(&def)) { if (def.file_id == file_id && !ignore(&def)) {
kind = ds->kind = def.kind; ds->kind = def.kind;
def_ptrs.push_back(&def); def_ptrs.push_back(&def);
} }
}); if (def_ptrs.empty() ||
if (def_ptrs.empty() || !(kind == SymbolKind::Namespace || allows(sym))) { !(ds->kind == SymbolKind::Namespace || allows(sym))) {
ds.reset(); ds.reset();
continue; return;
} }
if (sym.kind == Kind::Func)
if constexpr (std::is_same_v<Def, QueryFunc::Def>)
funcs.emplace_back(std::move(def_ptrs), ds.get()); funcs.emplace_back(std::move(def_ptrs), ds.get());
else if (sym.kind == Kind::Type) else if constexpr (std::is_same_v<Def, QueryType::Def>)
types.emplace_back(std::move(def_ptrs), ds.get()); types.emplace_back(std::move(def_ptrs), ds.get());
});
} }
for (auto &[def_ptrs, ds] : funcs) for (auto &[def_ptrs, ds] : funcs)
for (const void *def_ptr : def_ptrs) for (const auto *def_ptr : def_ptrs)
for (Usr usr1 : ((const QueryFunc::Def *)def_ptr)->vars) { for (Usr usr1 : def_ptr->vars) {
auto it = sym2ds.find(SymbolIdx{usr1, Kind::Var}); auto it = sym2ds.find(SymbolIdx{usr1, Kind::Var});
if (it != sym2ds.end() && it->second) if (it != sym2ds.end() && it->second)
ds->children.push_back(std::move(it->second)); ds->children.push_back(std::move(it->second));
} }
for (auto &[def_ptrs, ds] : types) for (auto &[def_ptrs, ds] : types)
for (const void *def_ptr : def_ptrs) { for (const auto *def_ptr : def_ptrs) {
auto *def = (const QueryType::Def *)def_ptr; for (Usr usr1 : def_ptr->funcs) {
for (Usr usr1 : def->funcs) {
auto it = sym2ds.find(SymbolIdx{usr1, Kind::Func}); auto it = sym2ds.find(SymbolIdx{usr1, Kind::Func});
if (it != sym2ds.end() && it->second) if (it != sym2ds.end() && it->second)
ds->children.push_back(std::move(it->second)); ds->children.push_back(std::move(it->second));
} }
for (Usr usr1 : def->types) { for (Usr usr1 : def_ptr->types) {
auto it = sym2ds.find(SymbolIdx{usr1, Kind::Type}); auto it = sym2ds.find(SymbolIdx{usr1, Kind::Type});
if (it != sym2ds.end() && it->second) if (it != sym2ds.end() && it->second)
ds->children.push_back(std::move(it->second)); ds->children.push_back(std::move(it->second));
} }
for (auto [usr1, _] : def->vars) { for (auto [usr1, _] : def_ptr->vars) {
auto it = sym2ds.find(SymbolIdx{usr1, Kind::Var}); auto it = sym2ds.find(SymbolIdx{usr1, Kind::Var});
if (it != sym2ds.end() && it->second) if (it != sym2ds.end() && it->second)
ds->children.push_back(std::move(it->second)); ds->children.push_back(std::move(it->second));