Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-28 18:41:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add all to textDocument/documentSymbol

Browse Source
This commit is contained in:
Fangrui Song 2018-07-01 00:35:41 -07:00
parent 7198db1777
commit 9852e618cd
1 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/messages/text_document_document_symbol.cc
View File

@ -9,8 +9,9 @@ MethodType kMethodType = "textDocument/documentSymbol";
struct lsDocumentSymbolParams { struct lsDocumentSymbolParams {
lsTextDocumentIdentifier textDocument; lsTextDocumentIdentifier textDocument;
bool all = false;
}; };
MAKE_REFLECT_STRUCT(lsDocumentSymbolParams, textDocument); MAKE_REFLECT_STRUCT(lsDocumentSymbolParams, textDocument, all);
struct In_TextDocumentDocumentSymbol : public RequestInMessage { struct In_TextDocumentDocumentSymbol : public RequestInMessage {
MethodType GetMethodType() const override { return kMethodType; } MethodType GetMethodType() const override { return kMethodType; }
@ -30,29 +31,37 @@ struct Handler_TextDocumentDocumentSymbol
: BaseMessageHandler<In_TextDocumentDocumentSymbol> { : BaseMessageHandler<In_TextDocumentDocumentSymbol> {
MethodType GetMethodType() const override { return kMethodType; } MethodType GetMethodType() const override { return kMethodType; }
void Run(In_TextDocumentDocumentSymbol* request) override { void Run(In_TextDocumentDocumentSymbol* request) override {
auto& params = request->params;
Out_TextDocumentDocumentSymbol out; Out_TextDocumentDocumentSymbol out;
out.id = request->id; out.id = request->id;
QueryFile* file; QueryFile* file;
int file_id; int file_id;
if (!FindFileOrFail(db, project, request->id, if (!FindFileOrFail(db, project, request->id,
request->params.textDocument.uri.GetPath(), &file, params.textDocument.uri.GetPath(), &file, &file_id))
&file_id)) {
return; return;
}
for (SymbolRef sym : file->def->outline) { if (params.all) {
std::optional<lsSymbolInformation> info = for (SymbolRef sym : file->def->all_symbols)
GetSymbolInfo(db, working_files, sym, false); if (std::optional<lsSymbolInformation> info =
if (!info) GetSymbolInfo(db, working_files, sym, false)) {
continue; if (std::optional<lsLocation> location = GetLsLocation(
db, working_files,
Use{{sym.range, sym.usr, sym.kind, sym.role}, file_id})) {
info->location = *location;
out.result.push_back(*info);
}
}
} else {
for (SymbolRef sym : file->def->outline)
if (std::optional<lsSymbolInformation> info =
GetSymbolInfo(db, working_files, sym, false)) {
if (sym.kind == SymbolKind::Var) { if (sym.kind == SymbolKind::Var) {
QueryVar& var = db->GetVar(sym); QueryVar& var = db->GetVar(sym);
auto* def = var.AnyDef(); auto* def = var.AnyDef();
if (!def || !def->spell || def->is_local()) if (!def || !def->spell || def->is_local())
continue; continue;
} }
if (std::optional<lsLocation> location = GetLsLocation( if (std::optional<lsLocation> location = GetLsLocation(
db, working_files, db, working_files,
Use{{sym.range, sym.usr, sym.kind, sym.role}, file_id})) { Use{{sym.range, sym.usr, sym.kind, sym.role}, file_id})) {
@ -60,6 +69,7 @@ struct Handler_TextDocumentDocumentSymbol
out.result.push_back(*info); out.result.push_back(*info);
} }
} }
}
pipeline::WriteStdout(kMethodType, out); pipeline::WriteStdout(kMethodType, out);
} }