Skip to content

[clang][CodeComplete] Add code completion for if constexpr and consteval #124315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Mar 17, 2025
Merged

[clang][CodeComplete] Add code completion for if constexpr and consteval #124315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e3f118c
[Sema] Add code completion for if constexpr
FantasqueX Jan 24, 2025
5b3a919
Add test for if constexpr completion
FantasqueX Feb 3, 2025
4e0d4a7
rename function
FantasqueX Feb 15, 2025
932ab1e
use CCC_Other instead
FantasqueX Feb 15, 2025
2955dc9
Add consteval
FantasqueX Feb 17, 2025
2319614
support code snippet completion
FantasqueX Feb 23, 2025
bdec8c2
format code
FantasqueX Feb 23, 2025
19f5516
Add if not test
FantasqueX Feb 25, 2025
d1abbf2
format code
FantasqueX Feb 25, 2025
e308919
Add pattern tests
FantasqueX Mar 7, 2025
f49496e
remove unused argument
FantasqueX Mar 13, 2025
f67da43
add more tests
FantasqueX Mar 13, 2025
ecbd115
rename code complete method
FantasqueX Mar 13, 2025
bb62505
move code complete in else block
FantasqueX Mar 13, 2025
490554f
remove a new scope
FantasqueX Mar 13, 2025
89c4ae7
format code
FantasqueX Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions clang/include/clang/Sema/SemaCodeCompletion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ class SemaCodeCompletion : public SemaBase {
void CodeCompleteDesignator(const QualType BaseType,
llvm::ArrayRef<Expr *> InitExprs,
const Designation &D);
void CodeCompleteKeywordAfterIf(bool AfterExclaim) const;
void CodeCompleteAfterIf(Scope *S, bool IsBracedThen);

void CodeCompleteQualifiedId(Scope *S, CXXScopeSpec &SS, bool EnteringContext,
Expand Down
5 changes: 5 additions & 0 deletions clang/lib/Parse/ParseStmt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,6 +1552,11 @@ StmtResult Parser::ParseIfStatement(SourceLocation *TrailingElseLoc) {
: diag::ext_consteval_if);
IsConsteval = true;
ConstevalLoc = ConsumeToken();
} else if (Tok.is(tok::code_completion)) {
cutOffParsing();
Actions.CodeCompletion().CodeCompleteKeywordAfterIf(
NotLocation.isValid());
return StmtError();
}
}
if (!IsConsteval && (NotLocation.isValid() || Tok.isNot(tok::l_paren))) {
Expand Down
46 changes: 46 additions & 0 deletions clang/lib/Sema/SemaCodeComplete.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6749,6 +6749,52 @@ void SemaCodeCompletion::CodeCompleteInitializer(Scope *S, Decl *D) {
CodeCompleteExpression(S, Data);
}

void SemaCodeCompletion::CodeCompleteKeywordAfterIf(bool AfterExclaim) const {
ResultBuilder Results(SemaRef, CodeCompleter->getAllocator(),
CodeCompleter->getCodeCompletionTUInfo(),
CodeCompletionContext::CCC_Other);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at the similar function CodeCompleteAfterIf, I think mapCodeCompletionContext(SemaRef, PCC_Statement) would be more appropriate here than CodeCompletionContext::CCC_Other

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
I think they are different. In CodeCompleteAfterIf, it's valid to provide a statement. While in the new added CodeCompleteKeywordAfterIf only two keywords are appropriate.

CodeCompletionBuilder Builder(Results.getAllocator(),
Results.getCodeCompletionTUInfo());
if (getLangOpts().CPlusPlus17) {
if (!AfterExclaim) {
if (Results.includeCodePatterns()) {
Builder.AddTypedTextChunk("constexpr");
Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
Builder.AddChunk(CodeCompletionString::CK_LeftParen);
Builder.AddPlaceholderChunk("condition");
Builder.AddChunk(CodeCompletionString::CK_RightParen);
Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
Builder.AddChunk(CodeCompletionString::CK_LeftBrace);
Builder.AddChunk(CodeCompletionString::CK_VerticalSpace);
Builder.AddPlaceholderChunk("statements");
Builder.AddChunk(CodeCompletionString::CK_VerticalSpace);
Builder.AddChunk(CodeCompletionString::CK_RightBrace);
Results.AddResult({Builder.TakeString()});
} else {
Results.AddResult({"constexpr"});
}
}
}
if (getLangOpts().CPlusPlus23) {
if (Results.includeCodePatterns()) {
Builder.AddTypedTextChunk("consteval");
Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
Builder.AddChunk(CodeCompletionString::CK_LeftBrace);
Builder.AddChunk(CodeCompletionString::CK_VerticalSpace);
Builder.AddPlaceholderChunk("statements");
Builder.AddChunk(CodeCompletionString::CK_VerticalSpace);
Builder.AddChunk(CodeCompletionString::CK_RightBrace);
Results.AddResult({Builder.TakeString()});
} else {
Results.AddResult({"consteval"});
}
}

HandleCodeCompleteResults(&SemaRef, CodeCompleter,
Results.getCompletionContext(), Results.data(),
Results.size());
}

void SemaCodeCompletion::CodeCompleteAfterIf(Scope *S, bool IsBracedThen) {
ResultBuilder Results(SemaRef, CodeCompleter->getAllocator(),
CodeCompleter->getCodeCompletionTUInfo(),
Expand Down
30 changes: 30 additions & 0 deletions clang/test/CodeCompletion/if-const.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
template <bool Flag>
void test() {
if constexpr (Flag) {
return;
}
// RUN: %clang_cc1 -fsyntax-only -std=c++17 -code-completion-at=%s:3:7 %s | FileCheck -check-prefix=CHECK-CXX17 %s
// RUN: %clang_cc1 -fsyntax-only -std=c++17 -code-completion-patterns -code-completion-at=%s:3:7 %s | FileCheck -check-prefix=CHECK-PATTERN-CXX17 %s
// RUN: %clang_cc1 -fsyntax-only -std=c++23 -code-completion-at=%s:3:7 %s | FileCheck -check-prefix=CHECK-CXX23 %s
// RUN: %clang_cc1 -fsyntax-only -std=c++23 -code-completion-patterns -code-completion-at=%s:3:7 %s | FileCheck -check-prefix=CHECK-PATTERN-CXX23 %s
// CHECK-CXX17: COMPLETION: constexpr
// CHECK-PATTERN-CXX17: COMPLETION: Pattern : constexpr (<#condition#>) {
// CHECK-PATTERN-CXX17: <#statements#>
// CHECK-PATTERN-CXX17: }
// CHECK-CXX23: COMPLETION: consteval
// CHECK-CXX23: COMPLETION: constexpr
// CHECK-PATTERN-CXX23: COMPLETION: Pattern : consteval {
// CHECK-PATTERN-CXX23: <#statements#>
// CHECK-PATTERN-CXX23: }
// CHECK-PATTERN-CXX23: COMPLETION: Pattern : constexpr (<#condition#>) {
// CHECK-PATTERN-CXX23: <#statements#>
// CHECK-PATTERN-CXX23: }
if !c
// RUN: %clang_cc1 -fsyntax-only -std=c++23 -code-completion-at=%s:22:8 %s -o - | FileCheck -check-prefix=CHECK-CXX23-EXCLAIM %s
// RUN: %clang_cc1 -fsyntax-only -std=c++23 -code-completion-patterns -code-completion-at=%s:22:8 %s -o - | FileCheck -check-prefix=CHECK-PATTERN-CXX23-EXCLAIM %s
// CHECK-CXX23-EXCLAIM: COMPLETION: consteval
// CHECK-CXX23-EXCLAIM-NOT: constexpr
// CHECK-PATTERN-CXX23-EXCLAIM: COMPLETION: Pattern : consteval {
// CHECK-PATTERN-CXX23-EXCLAIM: <#statements#>
// CHECK-PATTERN-CXX23-EXCLAIM: }
}