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

Fix goto definition on pure virtual methods

Browse Source
This commit is contained in:
Jacob Dufault 2017-04-11 23:41:19 -07:00
parent e32adb1786
commit 33c91de4c0
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/command_line.cc
View File

@ -40,6 +40,11 @@ const int kNumIndexers = 8 - 1;
const int kQueueSizeBytes = 1024 * 8; const int kQueueSizeBytes = 1024 * 8;
const int kMaxWorkspaceSearchResults = 1000; const int kMaxWorkspaceSearchResults = 1000;
void PushBack(NonElidedVector<lsLocation>* result, optional<lsLocation> location) {
if (location)
result->push_back(*location);
}
QueryableFile* FindFile(QueryableDatabase* db, const std::string& filename, QueryFileId* file_id) { QueryableFile* FindFile(QueryableDatabase* db, const std::string& filename, QueryFileId* file_id) {
auto it = db->usr_to_symbol.find(filename); auto it = db->usr_to_symbol.find(filename);
if (it != db->usr_to_symbol.end()) { if (it != db->usr_to_symbol.end()) {
@ -839,21 +844,25 @@ void QueryDbMainLoop(
if (ref.loc.range.Contains(target_line, target_column)) { if (ref.loc.range.Contains(target_line, target_column)) {
// Found symbol. Return definition. // Found symbol. Return definition.
// Special cases which are handled:
// - 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
optional<QueryableLocation> definition_spelling = GetDefinitionSpellingOfSymbol(db, ref.idx); optional<QueryableLocation> def_loc = GetDefinitionSpellingOfSymbol(db, ref.idx);
if (!definition_spelling)
break;
// We use spelling start and extent end because this causes vscode // We use spelling start and extent end because this causes vscode
// to highlight the entire definition when previewing / hoving with // to highlight the entire definition when previewing / hoving with
// the mouse. // the mouse.
optional<QueryableLocation> extent = GetDefinitionExtentOfSymbol(db, ref.idx); optional<QueryableLocation> def_extent = GetDefinitionExtentOfSymbol(db, ref.idx);
if (extent) if (def_loc && def_extent)
definition_spelling->range.end = extent->range.end; def_loc->range.end = def_extent->range.end;
// If the cursor is currently at or in the definition we should goto the declaration if possible. // If the cursor is currently at or in the definition we should goto the declaration if possible.
if (definition_spelling->path == file_id && definition_spelling->range.Contains(target_line, target_column)) { // We also want to use delcarations if we're pointing to, ie, a pure virtual function which has
// no definition.
if (!def_loc || (def_loc->path == file_id &&
def_loc->range.Contains(target_line, target_column))) {
// Goto declaration. // Goto declaration.
std::vector<QueryableLocation> declarations = GetDeclarationsOfSymbolForGotoDefinition(db, ref.idx); std::vector<QueryableLocation> declarations = GetDeclarationsOfSymbolForGotoDefinition(db, ref.idx);
@ -862,18 +871,13 @@ void QueryDbMainLoop(
if (ls_declaration) if (ls_declaration)
response.result.push_back(*ls_declaration); response.result.push_back(*ls_declaration);
} }
// We found some declarations. Break so we don't add the definition location.
if (!response.result.empty()) if (!response.result.empty())
break; break;
} }
if (def_loc)
// Goto definition. PushBack(&response.result, GetLsLocation(db, working_files, *def_loc));
optional<lsLocation> ls_location = GetLsLocation(db, working_files, definition_spelling.value());
if (ls_location)
response.result.push_back(*ls_location);
break; break;
} }
} }