Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-22 07:35:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

textDocument/hover: prefer definitions in the same file

Browse Source
This commit is contained in:
Fangrui Song 2018-08-19 13:11:47 -07:00
parent 82962e565b
commit 73e500bc97
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/messages/textDocument_hover.cc
View File

@ -6,38 +6,36 @@ using namespace ccls;
namespace { namespace {
MethodType kMethodType = "textDocument/hover"; MethodType kMethodType = "textDocument/hover";
// Find the comments for |sym|, if any.
std::optional<lsMarkedString> GetComments(DB *db, SymbolRef sym) {
std::optional<lsMarkedString> ret;
WithEntity(db, sym, [&](const auto &entity) {
if (const auto *def = entity.AnyDef())
if (def->comments[0]) {
lsMarkedString m;
m.value = def->comments;
ret = m;
}
});
return ret;
}
// Returns the hover or detailed name for `sym`, if any. // Returns the hover or detailed name for `sym`, if any.
std::optional<lsMarkedString> GetHoverOrName(DB *db, LanguageId lang, std::pair<std::optional<lsMarkedString>, std::optional<lsMarkedString>>
SymbolRef sym) { GetHover(DB *db, LanguageId lang, SymbolRef sym, int file_id) {
std::optional<lsMarkedString> ret; const char *comments = nullptr;
std::optional<lsMarkedString> ls_comments, hover;
WithEntity(db, sym, [&](const auto &entity) { WithEntity(db, sym, [&](const auto &entity) {
if (const auto *def = entity.AnyDef()) { std::remove_reference_t<decltype(entity.def[0])> *def = nullptr;
for (auto &d : entity.def) {
if (d.spell) {
comments = d.comments[0] ? d.comments : nullptr;
def = &d;
if (d.spell->file_id == file_id)
break;
}
}
if (def) {
lsMarkedString m; lsMarkedString m;
m.language = LanguageIdentifier(lang); m.language = LanguageIdentifier(lang);
if (def->hover[0]) { if (def->hover[0]) {
m.value = def->hover; m.value = def->hover;
ret = m; hover = m;
} else if (def->detailed_name[0]) { } else if (def->detailed_name[0]) {
m.value = def->detailed_name; m.value = def->detailed_name;
ret = m; hover = m;
} }
if (comments)
ls_comments = lsMarkedString{std::nullopt, comments};
} }
}); });
return ret; return {hover, ls_comments};
} }
struct In_TextDocumentHover : public RequestInMessage { struct In_TextDocumentHover : public RequestInMessage {
@ -83,9 +81,7 @@ struct Handler_TextDocumentHover : BaseMessageHandler<In_TextDocumentHover> {
if (!ls_range) if (!ls_range)
continue; continue;
std::optional<lsMarkedString> comments = GetComments(db, sym); auto[hover, comments] = GetHover(db, file->def->language, sym, file->id);
std::optional<lsMarkedString> hover =
GetHoverOrName(db, file->def->language, sym);
if (comments || hover) { if (comments || hover) {
out.result = Out_TextDocumentHover::Result(); out.result = Out_TextDocumentHover::Result();
out.result->range = *ls_range; out.result->range = *ls_range;