[clangd] Fix yet-another gratuitous llvm::Error crash

sam-mccall · sam-mccall · commit 6fe20a44fd3f · 2020-05-03T22:13:58.000+02:00
diff --git a/clang-tools-extra/clangd/SourceCode.cpp b/clang-tools-extra/clangd/SourceCode.cpp
@@ -564,7 +564,7 @@ format::FormatStyle getFormatStyleForFile(llvm::StringRef File,
   if (!Style) {
     log("getStyle() failed for file {0}: {1}. Fallback is LLVM style.", File,
         Style.takeError());
-    Style = format::getLLVMStyle();
+    return format::getLLVMStyle();
   }
   return *Style;
 }

Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ format::FormatStyle getFormatStyleForFile(llvm::StringRef File,`
`564`	`564`	`if (!Style) {`
`565`	`565`	`log("getStyle() failed for file {0}: {1}. Fallback is LLVM style.", File,`
`566`	`566`	`Style.takeError());`
`567`		`- Style = format::getLLVMStyle();`
	`567`	`+ return format::getLLVMStyle();`
`568`	`568`	`}`
`569`	`569`	`return *Style;`
`570`	`570`	`}`