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

Add UseWithFileId to work around textDocument/definition targets that reside in unnamed namespaces

Browse Source
This commit is contained in:
Fangrui Song 2018-02-11 18:09:28 -08:00
parent a90dc25c5a
commit 2d6fd4e240
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/query_utils.cc
View File

@ -16,13 +16,19 @@ int ComputeRangeSize(const Range& range) {
return range.end.column - range.start.column; return range.end.column - range.start.column;
} }
Maybe<Use> UseWithFileId(Maybe<Use> use, QueryFileId file_id) {
if (!use)
return nullopt;
return Use(use->range, file_id, SymbolKind::File, use->role);
}
} // namespace } // namespace
Maybe<Use> GetDefinitionSpellingOfSymbol(QueryDatabase* db, Maybe<Use> GetDefinitionSpellingOfSymbol(QueryDatabase* db,
QueryFuncId id) { QueryFuncId id) {
QueryFunc& func = db->funcs[id.id]; QueryFunc& func = db->funcs[id.id];
if (func.def) if (func.def)
return func.def->spell; return UseWithFileId(func.def->spell, func.def->file);
return nullopt; return nullopt;
} }
@ -32,19 +38,19 @@ Maybe<Use> GetDefinitionSpellingOfSymbol(QueryDatabase* db,
case SymbolKind::Type: { case SymbolKind::Type: {
QueryType& type = db->GetType(sym); QueryType& type = db->GetType(sym);
if (type.def) if (type.def)
return type.def->spell; return UseWithFileId(type.def->spell, type.def->file);
break; break;
} }
case SymbolKind::Func: { case SymbolKind::Func: {
QueryFunc& func = db->GetFunc(sym); QueryFunc& func = db->GetFunc(sym);
if (func.def) if (func.def)
return func.def->spell; return UseWithFileId(func.def->spell, func.def->file);
break; break;
} }
case SymbolKind::Var: { case SymbolKind::Var: {
QueryVar& var = db->GetVar(sym); QueryVar& var = db->GetVar(sym);
if (var.def) if (var.def)
return var.def->spell; return UseWithFileId(var.def->spell, var.def->file);
break; break;
} }
case SymbolKind::File: case SymbolKind::File:
@ -61,19 +67,19 @@ Maybe<Use> GetDefinitionExtentOfSymbol(QueryDatabase* db, SymbolIdx sym) {
case SymbolKind::Type: { case SymbolKind::Type: {
QueryType& type = db->GetType(sym); QueryType& type = db->GetType(sym);
if (type.def) if (type.def)
return type.def->extent; return UseWithFileId(type.def->extent, type.def->file);
break; break;
} }
case SymbolKind::Func: { case SymbolKind::Func: {
QueryFunc& func = db->GetFunc(sym); QueryFunc& func = db->GetFunc(sym);
if (func.def) if (func.def)
return Use(*func.def->extent); return UseWithFileId(func.def->extent, func.def->file);
break; break;
} }
case SymbolKind::Var: { case SymbolKind::Var: {
QueryVar& var = db->GetVar(sym); QueryVar& var = db->GetVar(sym);
if (var.def) if (var.def)
return var.def->extent; return UseWithFileId(var.def->extent, var.def->file);
break; break;
} }
case SymbolKind::File: case SymbolKind::File:
@ -92,22 +98,22 @@ Maybe<QueryFileId> GetDeclarationFileForSymbol(QueryDatabase* db,
switch (sym.kind) { switch (sym.kind) {
case SymbolKind::Type: { case SymbolKind::Type: {
QueryType& type = db->GetType(sym); QueryType& type = db->GetType(sym);
if (type.def && type.def->spell) if (type.def)
return db->GetFileId(*type.def->spell); return type.def->file;
break; break;
} }
case SymbolKind::Func: { case SymbolKind::Func: {
QueryFunc& func = db->GetFunc(sym); QueryFunc& func = db->GetFunc(sym);
if (!func.declarations.empty()) if (!func.declarations.empty())
return db->GetFileId(func.declarations[0]); return db->GetFileId(func.declarations[0]);
if (func.def && func.def->spell) if (func.def)
return db->GetFileId(*func.def->spell); return func.def->file;
break; break;
} }
case SymbolKind::Var: { case SymbolKind::Var: {
QueryVar& var = db->GetVar(sym); QueryVar& var = db->GetVar(sym);
if (var.def && var.def->spell) if (var.def)
return db->GetFileId(*var.def->spell); return var.def->file;
break; break;
} }
case SymbolKind::File: case SymbolKind::File: