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

Simplify GetDefinitionSpellingOfSymbol

Browse Source
This commit is contained in:
Fangrui Song 2018-02-13 12:15:31 -08:00
parent 273b670c0d
commit a1e1d115bf
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/messages/text_document_code_lens.cc
View File

@ -216,8 +216,8 @@ struct TextDocumentCodeLensHandler
// "Base" // "Base"
if (func.def->base.size() == 1) { if (func.def->base.size() == 1) {
Maybe<Use> base_loc = Maybe<Use> base_loc = GetDefinitionSpellingOfSymbol(
GetDefinitionSpellingOfSymbol(db, func.def->base[0]); db, SymbolIdx{func.def->base[0], SymbolKind::Func});
if (base_loc) { if (base_loc) {
optional<lsLocation> ls_base = optional<lsLocation> ls_base =
GetLsLocation(db, working_files, *base_loc); GetLsLocation(db, working_files, *base_loc);

12
src/query_utils.cc
View File

@ -18,14 +18,6 @@ int ComputeRangeSize(const Range& range) {
} // namespace } // namespace
Maybe<Use> GetDefinitionSpellingOfSymbol(QueryDatabase* db,
QueryFuncId id) {
QueryFunc& func = db->funcs[id.id];
if (func.def)
return func.def->spell;
return nullopt;
}
Maybe<Use> GetDefinitionSpellingOfSymbol(QueryDatabase* db, Maybe<Use> GetDefinitionSpellingOfSymbol(QueryDatabase* db,
SymbolIdx sym) { SymbolIdx sym) {
switch (sym.kind) { switch (sym.kind) {
@ -48,11 +40,11 @@ Maybe<Use> GetDefinitionSpellingOfSymbol(QueryDatabase* db,
break; break;
} }
case SymbolKind::File: case SymbolKind::File:
case SymbolKind::Invalid: { break;
case SymbolKind::Invalid:
assert(false && "unexpected"); assert(false && "unexpected");
break; break;
} }
}
return nullopt; return nullopt;
} }

2
src/query_utils.h
View File

@ -7,8 +7,6 @@
#include <optional.h> #include <optional.h>
Maybe<Use> GetDefinitionSpellingOfSymbol(QueryDatabase* db,
QueryFuncId id);
Maybe<Use> GetDefinitionSpellingOfSymbol(QueryDatabase* db, Maybe<Use> GetDefinitionSpellingOfSymbol(QueryDatabase* db,
SymbolIdx sym); SymbolIdx sym);
Maybe<Use> GetDefinitionExtentOfSymbol(QueryDatabase* db, SymbolIdx sym); Maybe<Use> GetDefinitionExtentOfSymbol(QueryDatabase* db, SymbolIdx sym);