Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-04-04 16:02:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clang format

Browse Source
This commit is contained in:
rhcher 2022-07-01 13:28:58 +08:00
parent 74458915b3
commit b1e36f60a7
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/clang_tu.cc
View File

@ -118,7 +118,8 @@ buildCompilerInvocation(const std::string &main, std::vector<const char *> args,
#if LLVM_VERSION_MAJOR < 12 // llvmorg-12-init-5498-g257b29715bb #if LLVM_VERSION_MAJOR < 12 // llvmorg-12-init-5498-g257b29715bb
driver::Driver d(args[0], llvm::sys::getDefaultTargetTriple(), *diags, vfs); driver::Driver d(args[0], llvm::sys::getDefaultTargetTriple(), *diags, vfs);
#else #else
driver::Driver d(args[0], llvm::sys::getDefaultTargetTriple(), *diags, "ccls", vfs); driver::Driver d(args[0], llvm::sys::getDefaultTargetTriple(), *diags, "ccls",
vfs);
#endif #endif
d.setCheckInputsExist(false); d.setCheckInputsExist(false);
std::unique_ptr<driver::Compilation> comp(d.BuildCompilation(args)); std::unique_ptr<driver::Compilation> comp(d.BuildCompilation(args));
@ -127,7 +128,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();

3
src/messages/textDocument_document.cc
View File

@ -191,7 +191,8 @@ void MessageHandler::textDocument_documentSymbol(JsonReader &reader,
ds->detail = def->detailed_name; ds->detail = def->detailed_name;
ds->kind = def->kind; ds->kind = def->kind;
if (!ignore(def) && (ds->kind == SymbolKind::Namespace || allows(sym))) { if (!ignore(def) &&
(ds->kind == SymbolKind::Namespace || allows(sym))) {
// Drop scopes which are before selectionRange.start. In // Drop scopes which are before selectionRange.start. In
// `int i, j, k;`, the scope of i will be ended by j. // `int i, j, k;`, the scope of i will be ended by j.
while (!scopes.empty() && while (!scopes.empty() &&

6
src/messages/textDocument_hover.cc
View File

@ -53,9 +53,9 @@ getHover(DB *db, LanguageId lang, SymbolRef sym, int file_id) {
if (d.spell) { if (d.spell) {
if (d.comments[0]) if (d.comments[0])
comments = d.comments; comments = d.comments;
if (const char *s = if (const char *s = d.hover[0] ? d.hover
d.hover[0] ? d.hover : d.detailed_name[0] ? d.detailed_name
: d.detailed_name[0] ? d.detailed_name : nullptr) { : nullptr) {
if (!hover) if (!hover)
hover = {languageIdentifier(lang), s}; hover = {languageIdentifier(lang), s};
else if (strlen(s) > hover->value.size()) else if (strlen(s) > hover->value.size())

3
src/messages/textDocument_signatureHelp.cc
View File

@ -98,7 +98,8 @@ public:
const auto *ccs = const auto *ccs =
#if LLVM_VERSION_MAJOR >= 14 #if LLVM_VERSION_MAJOR >= 14
cand.CreateSignatureString(currentArg, s, *alloc, cCTUInfo, true, braced); cand.CreateSignatureString(currentArg, s, *alloc, cCTUInfo, true,
braced);
#else #else
cand.CreateSignatureString(currentArg, s, *alloc, cCTUInfo, true); cand.CreateSignatureString(currentArg, s, *alloc, cCTUInfo, true);
#endif #endif

3
src/project.cc
View File

@ -49,7 +49,8 @@ std::pair<LanguageId, bool> lookupExtension(std::string_view filename) {
LanguageId ret; LanguageId ret;
if (types::isCXX(i)) if (types::isCXX(i))
ret = types::isCuda(i) ? LanguageId::Cuda ret = types::isCuda(i) ? LanguageId::Cuda
: objc ? LanguageId::ObjCpp : LanguageId::Cpp; : objc ? LanguageId::ObjCpp
: LanguageId::Cpp;
else if (objc) else if (objc)
ret = LanguageId::ObjC; ret = LanguageId::ObjC;
else if (i == types::TY_C || i == types::TY_CHeader) else if (i == types::TY_C || i == types::TY_CHeader)

3
src/working_files.cc
View File

@ -339,7 +339,8 @@ std::optional<int> WorkingFile::getIndexPosFromBufferPos(int line, int *column,
index_lines, is_end); index_lines, is_end);
} }
Position WorkingFile::getCompletionPosition(Position pos, std::string *filter) const { Position WorkingFile::getCompletionPosition(Position pos,
std::string *filter) const {
int start = getOffsetForPosition(pos, buffer_content); int start = getOffsetForPosition(pos, buffer_content);
int i = start; int i = start;
#if LLVM_VERSION_MAJOR < 14 // llvmorg-14-init-3863-g601102d282d5 #if LLVM_VERSION_MAJOR < 14 // llvmorg-14-init-3863-g601102d282d5