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

Remove [spell.start, spell.end) -> [spell.start, extent.end) hack

Browse Source
This commit is contained in:
Fangrui Song 2018-09-16 11:29:48 -07:00
parent 56c6ec43df
commit 34c1ebcefd
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/messages/textDocument_definition.cc
View File

@ -43,7 +43,7 @@ std::vector<Use> GetNonDefDeclarationTargets(DB *db, SymbolRef sym) {
switch (sym.kind) { switch (sym.kind) {
case SymbolKind::Var: { case SymbolKind::Var: {
std::vector<Use> ret = GetNonDefDeclarations(db, sym); std::vector<Use> ret = GetNonDefDeclarations(db, sym);
// If there is no declaration, jump the its type. // If there is no declaration, jump to its type.
if (ret.empty()) { if (ret.empty()) {
for (auto &def : db->GetVar(sym).def) for (auto &def : db->GetVar(sym).def)
if (def.type) { if (def.type) {
@ -76,44 +76,45 @@ struct Handler_TextDocumentDefinition
out.id = request->id; out.id = request->id;
Maybe<Range> range; Maybe<Range> range;
SymbolKind kind;
Maybe<Use> on_def; Maybe<Use> on_def;
WorkingFile *wfile = working_files->GetFileByFilename(file->def->path); WorkingFile *wfile = working_files->GetFileByFilename(file->def->path);
lsPosition &ls_pos = params.position; lsPosition &ls_pos = params.position;
for (SymbolRef sym : FindSymbolsAtLocation(wfile, file, ls_pos)) { for (SymbolRef sym : FindSymbolsAtLocation(wfile, file, ls_pos)) {
if (!range) if (!range) {
range = sym.range; range = sym.range;
else if (!(*range == sym.range)) kind = sym.kind;
} else if (!(sym.range == *range && sym.kind == kind)) {
break; break;
}
// Found symbol. Return definition. // Found symbol. Return definition.
// Special cases which are handled: // Special cases which are handled:
// - symbol has declaration but no definition (ie, pure virtual) // - symbol has declaration but no definition (ie, pure virtual)
// - start at spelling but end at extent for better mouse tooltip
// - goto declaration while in definition of recursive type // - goto declaration while in definition of recursive type
std::vector<Use> uses; std::vector<Use> uses;
EachEntityDef(db, sym, [&](const auto &def) { EachEntityDef(db, sym, [&](const auto &def) {
if (def.spell && def.extent) { if (def.spell) {
Use spell = *def.spell; Use spell = *def.spell;
// If on a definition, clear |uses| to find declarations below.
if (spell.file_id == file_id && if (spell.file_id == file_id &&
spell.range.Contains(ls_pos.line, ls_pos.character)) { spell.range.Contains(ls_pos.line, ls_pos.character)) {
on_def = spell; on_def = spell;
uses.clear(); uses.clear();
return false; return false;
} }
// We use spelling start and extent end because this causes vscode
// to highlight the entire definition when previewing / hoving with
// the mouse.
spell.range.end = def.extent->range.end;
uses.push_back(spell); uses.push_back(spell);
} }
return true; return true;
}); });
// |uses| is empty if on a declaration/definition, otherwise it includes
// all declarations/definitions.
if (uses.empty()) { if (uses.empty()) {
// The symbol has no definition or the cursor is on a definition. for (Use use : GetNonDefDeclarationTargets(db, sym))
uses = GetNonDefDeclarationTargets(db, sym); if (!(use.file_id == file_id &&
use.range.Contains(ls_pos.line, ls_pos.character)))
uses.push_back(use);
// There is no declaration but the cursor is on a definition. // There is no declaration but the cursor is on a definition.
if (uses.empty() && on_def) if (uses.empty() && on_def)
uses.push_back(*on_def); uses.push_back(*on_def);