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

remove pointer in DocumentSymbol.children and useless things

Browse Source
This commit is contained in:
Ludovic Jozeau 2020-07-20 15:02:19 +02:00
parent 197c9dc049
commit 54a38bcc74
No known key found for this signature in database
GPG Key ID: 881AEC6AAD9BEA6C
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/messages/textDocument_document.cc
View File

@ -113,14 +113,10 @@ struct DocumentSymbol {
SymbolKind kind; SymbolKind kind;
lsRange range; lsRange range;
lsRange selectionRange; lsRange selectionRange;
std::vector<std::unique_ptr<DocumentSymbol>> children; std::vector<DocumentSymbol> children;
}; };
void reflect(JsonWriter &vis, std::unique_ptr<DocumentSymbol> &v);
REFLECT_STRUCT(DocumentSymbol, name, detail, kind, range, selectionRange, REFLECT_STRUCT(DocumentSymbol, name, detail, kind, range, selectionRange,
children); children);
void reflect(JsonWriter &vis, std::unique_ptr<DocumentSymbol> &v) {
reflect(vis, *v);
}
template <typename Def> bool ignore(const Def *def) { return false; } template <typename Def> bool ignore(const Def *def) { return false; }
template <> bool ignore(const QueryType::Def *def) { template <> bool ignore(const QueryType::Def *def) {
@ -129,16 +125,6 @@ template <> bool ignore(const QueryType::Def *def) {
template <> bool ignore(const QueryVar::Def *def) { template <> bool ignore(const QueryVar::Def *def) {
return !def || def->is_local(); return !def || def->is_local();
} }
void uniquify(std::vector<std::unique_ptr<DocumentSymbol>> &cs) {
std::sort(cs.begin(), cs.end(),
[](auto &l, auto &r) { return l->range < r->range; });
cs.erase(std::unique(cs.begin(), cs.end(),
[](auto &l, auto &r) { return l->range == r->range; }),
cs.end());
for (auto &c : cs)
uniquify(c->children);
}
} // namespace } // namespace
void MessageHandler::textDocument_documentSymbol(JsonReader &reader, void MessageHandler::textDocument_documentSymbol(JsonReader &reader,
@ -189,46 +175,45 @@ void MessageHandler::textDocument_documentSymbol(JsonReader &reader,
std::push_heap(std::begin(syms), std::end(syms), sym_cmp); std::push_heap(std::begin(syms), std::end(syms), sym_cmp);
} }
std::vector<std::unique_ptr<DocumentSymbol>> result; std::vector<DocumentSymbol> result;
std::stack<DocumentSymbol *> indent; std::stack<DocumentSymbol *> indent;
while (!syms.empty()) { while (!syms.empty()) {
std::pop_heap(std::begin(syms), std::end(syms), sym_cmp); std::pop_heap(std::begin(syms), std::end(syms), sym_cmp);
auto sym = syms.back(); auto sym = syms.back();
syms.pop_back(); syms.pop_back();
std::unique_ptr<DocumentSymbol> ds = std::make_unique<DocumentSymbol>(); DocumentSymbol ds;
if (auto range = getLsRange(wf, sym.range)) { if (auto range = getLsRange(wf, sym.range)) {
ds->selectionRange = *range; ds.selectionRange = *range;
ds->range = ds->selectionRange; ds.range = ds.selectionRange;
// For a macro expansion, M(name), we may use `M` for extent and // For a macro expansion, M(name), we may use `M` for extent and
// `name` for spell, do the check as selectionRange must be a subrange // `name` for spell, do the check as selectionRange must be a subrange
// of range. // of range.
if (sym.extent.valid()) if (sym.extent.valid())
if (auto range1 = getLsRange(wf, sym.extent); if (auto range1 = getLsRange(wf, sym.extent);
range1 && range1->includes(*range)) range1 && range1->includes(*range))
ds->range = *range1; ds.range = *range1;
} }
withEntity(db, sym, [&, sym = sym](const auto &entity) { withEntity(db, sym, [&, sym = sym](const auto &entity) {
auto const *def = entity.anyDef(); auto const *def = entity.anyDef();
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;
ds->kind = def->kind; ds.kind = def->kind;
if (!ignore(def) && if (!ignore(def) && (ds.kind == SymbolKind::Namespace || allows(sym))) {
(ds->kind == SymbolKind::Namespace || allows(sym))) {
// drop symbols that are behind the current one // drop symbols that are behind the current one
while (!indent.empty() && indent.top()->range.end < ds->range.start) { while (!indent.empty() && indent.top()->range.end < ds.range.start) {
indent.pop(); indent.pop();
} }
auto *cur_ds = ds.get();
if (indent.empty()) { if (indent.empty()) {
result.push_back(std::move(ds)); result.push_back(std::move(ds));
indent.push(&result.back());
} else { } else {
indent.top()->children.push_back(std::move(ds)); indent.top()->children.push_back(std::move(ds));
indent.push(&indent.top()->children.back());
} }
indent.push(cur_ds);
} }
}); });
} }