Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-01-19 12:05:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update formatting

Browse Source
This commit is contained in:
Jacob Dufault 2017-12-28 09:22:26 -08:00
parent 7939aec743
commit 3ab2f2e2b7
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/indexer.cc
View File

@ -1050,8 +1050,10 @@ ClangCursor::VisitResult TemplateVisitor(ClangCursor cursor,
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()) { if (ref_index->def.short_name.empty()) {
ref_index->def.definition_spelling = ResolveSpelling(ref_cursor.cx_cursor); ref_index->def.definition_spelling =
ref_index->def.definition_extent = ResolveExtent(ref_cursor.cx_cursor); 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.short_name = ref_cursor.get_spelling();
ref_index->def.detailed_name = ref_index->def.short_name; ref_index->def.detailed_name = ref_index->def.short_name;
} }
@ -1087,13 +1089,16 @@ 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. // TODO It seems difficult to get a FunctionTemplate's template
// parameters.
// CXCursor_TemplateTypeParameter can be visited by visiting // CXCursor_TemplateTypeParameter can be visited by visiting
// CXCursor_TranslationUnit, but not (confirm this) by visiting // CXCursor_TranslationUnit, but not (confirm this) by visiting
// FunctionTemplate. Thus we need to initialize it here. // FunctionTemplate. Thus we need to initialize it here.
if (ref_index->def.short_name.empty()) { if (ref_index->def.short_name.empty()) {
ref_index->def.definition_spelling = ResolveSpelling(ref_cursor.cx_cursor); ref_index->def.definition_spelling =
ref_index->def.definition_extent = ResolveExtent(ref_cursor.cx_cursor); 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.short_name = ref_cursor.get_spelling();
ref_index->def.detailed_name = ref_index->def.short_name; ref_index->def.detailed_name = ref_index->def.short_name;
} }
@ -1131,7 +1136,7 @@ std::string GetFunctionSignature(IndexFile* db,
// Scan the function type backwards. // Scan the function type backwards.
// First pass: find the position of the closing bracket in the type. // First pass: find the position of the closing bracket in the type.
for (int balance = 0, i = int(type_desc.size()); i--; ) { for (int balance = 0, i = int(type_desc.size()); i--;) {
if (type_desc[i] == ')') if (type_desc[i] == ')')
balance++; balance++;
// Balanced paren pair that may appear before the paren enclosing // Balanced paren pair that may appear before the paren enclosing
@ -1143,8 +1148,7 @@ std::string GetFunctionSignature(IndexFile* db,
(i >= 7 && !type_desc.compare(i - 7, 7, "typeof ")) || (i >= 7 && !type_desc.compare(i - 7, 7, "typeof ")) ||
(i >= 8 && !type_desc.compare(i - 8, 8, "decltype")) || (i >= 8 && !type_desc.compare(i - 8, 8, "decltype")) ||
(i >= 8 && !type_desc.compare(i - 8, 8, "noexcept")) || (i >= 8 && !type_desc.compare(i - 8, 8, "noexcept")) ||
(i >= 13 && (i >= 13 && !type_desc.compare(i - 13, 13, "__attribute__")))) {
!type_desc.compare(i - 13, 13, "__attribute__")))) {
// Do not bother with function types which return function pointers. // Do not bother with function types which return function pointers.
if (type_desc.find("(*") >= std::string::size_type(i)) if (type_desc.find("(*") >= std::string::size_type(i))
function_name_offset = i; function_name_offset = i;
@ -1177,10 +1181,13 @@ std::string GetFunctionSignature(IndexFile* db,
std::string type_desc_with_names; std::string type_desc_with_names;
for (auto& arg : args) { for (auto& arg : args) {
if (arg.first < 0) { if (arg.first < 0) {
LOG_S(ERROR) << "When adding argument names to '" << type_desc << "', failed to detect positions to insert argument names"; LOG_S(ERROR)
<< "When adding argument names to '" << type_desc
<< "', failed to detect positions to insert argument names";
break; break;
} }
if (arg.second.empty()) continue; if (arg.second.empty())
continue;
type_desc_with_names.insert(type_desc_with_names.end(), &type_desc[i], type_desc_with_names.insert(type_desc_with_names.end(), &type_desc[i],
&type_desc[arg.first]); &type_desc[arg.first]);
i = arg.first; i = arg.first;

2
src/lru_cache.h
View File

@ -40,7 +40,7 @@ struct LruCache {
uint32_t score = 0; uint32_t score = 0;
TKey key; TKey key;
std::shared_ptr<TValue> value; std::shared_ptr<TValue> value;
bool operator<(const Entry &other) const { return score < other.score; } bool operator<(const Entry& other) const { return score < other.score; }
}; };
void IncrementScore(); void IncrementScore();