Add consteval

Author: FantasqueX

clang/include/clang/Sema/SemaCodeCompletion.h

@@ -152,7 +152,7 @@ class SemaCodeCompletion : public SemaBase {
   void CodeCompleteDesignator(const QualType BaseType,
                               llvm::ArrayRef<Expr *> InitExprs,
                               const Designation &D);
-  void CodeCompleteIfConstexpr(Scope *S) const;
+  void CodeCompleteIfConst(Scope *S) const;
   void CodeCompleteAfterIf(Scope *S, bool IsBracedThen);
 
   void CodeCompleteQualifiedId(Scope *S, CXXScopeSpec &SS, bool EnteringContext,

clang/lib/Parse/ParseStmt.cpp

@@ -1555,11 +1555,9 @@ StmtResult Parser::ParseIfStatement(SourceLocation *TrailingElseLoc) {
     }
 
     if (Tok.is(tok::code_completion)) {
-      if (getLangOpts().CPlusPlus17) {
-        cutOffParsing();
-        Actions.CodeCompletion().CodeCompleteIfConstexpr(getCurScope());
-        return StmtError();
-      }
+      cutOffParsing();
+      Actions.CodeCompletion().CodeCompleteIfConst(getCurScope());
+      return StmtError();
     }
   }
   if (!IsConsteval && (NotLocation.isValid() || Tok.isNot(tok::l_paren))) {

clang/lib/Sema/SemaCodeComplete.cpp

@@ -6749,12 +6749,17 @@ void SemaCodeCompletion::CodeCompleteInitializer(Scope *S, Decl *D) {
   CodeCompleteExpression(S, Data);
 }
 
-void SemaCodeCompletion::CodeCompleteIfConstexpr(Scope *S) const {
+void SemaCodeCompletion::CodeCompleteIfConst(Scope *S) const {
   ResultBuilder Results(SemaRef, CodeCompleter->getAllocator(),
                         CodeCompleter->getCodeCompletionTUInfo(),
                         CodeCompletionContext::CCC_Other);
   Results.EnterNewScope();
-  Results.AddResult(CodeCompletionResult("constexpr"));
+  if (getLangOpts().CPlusPlus17) {
+    Results.AddResult(CodeCompletionResult("constexpr"));
+  }
+  if (getLangOpts().CPlusPlus23) {
+    Results.AddResult(CodeCompletionResult("consteval"));
+  }
   Results.ExitScope();
 
   HandleCodeCompleteResults(&SemaRef, CodeCompleter,

clang/test/CodeCompletion/if-const.cpp

@@ -0,0 +1,6 @@
+void test() {
+  if c
+  // RUN: %clang_cc1 -fsyntax-only -std=c++17 -code-completion-at=%s:2:7 %s -o - | FileCheck -check-prefix=CHECK-CXX17 %s
+  // RUN: %clang_cc1 -fsyntax-only -std=c++23 -code-completion-at=%s:2:7 %s -o - | FileCheck -check-prefix=CHECK-CXX23 %s
+  // CHECK-CXX17: constexpr
+  // CHECK-CXX23: consteval