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

Default to Chromium's format style if cquery cannot obtain it (#211)

Browse Source 
Set the tab configuration (tab, spaces, amount) to the information
provided by the LSP client.
This commit is contained in:
Daniel Martín 2018-01-01 01:35:37 +01:00 committed by Fangrui Song
parent f9aa0ef66d
commit c5610b8d76
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/clang_format.cc
View File

@ -34,15 +34,15 @@ std::vector<Replacement> ClangFormat::FormatWholeDocument() {
llvm::Expected<FormatStyle> style = llvm::Expected<FormatStyle> style =
getStyle("file", document_filename_, "chromium"); getStyle("file", document_filename_, "chromium");
if (!style) { if (!style) {
// If, for some reason, we cannot get a format style, use Chromium's with
// tab configuration provided by the client editor.
LOG_S(ERROR) << llvm::toString(style.takeError()); LOG_S(ERROR) << llvm::toString(style.takeError());
return {}; predefined_style.UseTab = insert_spaces_
? FormatStyle::UseTabStyle::UT_Never
: FormatStyle::UseTabStyle::UT_Always;
predefined_style.IndentWidth = tab_size_;
} }
if (*style == predefined_style) {
style->UseTab = insert_spaces_ ? FormatStyle::UseTabStyle::UT_Never
: FormatStyle::UseTabStyle::UT_Always;
style->IndentWidth = tab_size_;
}
auto format_result = reformat(*style, document_, ranges_, document_filename_); auto format_result = reformat(*style, document_, ranges_, document_filename_);
return std::vector<Replacement>(format_result.begin(), format_result.end()); return std::vector<Replacement>(format_result.begin(), format_result.end());
} }