Skip to content

remove document symbols from macro expansion #794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

remove document symbols from macro expansion #794

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5208eb6
remove document symbols from macro expansion
FederAndInk May 9, 2021
0b57c95
remove part of macro expansion from ignore function
FederAndInk May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 38 additions & 9 deletions src/messages/textDocument_document.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,38 @@ void reflect(JsonWriter &vis, std::unique_ptr<DocumentSymbol> &v) {
reflect(vis, *v);
}

template <typename Def> bool ignore(const Def *def) { return false; }
template <> bool ignore(const QueryType::Def *def) {
return !def || def->kind == SymbolKind::TypeParameter;
template <typename Def>
bool isPartOfMacroExpansion(DB *db, WorkingFile *wf, QueryFile *file,
Def const *def) noexcept {
if (def->kind == SymbolKind::Macro) {
return false;
}
auto range = getLsRange(wf, def->spell->range);
if (range) {
auto syms = findSymbolsAtLocation(wf, file, range->start, true);

auto end = std::end(syms);
return std::find_if(std::begin(syms), end, [db](SymbolRef sym) {
return getSymbolKind(db, sym) == SymbolKind::Macro;
}) != end;
}
return false;
}

template <typename Def>
bool ignore(DB *db, WorkingFile *wf, QueryFile *file, const Def *def) {
return isPartOfMacroExpansion(db, wf, file, def);
}
template <>
bool ignore(DB *db, WorkingFile *wf, QueryFile *file,
const QueryType::Def *def) {
return !def || def->kind == SymbolKind::TypeParameter ||
isPartOfMacroExpansion(db, wf, file, def);
}
template <> bool ignore(const QueryVar::Def *def) {
return !def || def->is_local();
template <>
bool ignore(DB *db, WorkingFile *wf, QueryFile *file,
const QueryVar::Def *def) {
return !def || def->is_local() || isPartOfMacroExpansion(db, wf, file, def);
}
} // namespace

Expand Down Expand Up @@ -183,15 +209,16 @@ void MessageHandler::textDocument_documentSymbol(JsonReader &reader,
range1 && range1->includes(*range))
ds->range = *range1;
}
withEntity(db, sym, [&](const auto &entity) {
withEntity(db, sym, [&, wf = wf, file = file](const auto &entity) {
const auto *def = entity.anyDef();
if (!def)
return;
ds->name = def->name(false);
ds->detail = def->detailed_name;
ds->kind = def->kind;

if (!ignore(def) && (ds->kind == SymbolKind::Namespace || allows(sym))) {
if (!ignore(db, wf, file, def) &&
(ds->kind == SymbolKind::Namespace || allows(sym))) {
// Drop scopes which are before selectionRange.start. In
// `int i, j, k;`, the scope of i will be ended by j.
while (!scopes.empty() &&
Expand All @@ -214,8 +241,10 @@ void MessageHandler::textDocument_documentSymbol(JsonReader &reader,
continue;
if (std::optional<SymbolInformation> info =
getSymbolInfo(db, sym, false)) {
if ((sym.kind == Kind::Type && ignore(db->getType(sym).anyDef())) ||
(sym.kind == Kind::Var && ignore(db->getVar(sym).anyDef())))
if ((sym.kind == Kind::Type &&
ignore(db, wf, file, db->getType(sym).anyDef())) ||
(sym.kind == Kind::Var &&
ignore(db, wf, file, db->getVar(sym).anyDef())))
continue;
if (auto loc = getLsLocation(db, wfiles, sym, file_id)) {
info->location = *loc;
Expand Down