[clangd] Use default clang-format styles.

llvm-svn: 335598

diff --git a/clang-tools-extra/clangd/ClangdServer.cpp b/clang-tools-extra/clangd/ClangdServer.cpp
index 17d09e6..10c26ee 100644 (file)
--- a/clang-tools-extra/clangd/ClangdServer.cpp
+++ b/clang-tools-extra/clangd/ClangdServer.cpp
@@ -375,7 +375,8 @@ ClangdServer::formatCode(llvm::StringRef Code, PathRef File,
                          ArrayRef<tooling::Range> Ranges) {
   // Call clang-format.
   auto FS = FSProvider.getFileSystem();
-  auto Style = format::getStyle("file", File, "LLVM", Code, FS.get());
+  auto Style = format::getStyle(format::DefaultFormatStyle, File,
+                                format::DefaultFallbackStyle, Code, FS.get());
   if (!Style)
     return Style.takeError();
 

diff --git a/clang-tools-extra/clangd/CodeComplete.cpp b/clang-tools-extra/clangd/CodeComplete.cpp
index d2e71b6..12bed7a 100644 (file)
--- a/clang-tools-extra/clangd/CodeComplete.cpp
+++ b/clang-tools-extra/clangd/CodeComplete.cpp
@@ -825,10 +825,11 @@ bool semaCodeComplete(std::unique_ptr<CodeCompleteConsumer> Consumer,
     // Initialize Includes if provided.
 
     // FIXME(ioeric): needs more consistent style support in clangd server.
-    auto Style = format::getStyle("file", Input.FileName, "LLVM",
-                                  Input.Contents, Input.VFS.get());
+    auto Style = format::getStyle(format::DefaultFormatStyle, Input.FileName,
+                                  format::DefaultFallbackStyle, Input.Contents,
+                                  Input.VFS.get());
     if (!Style) {
-      log("Failed to get FormatStyle for file" + Input.FileName +
+      log("ERROR: failed to get FormatStyle for file " + Input.FileName +
           ". Fall back to use LLVM style. Error: " +
           llvm::toString(Style.takeError()));
       Style = format::getLLVMStyle();