Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-03-30 13:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[template] Attribute template parameter references to the parameter declaration. Class templates still do not work

Browse Source
This commit is contained in:
Fangrui Song 2017-12-28 00:37:10 -08:00
parent cff432a223
commit 56135f615c
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/indexer.cc
View File

@ -1049,6 +1049,12 @@ ClangCursor::VisitResult TemplateVisitor(ClangCursor cursor,
if (ref_cursor.get_kind() == CXCursor_NonTypeTemplateParameter) { if (ref_cursor.get_kind() == CXCursor_NonTypeTemplateParameter) {
IndexVar* ref_index = IndexVar* ref_index =
data->db->Resolve(data->db->ToVarId(ref_cursor.get_usr())); data->db->Resolve(data->db->ToVarId(ref_cursor.get_usr()));
if (ref_index->def.short_name.empty()) {
ref_index->def.definition_spelling = ResolveSpelling(ref_cursor.cx_cursor);
ref_index->def.definition_extent = ResolveExtent(ref_cursor.cx_cursor);
ref_index->def.short_name = ref_cursor.get_spelling();
ref_index->def.detailed_name = ref_index->def.short_name;
}
UniqueAdd(ref_index->uses, ResolveSpelling(cursor.cx_cursor)); UniqueAdd(ref_index->uses, ResolveSpelling(cursor.cx_cursor));
} else } else
cursor.VisitChildren(&TemplateVisitor, data); cursor.VisitChildren(&TemplateVisitor, data);
@ -1081,8 +1087,20 @@ ClangCursor::VisitResult TemplateVisitor(ClangCursor cursor,
if (ref_cursor.get_kind() == CXCursor_TemplateTypeParameter) { if (ref_cursor.get_kind() == CXCursor_TemplateTypeParameter) {
IndexType* ref_index = IndexType* ref_index =
data->db->Resolve(data->db->ToTypeId(ref_cursor.get_usr())); data->db->Resolve(data->db->ToTypeId(ref_cursor.get_usr()));
// TODO It seems difficult to get a FunctionTemplate's template parameters.
// CXCursor_TemplateTypeParameter can be visited by visiting
// CXCursor_TranslationUnit, but not (confirm this) by visiting
// FunctionTemplate. Thus we need to initialize it here.
if (ref_index->def.short_name.empty()) {
ref_index->def.definition_spelling = ResolveSpelling(ref_cursor.cx_cursor);
ref_index->def.definition_extent = ResolveExtent(ref_cursor.cx_cursor);
ref_index->def.short_name = ref_cursor.get_spelling();
ref_index->def.detailed_name = ref_index->def.short_name;
}
UniqueAdd(ref_index->uses, ResolveSpelling(cursor.cx_cursor)); UniqueAdd(ref_index->uses, ResolveSpelling(cursor.cx_cursor));
} } else
cursor.VisitChildren(&TemplateVisitor, data);
// TODO Can CXCursor_TemplateTemplateParameter appear here?
break; break;
} }
} }