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

Be less aggressive about indexing potential lambdas

Browse Source
This commit is contained in:
Jacob Dufault 2017-12-12 09:49:52 -08:00
parent 48a7ec73eb
commit 1467526bad
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/indexer.cc
View File

@ -1394,8 +1394,16 @@ void OnIndexReference(CXClientData client_data, const CXIdxEntityRefInfo* ref) {
IndexVarId var_id = db->ToVarId(referenced.get_usr()); IndexVarId var_id = db->ToVarId(referenced.get_usr());
IndexVar* var = db->Resolve(var_id); IndexVar* var = db->Resolve(var_id);
// Lambda paramaters are not processed by OnIndexDeclaration and // Lambda paramaters are not processed by OnIndexDeclaration and
// may not have a short_name yet. // may not have a short_name yet. Note that we only process the lambda
// parameter as a definition if it is in the same file as the reference,
// as lambdas cannot be split across files.
if (var->def.short_name.empty()) { if (var->def.short_name.empty()) {
CXFile referenced_file;
Range spelling = ResolveSpelling(referenced.cx_cursor, &referenced_file);
if (file == referenced_file) {
var->def.definition_spelling = spelling;
var->def.definition_extent = ResolveExtent(referenced.cx_cursor);
// TODO Some of the logic here duplicates CXIdxEntity_Variable branch of // TODO Some of the logic here duplicates CXIdxEntity_Variable branch of
// OnIndexDeclaration. // OnIndexDeclaration.
// But there `decl` is of type CXIdxDeclInfo and has more information, // But there `decl` is of type CXIdxDeclInfo and has more information,
@ -1405,14 +1413,13 @@ void OnIndexReference(CXClientData client_data, const CXIdxEntityRefInfo* ref) {
clang_getTypeSpelling(clang_getCursorType(referenced.cx_cursor))); clang_getTypeSpelling(clang_getCursorType(referenced.cx_cursor)));
var->def.detailed_name = type_name + " " + var->def.short_name; var->def.detailed_name = type_name + " " + var->def.short_name;
var->def.is_local = false; var->def.is_local = false;
var->def.definition_spelling = ResolveSpelling(referenced.cx_cursor);
var->def.definition_extent = ResolveSpelling(referenced.cx_cursor);
UniqueAdd(var->uses, ResolveSpelling(referenced.cx_cursor)); UniqueAdd(var->uses, ResolveSpelling(referenced.cx_cursor));
AddDeclInitializerUsages(db, referenced.cx_cursor); AddDeclInitializerUsages(db, referenced.cx_cursor);
// TODO Use proper semantic_container and lexical_container. // TODO Use proper semantic_container and lexical_container.
AddDeclTypeUsages(db, referenced.cx_cursor, nullptr, nullptr); AddDeclTypeUsages(db, referenced.cx_cursor, nullptr, nullptr);
// TODO Other logic in OnIndexDeclaration may need to be adapted. // TODO Other logic in OnIndexDeclaration may need to be adapted.
} }
}
UniqueAdd(var->uses, loc_spelling); UniqueAdd(var->uses, loc_spelling);
break; break;
} }