kbobyrev updated this revision to Diff 269430.
kbobyrev marked 9 inline comments as done.
kbobyrev added a comment.
Make sure snippets are omitted only in the function/method/constructor calls
for safety and extend the testset.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D81380/new/
https://reviews.llvm.org/D81380
Files:
clang-tools-extra/clangd/CodeComplete.cpp
clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
Index: clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
+++ clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
@@ -2878,6 +2878,50 @@
}
}
+TEST(CompletionTest, FunctionArgsExist) {
+ clangd::CodeCompleteOptions Opts;
+ Opts.EnableSnippets = true;
+ std::string Context = R"cpp(
+ int foo(int A);
+ int bar();
+ struct Object {
+ Object(int B) {}
+ };
+ template <typename T>
+ struct Container {
+ Container(int Size) {}
+ };
+ )cpp";
+ EXPECT_THAT(completions(Context + "int y = fo^", {}, Opts).Completions,
+ UnorderedElementsAre(
+ AllOf(Labeled("foo(int A)"), SnippetSuffix("(${1:int A})"))));
+ EXPECT_THAT(
+ completions(Context + "int y = fo^(42)", {}, Opts).Completions,
+ UnorderedElementsAre(AllOf(Labeled("foo(int A)"), SnippetSuffix(""))));
+ EXPECT_THAT(
+ completions(Context + "int y = ba^", {}, Opts).Completions,
+ UnorderedElementsAre(AllOf(Labeled("bar()"), SnippetSuffix("()"))));
+ EXPECT_THAT(completions(Context + "int y = ba^()", {}, Opts).Completions,
+ UnorderedElementsAre(AllOf(Labeled("bar()"), SnippetSuffix(""))));
+ EXPECT_THAT(
+ completions(Context + "Object o = Obj^", {}, Opts).Completions,
+ Contains(AllOf(Labeled("Object(int B)"), SnippetSuffix("(${1:int B})"),
+ Kind(CompletionItemKind::Constructor))));
+ EXPECT_THAT(completions(Context + "Object o = Obj^()", {}, Opts).Completions,
+ Contains(AllOf(Labeled("Object(int B)"), SnippetSuffix(""),
+ Kind(CompletionItemKind::Constructor))));
+ EXPECT_THAT(
+ completions(Context + "Container c = Cont^", {}, Opts).Completions,
+ Contains(AllOf(Labeled("Container<typename T>(int Size)"),
+ SnippetSuffix("<${1:typename T}>(${2:int Size})"),
+ Kind(CompletionItemKind::Constructor))));
+ EXPECT_THAT(
+ completions(Context + "Container c = Cont^()", {}, Opts).Completions,
+ Contains(AllOf(Labeled("Container<typename T>(int Size)"),
+ SnippetSuffix(""),
+ Kind(CompletionItemKind::Constructor))));
+}
+
} // namespace
} // namespace clangd
} // namespace clang
Index: clang-tools-extra/clangd/CodeComplete.cpp
===================================================================
--- clang-tools-extra/clangd/CodeComplete.cpp
+++ clang-tools-extra/clangd/CodeComplete.cpp
@@ -44,10 +44,12 @@
#include "clang/Basic/CharInfo.h"
#include "clang/Basic/LangOptions.h"
#include "clang/Basic/SourceLocation.h"
+#include "clang/Basic/TokenKinds.h"
#include "clang/Format/Format.h"
#include "clang/Frontend/CompilerInstance.h"
#include "clang/Frontend/FrontendActions.h"
#include "clang/Lex/ExternalPreprocessorSource.h"
+#include "clang/Lex/Lexer.h"
#include "clang/Lex/Preprocessor.h"
#include "clang/Lex/PreprocessorOptions.h"
#include "clang/Sema/CodeCompleteConsumer.h"
@@ -254,10 +256,11 @@
const IncludeInserter &Includes,
llvm::StringRef FileName,
CodeCompletionContext::Kind ContextKind,
- const CodeCompleteOptions &Opts, bool GenerateSnippets)
+ const CodeCompleteOptions &Opts, bool GenerateSnippets,
+ tok::TokenKind NextTokenKind)
: ASTCtx(ASTCtx), ExtractDocumentation(Opts.IncludeComments),
EnableFunctionArgSnippets(Opts.EnableFunctionArgSnippets),
- GenerateSnippets(GenerateSnippets) {
+ GenerateSnippets(GenerateSnippets), NextTokenKind(NextTokenKind) {
add(C, SemaCCS);
if (C.SemaResult) {
assert(ASTCtx);
@@ -430,6 +433,12 @@
std::string summarizeSnippet() const {
if (!GenerateSnippets)
return "";
+ // Suppress function argument snippets if args are already present.
+ if ((Completion.Kind == CompletionItemKind::Function ||
+ Completion.Kind == CompletionItemKind::Method ||
+ Completion.Kind == CompletionItemKind::Constructor) &&
+ NextTokenKind == tok::l_paren)
+ return "";
auto *Snippet = onlyValue<&BundledEntry::SnippetSuffix>();
if (!Snippet)
// All bundles are function calls.
@@ -489,6 +498,7 @@
bool EnableFunctionArgSnippets;
/// When false, no snippets are generated argument lists.
bool GenerateSnippets;
+ tok::TokenKind NextTokenKind;
};
// Determine the symbol ID for a Sema code completion result, if possible.
@@ -1221,6 +1231,10 @@
CompletionRecorder *Recorder = nullptr;
CodeCompletionContext::Kind CCContextKind = CodeCompletionContext::CCC_Other;
bool IsUsingDeclaration = false;
+ // The snippets will not be generated if the token following completion
+ // location is an opening parenthesis (tok::l_paren) because this would add
+ // extra parenthesis.
+ tok::TokenKind NextTokenKind = tok::eof;
// Counters for logging.
int NSema = 0, NIndex = 0, NSemaAndIndex = 0, NIdent = 0;
bool Incomplete = false; // Would more be available with a higher limit?
@@ -1272,6 +1286,11 @@
assert(Recorder && "Recorder is not set");
CCContextKind = Recorder->CCContext.getKind();
IsUsingDeclaration = Recorder->CCContext.isUsingDeclaration();
+ const auto NextToken = Lexer::findNextToken(
+ Recorder->CCSema->getPreprocessor().getCodeCompletionLoc(),
+ Recorder->CCSema->getSourceManager(), Recorder->CCSema->LangOpts);
+ if (NextToken)
+ NextTokenKind = NextToken->getKind();
auto Style = getFormatStyleForFile(SemaCCInput.FileName,
SemaCCInput.ParseInput.Contents,
SemaCCInput.ParseInput.FS.get());
@@ -1692,8 +1711,8 @@
if (!Builder)
Builder.emplace(Recorder ? &Recorder->CCSema->getASTContext() : nullptr,
Item, SemaCCS, QueryScopes, *Inserter, FileName,
- CCContextKind, Opts,
- /*GenerateSnippets=*/!IsUsingDeclaration);
+ CCContextKind, Opts, !IsUsingDeclaration,
+ NextTokenKind);
else
Builder->add(Item, SemaCCS);
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
