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

Index variable initializer

Browse Source
This commit is contained in:
Fangrui Song 2018-01-16 20:30:45 -08:00
parent a52d4ac61d
commit bf9150f58a
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/indexer.cc
View File

@ -421,23 +421,6 @@ void SetVarDetail(IndexVar* var,
semanticContainer semanticContainer
? param->ns.QualifiedName(semanticContainer, def.short_name) ? param->ns.QualifiedName(semanticContainer, def.short_name)
: def.short_name; : def.short_name;
// TODO Initial values of variables are useful. For now, enable it for const
// qualified types.
if (clang_isConstQualifiedType(cx_type)) {
Range extent = cursor.get_extent();
const FileContents& fc = param->file_contents[db->path];
optional<int> extent_start = fc.ToOffset(extent.start),
extent_end = fc.ToOffset(extent.end);
if (extent_start && extent_end) {
Range spell = cursor.get_spelling_range();
optional<int> spell_start = fc.ToOffset(spell.start),
spell_end = fc.ToOffset(spell.end);
def.hover =
fc.content.substr(*extent_start, *spell_start - *extent_start) +
qualified_name +
fc.content.substr(*spell_end, *extent_end - *spell_end);
}
}
if (cursor.get_kind() == CXCursor_EnumConstantDecl) { if (cursor.get_kind() == CXCursor_EnumConstantDecl) {
CXType enum_type = clang_getEnumDeclIntegerType(semanticContainer->cursor); CXType enum_type = clang_getEnumDeclIntegerType(semanticContainer->cursor);
@ -449,11 +432,17 @@ void SetVarDetail(IndexVar* var,
enum_type.kind == CXType_ULongLong) enum_type.kind == CXType_ULongLong)
hover += std::to_string( hover += std::to_string(
clang_getEnumConstantDeclUnsignedValue(cursor.cx_cursor)); clang_getEnumConstantDeclUnsignedValue(cursor.cx_cursor));
def.hover = hover;
def.detailed_name = std::move(qualified_name); def.detailed_name = std::move(qualified_name);
def.hover = hover;
} else { } else {
def.detailed_name = std::move(type_name); def.detailed_name = std::move(type_name);
ConcatTypeAndName(def.detailed_name, qualified_name); ConcatTypeAndName(def.detailed_name, qualified_name);
const FileContents& fc = param->file_contents[db->path];
optional<int> spell_end = fc.ToOffset(cursor.get_spelling_range().end);
optional<int> extent_end = fc.ToOffset(cursor.get_extent().end);
if (extent_end && *spell_end < *extent_end)
def.hover = def.detailed_name +
fc.content.substr(*spell_end, *extent_end - *spell_end);
} }
if (is_first_seen) { if (is_first_seen) {
@ -1445,6 +1434,7 @@ void OnIndexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) {
if (decl->entityInfo->templateKind == CXIdxEntity_Template) { if (decl->entityInfo->templateKind == CXIdxEntity_Template) {
TemplateVisitorData data; TemplateVisitorData data;
data.db = db; data.db = db;
data.param = param;
data.container = decl_cursor; data.container = decl_cursor;
decl_cursor.VisitChildren(&TemplateVisitor, &data); decl_cursor.VisitChildren(&TemplateVisitor, &data);
// TemplateVisitor calls ToFuncId which invalidates func // TemplateVisitor calls ToFuncId which invalidates func