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

Remove definition_spelling from uses in IndexVar

Browse Source 
Instead, specify `include_decl = true` in GetUsesOfSymbol
This commit is contained in:
Fangrui Song 2018-01-26 17:51:33 -08:00
parent 37809def7c
commit 6b3673a438
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/indexer.cc
View File

@ -1432,8 +1432,8 @@ void OnIndexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) {
var->def.definition_extent = decl_cursor.get_extent(); var->def.definition_extent = decl_cursor.get_extent();
} else { } else {
var->def.declaration = decl_spell; var->def.declaration = decl_spell;
UniqueAdd(var->uses, decl_spell);
} }
UniqueAdd(var->uses, decl_spell);
AddDeclInitializerUsages(db, decl_cursor); AddDeclInitializerUsages(db, decl_cursor);
var = db->Resolve(var_id); var = db->Resolve(var_id);
@ -1829,7 +1829,6 @@ void OnIndexReference(CXClientData client_data, const CXIdxEntityRefInfo* ref) {
var->def.short_name = referenced.get_spelling(); var->def.short_name = referenced.get_spelling();
SetVarDetail(var, referenced, nullptr, true, db, param); SetVarDetail(var, referenced, nullptr, true, db, param);
var->def.kind = ClangSymbolKind::Parameter; var->def.kind = ClangSymbolKind::Parameter;
UniqueAdd(var->uses, referenced.get_spelling_range());
} }
} }
UniqueAdd(var->uses, loc); UniqueAdd(var->uses, loc);

5
src/query_utils.cc
View File

@ -202,7 +202,10 @@ std::vector<QueryLocation> GetUsesOfSymbol(QueryDatabase* db,
} }
case SymbolKind::Var: { case SymbolKind::Var: {
QueryVar& var = db->vars[symbol.idx]; QueryVar& var = db->vars[symbol.idx];
return var.uses; std::vector<QueryLocation> ret = var.uses;
if (include_decl && var.def && var.def->definition_spelling)
ret.push_back(*var.def->definition_spelling);
return ret;
} }
case SymbolKind::File: case SymbolKind::File:
case SymbolKind::Invalid: { case SymbolKind::Invalid: {