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

Fix formatting

Browse Source
This commit is contained in:
Fangrui Song 2017-12-31 20:17:31 -08:00
parent 86768b7d36
commit a4847181fa
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/clang_format.cc
View File

@ -5,11 +5,13 @@
#include <loguru.hpp> #include <loguru.hpp>
using namespace clang::format; using namespace clang;
using namespace clang::tooling; using clang::format::FormatStyle;
namespace { namespace {
// TODO Objective-C 'header/interface' files may use .h, we should get this from
// project information.
FormatStyle::LanguageKind getLanguageKindFromFilename( FormatStyle::LanguageKind getLanguageKindFromFilename(
llvm::StringRef filename) { llvm::StringRef filename) {
if (filename.endswith(".m") || filename.endswith(".mm")) { if (filename.endswith(".m") || filename.endswith(".mm")) {
@ -20,16 +22,17 @@ FormatStyle::LanguageKind getLanguageKindFromFilename(
} // namespace } // namespace
std::vector<Replacement> ClangFormatDocument(WorkingFile* working_file, std::vector<tooling::Replacement> ClangFormatDocument(
int start, WorkingFile* working_file,
int end, int start,
lsFormattingOptions options) { int end,
lsFormattingOptions options) {
const auto language_kind = const auto language_kind =
getLanguageKindFromFilename(working_file->filename); getLanguageKindFromFilename(working_file->filename);
FormatStyle predefined_style; FormatStyle predefined_style;
getPredefinedStyle("chromium", language_kind, &predefined_style); getPredefinedStyle("chromium", language_kind, &predefined_style);
llvm::Expected<FormatStyle> style = llvm::Expected<FormatStyle> style =
getStyle("file", working_file->filename, "chromium"); format::getStyle("file", working_file->filename, "chromium");
if (!style) { if (!style) {
// If, for some reason, we cannot get a format style, use Chromium's with // If, for some reason, we cannot get a format style, use Chromium's with
// tab configuration provided by the client editor. // tab configuration provided by the client editor.
@ -42,9 +45,10 @@ std::vector<Replacement> ClangFormatDocument(WorkingFile* working_file,
auto format_result = reformat( auto format_result = reformat(
*style, working_file->buffer_content, *style, working_file->buffer_content,
llvm::ArrayRef<clang::tooling::Range>(clang::tooling::Range(start, end)), llvm::ArrayRef<tooling::Range>(tooling::Range(start, end - start)),
working_file->filename); working_file->filename);
return std::vector<Replacement>(format_result.begin(), format_result.end()); return std::vector<tooling::Replacement>(format_result.begin(),
format_result.end());
} }
#endif #endif