allow implicit completion inside empty template argument list #138846
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-clang-tools-extra Author: Tom Praschan (tom-anders) ChangesI noticed that when triggering completion inside something like Full diff: https://github.com/llvm/llvm-project/pull/138846.diff 2 Files Affected:
diff --git a/clang-tools-extra/clangd/CodeComplete.cpp b/clang-tools-extra/clangd/CodeComplete.cpp
index 0eb196fbad46a..cc35e03959332 100644
--- a/clang-tools-extra/clangd/CodeComplete.cpp
+++ b/clang-tools-extra/clangd/CodeComplete.cpp
@@ -2455,6 +2455,11 @@ bool isIncludeFile(llvm::StringRef Line) {
}
bool allowImplicitCompletion(llvm::StringRef Content, unsigned Offset) {
+ // Check if we're inside an empty template argument list
+ if (Content.size() > 2 && Content[Offset - 1] == '<' &&
+ Content[Offset] == '>')
+ return true;
+
// Look at last line before completion point only.
Content = Content.take_front(Offset);
auto Pos = Content.rfind('\n');
diff --git a/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp b/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
index 718bee2e40b11..62e0f8627b7c7 100644
--- a/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
+++ b/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
@@ -3978,6 +3978,7 @@ TEST(AllowImplicitCompletion, All) {
"foo.^bar",
"foo->^bar",
"foo::^bar",
+ "std::vector<std::vector<^>>",
" # include <^foo.h>",
"#import <foo/^bar.h>",
"#include_next \"^",
@@ -3990,6 +3991,7 @@ TEST(AllowImplicitCompletion, All) {
"#include \"foo.h\"^",
"#error <^",
"#<^",
+ "a <^b",
};
for (const char *Test : Yes) {
llvm::Annotations A(Test);
|
|
@llvm/pr-subscribers-clangd Author: Tom Praschan (tom-anders) ChangesI noticed that when triggering completion inside something like Full diff: https://github.com/llvm/llvm-project/pull/138846.diff 2 Files Affected:
diff --git a/clang-tools-extra/clangd/CodeComplete.cpp b/clang-tools-extra/clangd/CodeComplete.cpp
index 0eb196fbad46a..cc35e03959332 100644
--- a/clang-tools-extra/clangd/CodeComplete.cpp
+++ b/clang-tools-extra/clangd/CodeComplete.cpp
@@ -2455,6 +2455,11 @@ bool isIncludeFile(llvm::StringRef Line) {
}
bool allowImplicitCompletion(llvm::StringRef Content, unsigned Offset) {
+ // Check if we're inside an empty template argument list
+ if (Content.size() > 2 && Content[Offset - 1] == '<' &&
+ Content[Offset] == '>')
+ return true;
+
// Look at last line before completion point only.
Content = Content.take_front(Offset);
auto Pos = Content.rfind('\n');
diff --git a/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp b/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
index 718bee2e40b11..62e0f8627b7c7 100644
--- a/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
+++ b/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
@@ -3978,6 +3978,7 @@ TEST(AllowImplicitCompletion, All) {
"foo.^bar",
"foo->^bar",
"foo::^bar",
+ "std::vector<std::vector<^>>",
" # include <^foo.h>",
"#import <foo/^bar.h>",
"#include_next \"^",
@@ -3990,6 +3991,7 @@ TEST(AllowImplicitCompletion, All) {
"#include \"foo.h\"^",
"#error <^",
"#<^",
+ "a <^b",
};
for (const char *Test : Yes) {
llvm::Annotations A(Test);
|
|
|
zyn0217
reviewed
May 7, 2025
Comment on lines
+2458
to
+2462
| // Check if we're inside an empty template argument list | ||
| if (Content.size() > 2 && Content[Offset - 1] == '<' && | ||
| Content[Offset] == '>') | ||
| return true; | ||
|
|
There was a problem hiding this comment.
Does it also pop up a completion within a template parameter list?
template <^> class foo {};
HighCommander4
requested changes
May 12, 2025
| @@ -2455,6 +2455,11 @@ bool isIncludeFile(llvm::StringRef Line) { | |||
| } | |||
|
|
|||
| bool allowImplicitCompletion(llvm::StringRef Content, unsigned Offset) { | |||
| // Check if we're inside an empty template argument list | |||
There was a problem hiding this comment.
nit: for consistency with the other checks in this function, could you:
- move this after the "Look at last line before completion only" check; and
- formulate the check using
ends_with?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I noticed that when triggering completion inside something like
std::vector<^>via the '<' trigger character, no results are returned. This PR adds a small heuristic to detect this case and offer completions