[clang] [Sema] Add code completion for if constexpr (PR #124315)
Letu Ren via cfe-commits
cfe-commits at lists.llvm.org
Mon Feb 17 04:48:41 PST 2025
https://github.com/FantasqueX updated https://github.com/llvm/llvm-project/pull/124315
>From 23e07a719b8262bd68950812bf47c5b9c0ecbeba Mon Sep 17 00:00:00 2001
From: Letu Ren <fantasquex at gmail.com>
Date: Sat, 25 Jan 2025 01:23:52 +0800
Subject: [PATCH 1/5] [Sema] Add code completion for if constexpr
C++17 supports `if constexpr` statement. This patch implements this in
code completion.
---
clang/include/clang/Sema/SemaCodeCompletion.h | 1 +
clang/lib/Parse/ParseStmt.cpp | 8 ++++++++
clang/lib/Sema/SemaCodeComplete.cpp | 15 +++++++++++++++
3 files changed, 24 insertions(+)
diff --git a/clang/include/clang/Sema/SemaCodeCompletion.h b/clang/include/clang/Sema/SemaCodeCompletion.h
index e931596c215d3..af44745d5d123 100644
--- a/clang/include/clang/Sema/SemaCodeCompletion.h
+++ b/clang/include/clang/Sema/SemaCodeCompletion.h
@@ -152,6 +152,7 @@ class SemaCodeCompletion : public SemaBase {
void CodeCompleteDesignator(const QualType BaseType,
llvm::ArrayRef<Expr *> InitExprs,
const Designation &D);
+ void CodeCompleteIfConstExpr(Scope *S) const;
void CodeCompleteAfterIf(Scope *S, bool IsBracedThen);
void CodeCompleteQualifiedId(Scope *S, CXXScopeSpec &SS, bool EnteringContext,
diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp
index cd4504630f871..3f9900dd997ad 100644
--- a/clang/lib/Parse/ParseStmt.cpp
+++ b/clang/lib/Parse/ParseStmt.cpp
@@ -1553,6 +1553,14 @@ StmtResult Parser::ParseIfStatement(SourceLocation *TrailingElseLoc) {
IsConsteval = true;
ConstevalLoc = ConsumeToken();
}
+
+ if (Tok.is(tok::code_completion)) {
+ if (getLangOpts().CPlusPlus17) {
+ cutOffParsing();
+ Actions.CodeCompletion().CodeCompleteIfConstExpr(getCurScope());
+ return StmtError();
+ }
+ }
}
if (!IsConsteval && (NotLocation.isValid() || Tok.isNot(tok::l_paren))) {
Diag(Tok, diag::err_expected_lparen_after) << "if";
diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp
index 80ae87e7c5725..bcc0cb18b8739 100644
--- a/clang/lib/Sema/SemaCodeComplete.cpp
+++ b/clang/lib/Sema/SemaCodeComplete.cpp
@@ -6749,6 +6749,21 @@ void SemaCodeCompletion::CodeCompleteInitializer(Scope *S, Decl *D) {
CodeCompleteExpression(S, Data);
}
+void SemaCodeCompletion::CodeCompleteIfConstExpr(Scope *S) const {
+ ResultBuilder Results(SemaRef, CodeCompleter->getAllocator(),
+ CodeCompleter->getCodeCompletionTUInfo(),
+ CodeCompletionContext::CCC_SymbolOrNewName);
+ Results.EnterNewScope();
+
+ Results.AddResult(CodeCompletionResult("constexpr"));
+
+ Results.ExitScope();
+
+ HandleCodeCompleteResults(&SemaRef, CodeCompleter,
+ Results.getCompletionContext(), Results.data(),
+ Results.size());
+}
+
void SemaCodeCompletion::CodeCompleteAfterIf(Scope *S, bool IsBracedThen) {
ResultBuilder Results(SemaRef, CodeCompleter->getAllocator(),
CodeCompleter->getCodeCompletionTUInfo(),
>From a7406e134dd5cf0ac42ca195418514b0bd0c480d Mon Sep 17 00:00:00 2001
From: Letu Ren <fantasquex at gmail.com>
Date: Mon, 3 Feb 2025 22:49:38 +0800
Subject: [PATCH 2/5] Add test for if constexpr completion
---
clang/test/CodeCompletion/if-constexpr.cpp | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 clang/test/CodeCompletion/if-constexpr.cpp
diff --git a/clang/test/CodeCompletion/if-constexpr.cpp b/clang/test/CodeCompletion/if-constexpr.cpp
new file mode 100644
index 0000000000000..48a89b4799cbc
--- /dev/null
+++ b/clang/test/CodeCompletion/if-constexpr.cpp
@@ -0,0 +1,4 @@
+void test() {
+ if c
+ // RUN: %clang_cc1 -fsyntax-only -std=c++17 -code-completion-at=%s:%(line-1):7 %s -o - | FileCheck -check-prefix=CHECK-CC1 %s
+ // CHECK-CC1: constexpr
>From 69b805acddc2e3609ca2049b560fa564e1b9be13 Mon Sep 17 00:00:00 2001
From: Letu Ren <fantasquex at gmail.com>
Date: Sat, 15 Feb 2025 18:03:38 +0800
Subject: [PATCH 3/5] rename function
---
clang/include/clang/Sema/SemaCodeCompletion.h | 2 +-
clang/lib/Parse/ParseStmt.cpp | 2 +-
clang/lib/Sema/SemaCodeComplete.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/clang/include/clang/Sema/SemaCodeCompletion.h b/clang/include/clang/Sema/SemaCodeCompletion.h
index af44745d5d123..c79e6ec13634b 100644
--- a/clang/include/clang/Sema/SemaCodeCompletion.h
+++ b/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 CodeCompleteIfConstexpr(Scope *S) const;
void CodeCompleteAfterIf(Scope *S, bool IsBracedThen);
void CodeCompleteQualifiedId(Scope *S, CXXScopeSpec &SS, bool EnteringContext,
diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp
index 3f9900dd997ad..fd7f707d87516 100644
--- a/clang/lib/Parse/ParseStmt.cpp
+++ b/clang/lib/Parse/ParseStmt.cpp
@@ -1557,7 +1557,7 @@ StmtResult Parser::ParseIfStatement(SourceLocation *TrailingElseLoc) {
if (Tok.is(tok::code_completion)) {
if (getLangOpts().CPlusPlus17) {
cutOffParsing();
- Actions.CodeCompletion().CodeCompleteIfConstExpr(getCurScope());
+ Actions.CodeCompletion().CodeCompleteIfConstexpr(getCurScope());
return StmtError();
}
}
diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp
index bcc0cb18b8739..529965cb3e342 100644
--- a/clang/lib/Sema/SemaCodeComplete.cpp
+++ b/clang/lib/Sema/SemaCodeComplete.cpp
@@ -6749,7 +6749,7 @@ void SemaCodeCompletion::CodeCompleteInitializer(Scope *S, Decl *D) {
CodeCompleteExpression(S, Data);
}
-void SemaCodeCompletion::CodeCompleteIfConstExpr(Scope *S) const {
+void SemaCodeCompletion::CodeCompleteIfConstexpr(Scope *S) const {
ResultBuilder Results(SemaRef, CodeCompleter->getAllocator(),
CodeCompleter->getCodeCompletionTUInfo(),
CodeCompletionContext::CCC_SymbolOrNewName);
>From e79649c5c000d3664e8f6a12d80f13065edf0d86 Mon Sep 17 00:00:00 2001
From: Letu Ren <fantasquex at gmail.com>
Date: Sat, 15 Feb 2025 19:10:02 +0800
Subject: [PATCH 4/5] use CCC_Other instead
---
clang/lib/Sema/SemaCodeComplete.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp
index 529965cb3e342..209e8da8c7611 100644
--- a/clang/lib/Sema/SemaCodeComplete.cpp
+++ b/clang/lib/Sema/SemaCodeComplete.cpp
@@ -6752,11 +6752,9 @@ void SemaCodeCompletion::CodeCompleteInitializer(Scope *S, Decl *D) {
void SemaCodeCompletion::CodeCompleteIfConstexpr(Scope *S) const {
ResultBuilder Results(SemaRef, CodeCompleter->getAllocator(),
CodeCompleter->getCodeCompletionTUInfo(),
- CodeCompletionContext::CCC_SymbolOrNewName);
+ CodeCompletionContext::CCC_Other);
Results.EnterNewScope();
-
Results.AddResult(CodeCompletionResult("constexpr"));
-
Results.ExitScope();
HandleCodeCompleteResults(&SemaRef, CodeCompleter,
>From dcb660f7fca956f4bd29c386648637cd30ec0446 Mon Sep 17 00:00:00 2001
From: Letu Ren <fantasquex at gmail.com>
Date: Mon, 17 Feb 2025 20:48:22 +0800
Subject: [PATCH 5/5] Add consteval
---
clang/include/clang/Sema/SemaCodeCompletion.h | 2 +-
clang/lib/Parse/ParseStmt.cpp | 8 +++-----
clang/lib/Sema/SemaCodeComplete.cpp | 9 +++++++--
clang/test/CodeCompletion/if-const.cpp | 6 ++++++
clang/test/CodeCompletion/if-constexpr.cpp | 4 ----
5 files changed, 17 insertions(+), 12 deletions(-)
create mode 100644 clang/test/CodeCompletion/if-const.cpp
delete mode 100644 clang/test/CodeCompletion/if-constexpr.cpp
diff --git a/clang/include/clang/Sema/SemaCodeCompletion.h b/clang/include/clang/Sema/SemaCodeCompletion.h
index c79e6ec13634b..b930210f5f905 100644
--- a/clang/include/clang/Sema/SemaCodeCompletion.h
+++ b/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,
diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp
index fd7f707d87516..1c83697a4f421 100644
--- a/clang/lib/Parse/ParseStmt.cpp
+++ b/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))) {
diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp
index 209e8da8c7611..0c7be20e6bfe4 100644
--- a/clang/lib/Sema/SemaCodeComplete.cpp
+++ b/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,
diff --git a/clang/test/CodeCompletion/if-const.cpp b/clang/test/CodeCompletion/if-const.cpp
new file mode 100644
index 0000000000000..3c795dcc00ab9
--- /dev/null
+++ b/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
diff --git a/clang/test/CodeCompletion/if-constexpr.cpp b/clang/test/CodeCompletion/if-constexpr.cpp
deleted file mode 100644
index 48a89b4799cbc..0000000000000
--- a/clang/test/CodeCompletion/if-constexpr.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-void test() {
- if c
- // RUN: %clang_cc1 -fsyntax-only -std=c++17 -code-completion-at=%s:%(line-1):7 %s -o - | FileCheck -check-prefix=CHECK-CC1 %s
- // CHECK-CC1: constexpr
More information about the cfe-commits
mailing list