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

Fix short_name_size when getNameAsString does not return a prefix (#784)

Browse Source
This commit is contained in:
zhangjunphy 2021-03-31 14:33:18 +08:00 committed by Fangrui Song
parent 4cd308d7fd
commit 0ada56ef3b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/indexer.cc
View File

@ -534,15 +534,18 @@ public:
// e.g. operator type-parameter-1 // e.g. operator type-parameter-1
i = 0; i = 0;
def.short_name_offset = 0; def.short_name_offset = 0;
} else if (short_name.empty() || (i >= 2 && name[i - 2] == ':')) { def.short_name_size = name.size();
// Don't replace name with qualified name in ns::name Cls::*name
def.short_name_offset = i;
} else { } else {
name.replace(i, short_name.size(), qualified); if (short_name.empty() || (i >= 2 && name[i - 2] == ':')) {
def.short_name_offset = i + qualified.size() - short_name.size(); // Don't replace name with qualified name in ns::name Cls::*name
def.short_name_offset = i;
} else {
name.replace(i, short_name.size(), qualified);
def.short_name_offset = i + qualified.size() - short_name.size();
}
// name may be empty while short_name is not.
def.short_name_size = name.empty() ? 0 : short_name.size();
} }
// name may be empty while short_name is not.
def.short_name_size = name.empty() ? 0 : short_name.size();
for (int paren = 0; i; i--) { for (int paren = 0; i; i--) {
// Skip parentheses in "(anon struct)::name" // Skip parentheses in "(anon struct)::name"
if (name[i - 1] == ')') if (name[i - 1] == ')')