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

Format all code in src/

Browse Source
This commit is contained in:
Jacob Dufault 2017-10-31 12:49:19 -07:00
parent 5f04e390a2
commit 7734943620
12 changed files with 8 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/clang_utils.h
View File

@ -7,7 +7,6 @@
#include <optional.h> #include <optional.h>
#include <vector> #include <vector>
using namespace std::experimental; using namespace std::experimental;
optional<lsDiagnostic> BuildAndDisposeDiagnostic(CXDiagnostic diagnostic, optional<lsDiagnostic> BuildAndDisposeDiagnostic(CXDiagnostic diagnostic,

1
src/file_consumer.h
View File

@ -9,7 +9,6 @@
#include <unordered_map> #include <unordered_map>
#include <unordered_set> #include <unordered_set>
struct IndexFile; struct IndexFile;
// Needed for unordered_map usage below. // Needed for unordered_map usage below.

164
src/indexer.cc
View File

@ -264,39 +264,6 @@ std::string GetDocumentContentInRange(CXTranslationUnit cx_tu,
} // namespace } // namespace
// static // static
int IndexFile::kCurrentVersion = 4; int IndexFile::kCurrentVersion = 4;
@ -903,57 +870,6 @@ clang::VisiterResult VisitMacroDefinitionAndExpansions(clang::Cursor cursor,
return clang::VisiterResult::Continue; return clang::VisiterResult::Continue;
} }
void indexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) { void indexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) {
if (!kIndexStdDeclarations && if (!kIndexStdDeclarations &&
clang_Location_isInSystemHeader( clang_Location_isInSystemHeader(
@ -1339,53 +1255,6 @@ bool IsFunctionCallContext(CXCursorKind kind) {
return false; return false;
} }
void indexEntityReference(CXClientData client_data, void indexEntityReference(CXClientData client_data,
const CXIdxEntityRefInfo* ref) { const CXIdxEntityRefInfo* ref) {
// Don't index references from or to system headers. // Don't index references from or to system headers.
@ -1562,35 +1431,6 @@ void indexEntityReference(CXClientData client_data,
} }
} }
FileContents::FileContents(const std::string& path, const std::string& content) FileContents::FileContents(const std::string& path, const std::string& content)
: path(path), content(content) {} : path(path), content(content) {}
@ -1621,8 +1461,8 @@ std::vector<std::unique_ptr<IndexFile>> Parse(
std::unique_ptr<clang::TranslationUnit> tu = clang::TranslationUnit::Create( std::unique_ptr<clang::TranslationUnit> tu = clang::TranslationUnit::Create(
index, file, args, unsaved_files, index, file, args, unsaved_files,
CXTranslationUnit_KeepGoing | CXTranslationUnit_KeepGoing |
CXTranslationUnit_DetailedPreprocessingRecord); CXTranslationUnit_DetailedPreprocessingRecord);
if (!tu) if (!tu)
return {}; return {};

205
src/language_server_api.h
View File

@ -32,41 +32,6 @@ struct lsRequestId {
void Reflect(Writer& visitor, lsRequestId& value); void Reflect(Writer& visitor, lsRequestId& value);
void Reflect(Reader& visitor, lsRequestId& id); void Reflect(Reader& visitor, lsRequestId& id);
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -146,55 +111,6 @@ struct lsResponseError {
void Write(Writer& visitor); void Write(Writer& visitor);
}; };
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -577,96 +493,6 @@ MAKE_REFLECT_STRUCT(lsDiagnostic, range, severity, source, message);
// TODO: DocumentFilter // TODO: DocumentFilter
// TODO: DocumentSelector // TODO: DocumentSelector
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -1092,42 +918,11 @@ struct Ipc_InitializedNotification
}; };
MAKE_REFLECT_STRUCT(Ipc_InitializedNotification, id); MAKE_REFLECT_STRUCT(Ipc_InitializedNotification, id);
struct Ipc_Exit : public IpcMessage<Ipc_Exit> { struct Ipc_Exit : public IpcMessage<Ipc_Exit> {
static const IpcId kIpcId = IpcId::Exit; static const IpcId kIpcId = IpcId::Exit;
}; };
MAKE_REFLECT_EMPTY_STRUCT(Ipc_Exit); MAKE_REFLECT_EMPTY_STRUCT(Ipc_Exit);
enum class lsErrorCodes { enum class lsErrorCodes {
// Defined by JSON RPC // Defined by JSON RPC
ParseError = -32700, ParseError = -32700,

1
src/libclangmm/Cursor.h
View File

@ -5,7 +5,6 @@
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
#include <clang-c/Index.h> #include <clang-c/Index.h>
namespace clang { namespace clang {

1
src/message_queue.h
View File

@ -4,7 +4,6 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include "buffer.h" #include "buffer.h"
struct ResizableBuffer; struct ResizableBuffer;

1
src/platform.cc
View File

@ -7,7 +7,6 @@
#include <thread> #include <thread>
#include <vector> #include <vector>
#include <doctest/doctest.h> #include <doctest/doctest.h>
namespace { namespace {

6
src/platform_linux.cc
View File

@ -11,7 +11,6 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
@ -23,23 +22,19 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <dirent.h> #include <dirent.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> // required for stat.h #include <sys/types.h> // required for stat.h
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> /* For O_* constants */ #include <fcntl.h> /* For O_* constants */
#include <semaphore.h> #include <semaphore.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/stat.h> /* For mode constants */ #include <sys/stat.h> /* For mode constants */
#ifndef __APPLE__ #ifndef __APPLE__
#include <sys/prctl.h> #include <sys/prctl.h>
#endif #endif
@ -156,7 +151,6 @@ std::string GetWorkingDirectory() {
return working_dir; return working_dir;
} }
std::string NormalizePath(const std::string& path) { std::string NormalizePath(const std::string& path) {
errno = 0; errno = 0;
char name[PATH_MAX + 1]; char name[PATH_MAX + 1];

2
src/project.cc
View File

@ -4,8 +4,8 @@
#include "match.h" #include "match.h"
#include "platform.h" #include "platform.h"
#include "serializer.h" #include "serializer.h"
#include "utils.h"
#include "timer.h" #include "timer.h"
#include "utils.h"
#include <clang-c/CXCompilationDatabase.h> #include <clang-c/CXCompilationDatabase.h>
#include <doctest/doctest.h> #include <doctest/doctest.h>

2
src/query.cc
View File

@ -606,7 +606,7 @@ IndexUpdate::IndexUpdate(const IdMap& previous_id_map,
} }
void IndexUpdate::Merge(const IndexUpdate& update) { void IndexUpdate::Merge(const IndexUpdate& update) {
// This function runs on an indexer thread. // This function runs on an indexer thread.
#define INDEX_UPDATE_APPEND(name) AddRange(&name, update.name); #define INDEX_UPDATE_APPEND(name) AddRange(&name, update.name);
#define INDEX_UPDATE_MERGE(name) AddMergeableRange(&name, update.name); #define INDEX_UPDATE_MERGE(name) AddMergeableRange(&name, update.name);

3
src/query_utils.cc
View File

@ -484,8 +484,7 @@ optional<lsSymbolInformation> GetSymbolInfo(QueryDatabase* db,
info.kind = lsSymbolKind::Function; info.kind = lsSymbolKind::Function;
if (func.def->declaring_type.has_value()) { if (func.def->declaring_type.has_value()) {
QueryType& container = QueryType& container = db->types[func.def->declaring_type->id];
db->types[func.def->declaring_type->id];
if (container.def) if (container.def)
info.kind = lsSymbolKind::Method; info.kind = lsSymbolKind::Method;
} }

4
src/timer.cc
View File

@ -13,7 +13,9 @@ long long Timer::ElapsedMicroseconds() const {
long long elapsed = elapsed_; long long elapsed = elapsed_;
if (start_.has_value()) { if (start_.has_value()) {
// TODO: clang-format this file. // TODO: clang-format this file.
elapsed += std::chrono::duration_cast<std::chrono::microseconds>(end - *start_).count(); elapsed +=
std::chrono::duration_cast<std::chrono::microseconds>(end - *start_)
.count();
} }
return elapsed; return elapsed;
} }