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

[indexer] Display declaration line for typedef/using. fix #141

Browse Source 
GetDocumentContentInRange calls clang_tokenize, which is not easy to
handle multi-line declarations. Only display declaration lines for
one-line `typedef`/`using` now.
This commit is contained in:
Fangrui Song 2017-12-18 17:21:31 -08:00
parent 9b9740f421
commit 8897bcc54d
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/indexer.cc
View File

@ -1240,13 +1240,29 @@ void OnIndexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) {
if (alias_of) if (alias_of)
type->def.alias_of = alias_of.value(); type->def.alias_of = alias_of.value();
type->def.short_name = decl->entityInfo->name; type->def.short_name = decl->entityInfo->name;
Range spell = ResolveSpelling(decl->cursor);
Range extent = ResolveExtent(decl->cursor);
type->def.definition_spelling = spell;
type->def.definition_extent = extent;
type->def.detailed_name = type->def.detailed_name =
ns->QualifiedName(decl->semanticContainer, type->def.short_name); ns->QualifiedName(decl->semanticContainer, type->def.short_name);
// For single line Typedef/CXXTypeAlias, display the declaration line,
// with spelling name replaced with qualified name.
// TODO Think how to display multi-line declaration like `typedef struct { ... } foo;`
if (extent.start.line == extent.end.line) {
std::string decl_text = GetDocumentContentInRange(
param->tu->cx_tu, clang_getCursorExtent(decl->cursor));
if (decl_text.size() == extent.end.column - extent.start.column) {
type->def.detailed_name =
decl_text.substr(0, spell.start.column - extent.start.column) +
type->def.detailed_name +
decl_text.substr(spell.end.column - extent.start.column);
}
}
type->def.definition_spelling = ResolveSpelling(decl->cursor);
type->def.definition_extent = ResolveExtent(decl->cursor);
UniqueAdd(type->uses, decl_loc_spelling); UniqueAdd(type->uses, decl_loc_spelling);
break; break;
} }