[CompilerInstance] Fix weird condition on `createCodeCompletionConsumer`

[JohnTitor]

Summary

This patch moves a (weird) condition to a more suitable place on createCodeCompletionConsumer

Fixes llvm#53545

[JohnTitor]

[CompilerInstance] Tweak the condition on createCodeCompletionConsumer

[JohnTitor]

Fix the indention

[jansvoboda11]

Nice. This is the patch that makes the condition obsolete: D60871. You might also remove the else, since the first if now has an unconditional early return.

[jansvoboda11]

The differential I linked doesn't contain the right diff. Here's the commit I meant to point out: 3a75330f573a31c7e0f7e27c5d34501c293673a5.

clang/lib/Frontend/CompilerInstance.cpp

static bool EnableCodeCompletion(Preprocessor &PP,
   // Truncate the named file at the given line/column.
   PP.SetCodeCompletionPoint(*Entry, Line, Column);
   return false;
 }
 
 void CompilerInstance::createCodeCompletionConsumer() {
   const ParsedSourceLocation &Loc = getFrontendOpts().CodeCompletionAt;
   if (!CompletionConsumer) {
-    setCodeCompletionConsumer(
-      createCodeCompletionConsumer(getPreprocessor(),
-                                   Loc.FileName, Loc.Line, Loc.Column,
-                                   getFrontendOpts().CodeCompleteOpts,
-                                   llvm::outs()));
-    if (!CompletionConsumer)
-      return;
-  } else if (EnableCodeCompletion(getPreprocessor(), Loc.FileName,
-                                  Loc.Line, Loc.Column)) {
+    setCodeCompletionConsumer(createCodeCompletionConsumer(
+        getPreprocessor(), Loc.FileName, Loc.Line, Loc.Column,
+        getFrontendOpts().CodeCompleteOpts, llvm::outs()));
+  } else if (!CompletionConsumer &&
+             EnableCodeCompletion(getPreprocessor(), Loc.FileName, Loc.Line,
+                                  Loc.Column)) {
     setCodeCompletionConsumer(nullptr);
     return;
   }
 }
 
 void CompilerInstance::createFrontendTimer() {
   FrontendTimerGroup.reset(
       new llvm::TimerGroup("frontend", "Clang front-end time report"));