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

fix: code format for clang-format setting

Browse Source
This commit is contained in:
panxueqian 2020-07-04 17:04:44 +08:00
parent a4e7b93917
commit 8b5fcf9358
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clang_tu.cc
View File

@ -113,7 +113,7 @@ buildCompilerInvocation(const std::string &main, std::vector<const char *> args,
const driver::JobList &jobs = comp->getJobs(); const driver::JobList &jobs = comp->getJobs();
bool offload_compilation = false; bool offload_compilation = false;
if (jobs.size() > 1) { if (jobs.size() > 1) {
for (auto &a : comp->getActions()){ for (auto &a : comp->getActions()) {
// On MacOSX real actions may end up being wrapped in BindArchAction // On MacOSX real actions may end up being wrapped in BindArchAction
if (isa<driver::BindArchAction>(a)) if (isa<driver::BindArchAction>(a))
a = *a->input_begin(); a = *a->input_begin();

12
src/indexer.cc
View File

@ -687,7 +687,7 @@ public:
IndexDataConsumer(IndexParam &param) : param(param) {} IndexDataConsumer(IndexParam &param) : param(param) {}
void initialize(ASTContext &ctx) override { this->ctx = param.ctx = &ctx; } void initialize(ASTContext &ctx) override { this->ctx = param.ctx = &ctx; }
#if LLVM_VERSION_MAJOR < 10 // llvmorg-10-init-12036-g3b9715cb219 #if LLVM_VERSION_MAJOR < 10 // llvmorg-10-init-12036-g3b9715cb219
# define handleDeclOccurrence handleDeclOccurence #define handleDeclOccurrence handleDeclOccurence
#endif #endif
bool handleDeclOccurrence(const Decl *d, index::SymbolRoleSet roles, bool handleDeclOccurrence(const Decl *d, index::SymbolRoleSet roles,
ArrayRef<index::SymbolRelation> relations, ArrayRef<index::SymbolRelation> relations,
@ -885,10 +885,10 @@ public:
Usr usr1 = getUsr(d1, &info1); Usr usr1 = getUsr(d1, &info1);
IndexType &type1 = db->toType(usr1); IndexType &type1 = db->toType(usr1);
SourceLocation sl1 = d1->getLocation(); SourceLocation sl1 = d1->getLocation();
type1.def.spell = { type1.def.spell = {Use{{fromTokenRange(sm, lang, {sl1, sl1}),
Use{{fromTokenRange(sm, lang, {sl1, sl1}), Role::Definition}, Role::Definition},
lid}, lid},
fromTokenRange(sm, lang, sr1)}; fromTokenRange(sm, lang, sr1)};
type1.def.detailed_name = intern(info1->short_name); type1.def.detailed_name = intern(info1->short_name);
type1.def.short_name_size = int16_t(info1->short_name.size()); type1.def.short_name_size = int16_t(info1->short_name.size());
type1.def.kind = SymbolKind::TypeParameter; type1.def.kind = SymbolKind::TypeParameter;
@ -1208,7 +1208,7 @@ class IndexDiags : public DiagnosticConsumer {
public: public:
llvm::SmallString<64> message; llvm::SmallString<64> message;
void HandleDiagnostic(DiagnosticsEngine::Level level, void HandleDiagnostic(DiagnosticsEngine::Level level,
const clang::Diagnostic &info) override { const clang::Diagnostic &info) override {
DiagnosticConsumer::HandleDiagnostic(level, info); DiagnosticConsumer::HandleDiagnostic(level, info);
if (message.empty()) if (message.empty())
info.FormatDiagnostic(message); info.FormatDiagnostic(message);