diff options
author | Sam McCall <sam.mccall@gmail.com> | 2019-05-06 08:11:59 +0000 |
---|---|---|
committer | Sam McCall <sam.mccall@gmail.com> | 2019-05-06 08:11:59 +0000 |
commit | fb607580046ed9fe2891151a23375f0c524d29b3 (patch) | |
tree | 643eb841aa0afba92f02e3594ac8004698db1bb9 | |
parent | 7e55672b225640fa19f92e9ae73f53d0718b3ad6 (diff) | |
download | bcm5719-llvm-fb607580046ed9fe2891151a23375f0c524d29b3.tar.gz bcm5719-llvm-fb607580046ed9fe2891151a23375f0c524d29b3.zip |
[clangd] Support -fallback-style, similar to clang-format.
Reviewers: kadircet
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D61519
llvm-svn: 360016
-rw-r--r-- | clang-tools-extra/clangd/tool/ClangdMain.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/clang-tools-extra/clangd/tool/ClangdMain.cpp b/clang-tools-extra/clangd/tool/ClangdMain.cpp index eca937ef246..b066283a7f8 100644 --- a/clang-tools-extra/clangd/tool/ClangdMain.cpp +++ b/clang-tools-extra/clangd/tool/ClangdMain.cpp @@ -16,6 +16,7 @@ #include "index/Background.h" #include "index/Serialization.h" #include "clang/Basic/Version.h" +#include "clang/Format/Format.h" #include "llvm/ADT/Optional.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FileSystem.h" @@ -231,6 +232,12 @@ static llvm::cl::opt<bool> EnableClangTidy( llvm::cl::desc("Enable clang-tidy diagnostics."), llvm::cl::init(true)); +static llvm::cl::opt<std::string> + FallbackStyle("fallback-style", + llvm::cl::desc("clang-format style to apply by default when " + "no .clang-format file is found"), + llvm::cl::init(clang::format::DefaultFallbackStyle)); + static llvm::cl::opt<bool> SuggestMissingIncludes( "suggest-missing-includes", llvm::cl::desc("Attempts to fix diagnostic errors caused by missing " @@ -352,6 +359,8 @@ int main(int argc, char *argv[]) { llvm::errs() << "Ignoring -j because -run-synchronously is set.\n"; WorkerThreadsCount = 0; } + if (FallbackStyle.getNumOccurrences()) + clang::format::DefaultFallbackStyle = FallbackStyle.c_str(); // Validate command line arguments. llvm::Optional<llvm::raw_fd_ostream> InputMirrorStream; |