Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-27 10:02:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add kind to $ccls/member and iterate all QueryType::def

Browse Source 
kind:2 => member functions
kind:3 => nested classes / namespace members
This commit is contained in:
Fangrui Song 2018-09-22 22:55:17 -07:00
parent 176039fe35
commit 562207bf96
2 changed files with 106 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -7,12 +7,14 @@ ccls, which originates from [cquery](https://github.com/cquery-project/cquery),
* code completion (with both signature help and snippets) * code completion (with both signature help and snippets)
* [definition](src/messages/textDocument_definition.cc)/[references](src/messages/textDcument_references.cc), and other cross references * [definition](src/messages/textDocument_definition.cc)/[references](src/messages/textDcument_references.cc), and other cross references
* hierarchies: [call (caller/callee) hierarchy](src/messages/ccls_callHierarchy.cc), [inheritance (base/derived) hierarchy](src/messages/ccls_inheritanceHierarchy.cc), [member hierarchy](src/messages/ccls_memberHierarchy.cc) * cross reference extensions: `$ccls/call` `$ccls/inheritance` `$ccls/member` `$ccls/vars` ...
* [symbol rename](src/messages/text_documentRename.cc) * hierarchies: [call (caller/callee) hierarchy](src/messages/ccls_call.cc), [inheritance (base/derived) hierarchy](src/messages/ccls_inheritance.cc), [member hierarchy](src/messages/ccls_member.cc)
* [symbol rename](src/messages/textDocument_rename.cc)
* [document symbols](src/messages/textDocument_documentSymbol.cc) and approximate search of [workspace symbol](src/messages/workspace_symbol.cc) * [document symbols](src/messages/textDocument_documentSymbol.cc) and approximate search of [workspace symbol](src/messages/workspace_symbol.cc)
* [hover information](src/messages/textDocument_hover.cc) * [hover information](src/messages/textDocument_hover.cc)
* diagnostics and code actions (clang FixIts) * diagnostics and code actions (clang FixIts)
* semantic highlighting and preprocessor skipped regions * semantic highlighting and preprocessor skipped regions
* semantic navigation: `$ccls/navigate`
It has a global view of the code base and support a lot of cross reference features, see [wiki/FAQ](../../wiki/FAQ). It has a global view of the code base and support a lot of cross reference features, see [wiki/FAQ](../../wiki/FAQ).
It starts indexing the whole project (including subprojects if exist) parallelly when you open the first file, while the main thread can serve requests before the indexing is complete. It starts indexing the whole project (including subprojects if exist) parallelly when you open the first file, while the main thread can serve requests before the indexing is complete.

87
src/messages/ccls_member.cc
View File

@ -8,6 +8,7 @@
using namespace ccls; using namespace ccls;
#include <clang/AST/Type.h> #include <clang/AST/Type.h>
#include <llvm/ADT/DenseSet.h>
using namespace clang; using namespace clang;
#include <unordered_set> #include <unordered_set>
@ -30,12 +31,15 @@ struct In_CclsMember : public RequestInMessage {
bool qualified = false; bool qualified = false;
int levels = 1; int levels = 1;
// If SymbolKind::Func and the point is at a type, list member functions
// instead of member variables.
SymbolKind kind = SymbolKind::Var;
bool hierarchy = false; bool hierarchy = false;
} params; } params;
}; };
MAKE_REFLECT_STRUCT(In_CclsMember::Params, textDocument, position, id, MAKE_REFLECT_STRUCT(In_CclsMember::Params, textDocument, position, id,
qualified, levels, hierarchy); qualified, levels, kind, hierarchy);
MAKE_REFLECT_STRUCT(In_CclsMember, id, params); MAKE_REFLECT_STRUCT(In_CclsMember, id, params);
REGISTER_IN_MESSAGE(In_CclsMember); REGISTER_IN_MESSAGE(In_CclsMember);
@ -61,7 +65,7 @@ MAKE_REFLECT_STRUCT_MANDATORY_OPTIONAL(Out_CclsMember, jsonrpc, id,
result); result);
bool Expand(MessageHandler *m, Out_CclsMember::Entry *entry, bool Expand(MessageHandler *m, Out_CclsMember::Entry *entry,
bool qualified, int levels); bool qualified, int levels, SymbolKind memberKind);
// Add a field to |entry| which is a Func/Type. // Add a field to |entry| which is a Func/Type.
void DoField(MessageHandler *m, Out_CclsMember::Entry *entry, void DoField(MessageHandler *m, Out_CclsMember::Entry *entry,
@ -96,7 +100,7 @@ void DoField(MessageHandler *m, Out_CclsMember::Entry *entry,
if (def1->type) { if (def1->type) {
entry1.id = std::to_string(def1->type); entry1.id = std::to_string(def1->type);
entry1.usr = def1->type; entry1.usr = def1->type;
if (Expand(m, &entry1, qualified, levels)) if (Expand(m, &entry1, qualified, levels, SymbolKind::Var))
entry->children.push_back(std::move(entry1)); entry->children.push_back(std::move(entry1));
} else { } else {
entry1.id = "0"; entry1.id = "0";
@ -107,13 +111,13 @@ void DoField(MessageHandler *m, Out_CclsMember::Entry *entry,
// Expand a type node by adding members recursively to it. // Expand a type node by adding members recursively to it.
bool Expand(MessageHandler *m, Out_CclsMember::Entry *entry, bool Expand(MessageHandler *m, Out_CclsMember::Entry *entry,
bool qualified, int levels) { bool qualified, int levels, SymbolKind memberKind) {
if (0 < entry->usr && entry->usr <= BuiltinType::LastKind) { if (0 < entry->usr && entry->usr <= BuiltinType::LastKind) {
entry->name = ClangBuiltinTypeName(int(entry->usr)); entry->name = ClangBuiltinTypeName(int(entry->usr));
return true; return true;
} }
const QueryType &type = m->db->Type(entry->usr); const QueryType *type = &m->db->Type(entry->usr);
const QueryType::Def *def = type.AnyDef(); const QueryType::Def *def = type->AnyDef();
// builtin types have no declaration and empty |qualified|. // builtin types have no declaration and empty |qualified|.
if (!def) if (!def)
return false; return false;
@ -121,12 +125,13 @@ bool Expand(MessageHandler *m, Out_CclsMember::Entry *entry,
std::unordered_set<Usr> seen; std::unordered_set<Usr> seen;
if (levels > 0) { if (levels > 0) {
std::vector<const QueryType *> stack; std::vector<const QueryType *> stack;
seen.insert(type.usr); seen.insert(type->usr);
stack.push_back(&type); stack.push_back(type);
while (stack.size()) { while (stack.size()) {
const auto *def = stack.back()->AnyDef(); type = stack.back();
stack.pop_back(); stack.pop_back();
if (def) { const auto *def = type->AnyDef();
if (!def) continue;
for (Usr usr : def->bases) { for (Usr usr : def->bases) {
auto &type1 = m->db->Type(usr); auto &type1 = m->db->Type(usr);
if (type1.def.size()) { if (type1.def.size()) {
@ -153,21 +158,65 @@ bool Expand(MessageHandler *m, Out_CclsMember::Entry *entry,
} }
if (def1 && qualified) if (def1 && qualified)
entry1.fieldName = def1->detailed_name; entry1.fieldName = def1->detailed_name;
if (Expand(m, &entry1, qualified, levels - 1)) { if (Expand(m, &entry1, qualified, levels - 1, memberKind)) {
// For builtin types |name| is set. // For builtin types |name| is set.
if (entry1.fieldName.empty()) if (entry1.fieldName.empty())
entry1.fieldName = std::string(entry1.name); entry1.fieldName = std::string(entry1.name);
entry->children.push_back(std::move(entry1)); entry->children.push_back(std::move(entry1));
} }
} else if (memberKind == SymbolKind::Func) {
llvm::DenseSet<Usr, DenseMapInfoForUsr> seen1;
for (auto &def : type->def)
for (Usr usr : def.funcs)
if (seen1.insert(usr).second) {
QueryFunc &func1 = m->db->Func(usr);
if (const QueryFunc::Def *def1 = func1.AnyDef()) {
Out_CclsMember::Entry entry1;
entry1.fieldName = def1->Name(false);
if (def1->spell) {
if (auto loc =
GetLsLocation(m->db, m->working_files, *def1->spell))
entry1.location = *loc;
} else if (func1.declarations.size()) {
if (auto loc = GetLsLocation(m->db, m->working_files,
func1.declarations[0]))
entry1.location = *loc;
}
entry->children.push_back(std::move(entry1));
}
}
} else if (memberKind == SymbolKind::Type) {
llvm::DenseSet<Usr, DenseMapInfoForUsr> seen1;
for (auto &def : type->def)
for (Usr usr : def.types)
if (seen1.insert(usr).second) {
QueryType &type1 = m->db->Type(usr);
if (const QueryType::Def *def1 = type1.AnyDef()) {
Out_CclsMember::Entry entry1;
entry1.fieldName = def1->Name(false);
if (def1->spell) {
if (auto loc =
GetLsLocation(m->db, m->working_files, *def1->spell))
entry1.location = *loc;
} else if (type1.declarations.size()) {
if (auto loc = GetLsLocation(m->db, m->working_files,
type1.declarations[0]))
entry1.location = *loc;
}
entry->children.push_back(std::move(entry1));
}
}
} else { } else {
for (auto it : def->vars) { llvm::DenseSet<Usr, DenseMapInfoForUsr> seen1;
for (auto &def : type->def)
for (auto it : def.vars)
if (seen1.insert(it.first).second) {
QueryVar &var = m->db->Var(it.first); QueryVar &var = m->db->Var(it.first);
if (!var.def.empty()) if (!var.def.empty())
DoField(m, entry, var, it.second, qualified, levels - 1); DoField(m, entry, var, it.second, qualified, levels - 1);
} }
} }
} }
}
entry->numChildren = int(entry->children.size()); entry->numChildren = int(entry->children.size());
} else } else
entry->numChildren = def->alias_of ? 1 : int(def->vars.size()); entry->numChildren = def->alias_of ? 1 : int(def->vars.size());
@ -179,7 +228,7 @@ struct Handler_CclsMember
MethodType GetMethodType() const override { return kMethodType; } MethodType GetMethodType() const override { return kMethodType; }
std::optional<Out_CclsMember::Entry> std::optional<Out_CclsMember::Entry>
BuildInitial(SymbolKind kind, Usr root_usr, bool qualified, int levels) { BuildInitial(SymbolKind kind, Usr root_usr, bool qualified, int levels, SymbolKind memberKind) {
switch (kind) { switch (kind) {
default: default:
return {}; return {};
@ -216,7 +265,7 @@ struct Handler_CclsMember
GetLsLocation(db, working_files, *def->spell)) GetLsLocation(db, working_files, *def->spell))
entry.location = *loc; entry.location = *loc;
} }
Expand(this, &entry, qualified, levels); Expand(this, &entry, qualified, levels, memberKind);
return entry; return entry;
} }
} }
@ -238,7 +287,7 @@ struct Handler_CclsMember
entry.usr = params.usr; entry.usr = params.usr;
// entry.name is empty as it is known by the client. // entry.name is empty as it is known by the client.
if (db->HasType(entry.usr) && if (db->HasType(entry.usr) &&
Expand(this, &entry, params.qualified, params.levels)) Expand(this, &entry, params.qualified, params.levels, params.kind))
out.result = std::move(entry); out.result = std::move(entry);
} else { } else {
QueryFile *file; QueryFile *file;
@ -251,14 +300,14 @@ struct Handler_CclsMember
switch (sym.kind) { switch (sym.kind) {
case SymbolKind::Func: case SymbolKind::Func:
case SymbolKind::Type: case SymbolKind::Type:
out.result = out.result = BuildInitial(sym.kind, sym.usr, params.qualified,
BuildInitial(sym.kind, sym.usr, params.qualified, params.levels); params.levels, params.kind);
break; break;
case SymbolKind::Var: { case SymbolKind::Var: {
const QueryVar::Def *def = db->GetVar(sym).AnyDef(); const QueryVar::Def *def = db->GetVar(sym).AnyDef();
if (def && def->type) if (def && def->type)
out.result = BuildInitial(SymbolKind::Type, def->type, out.result = BuildInitial(SymbolKind::Type, def->type,
params.qualified, params.levels); params.qualified, params.levels, params.kind);
break; break;
} }
default: default: