usaxena95 updated this revision to Diff 248233.
usaxena95 marked 3 inline comments as done.
usaxena95 added a comment.
Changed to invoke callback on all code completion items.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D75603/new/
https://reviews.llvm.org/D75603
Files:
clang-tools-extra/clangd/CodeComplete.cpp
clang-tools-extra/clangd/CodeComplete.h
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
@@ -29,7 +29,9 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include <condition_variable>
+#include <functional>
#include <mutex>
+#include <vector>
namespace clang {
namespace clangd {
@@ -1041,6 +1043,24 @@
EXPECT_THAT(Completions, Contains(Named("TT")));
}
+TEST(CompletionTest, EnableInstrumentationMode) {
+ std::vector<CodeCompletion> RecordedCompletions;
+ std::function<void(const CodeCompletion &, const SymbolQualitySignals &,
+ const SymbolRelevanceSignals &)>
+ ResultRecorder =
+ [&RecordedCompletions](const CodeCompletion &CC,
+ const SymbolQualitySignals &,
+ const SymbolRelevanceSignals &) -> void {
+ RecordedCompletions.push_back(CC);
+ };
+ CodeCompleteOptions Opts;
+ Opts.RecordCCResult = &ResultRecorder;
+
+ completions("int xy1, xy2; int a = xy^", /*IndexSymbols=*/{}, Opts);
+ EXPECT_THAT(RecordedCompletions,
+ UnorderedElementsAre(Named("xy1"), Named("xy2")));
+}
+
SignatureHelp signatures(llvm::StringRef Text, Position Point,
std::vector<Symbol> IndexSymbols = {}) {
std::unique_ptr<SymbolIndex> Index;
Index: clang-tools-extra/clangd/CodeComplete.h
===================================================================
--- clang-tools-extra/clangd/CodeComplete.h
+++ clang-tools-extra/clangd/CodeComplete.h
@@ -19,6 +19,7 @@
#include "Logger.h"
#include "Path.h"
#include "Protocol.h"
+#include "Quality.h"
#include "index/Index.h"
#include "index/Symbol.h"
#include "index/SymbolOrigin.h"
@@ -29,12 +30,14 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Error.h"
+#include <functional>
#include <future>
namespace clang {
class NamedDecl;
namespace clangd {
struct PreambleData;
+struct CodeCompletion;
struct CodeCompleteOptions {
/// Returns options that can be passed to clang's completion engine.
@@ -129,6 +132,12 @@
/// Always use text-based completion.
NeverParse,
} RunParser = ParseIfReady;
+
+ /// Allows capturing various internal structures used by clangd during code
+ /// completion. Eg: Symbol quality and relevance signals of all the candidates
+ /// in the output.
+ std::function<void(const CodeCompletion &, const SymbolQualitySignals &,
+ const SymbolRelevanceSignals &)> *RecordCCResult = nullptr;
};
// Semi-structured representation of a code-complete suggestion for our C++ API.
Index: clang-tools-extra/clangd/CodeComplete.cpp
===================================================================
--- clang-tools-extra/clangd/CodeComplete.cpp
+++ clang-tools-extra/clangd/CodeComplete.cpp
@@ -66,6 +66,7 @@
#include "llvm/Support/ScopedPrinter.h"
#include <algorithm>
#include <iterator>
+#include <memory>
// We log detailed candidate here if you run with -debug-only=codecomplete.
#define DEBUG_TYPE "CodeComplete"
@@ -1660,6 +1661,9 @@
? Scores.Total / Relevance.NameMatch
: Scores.Quality;
+ if (Opts.RecordCCResult)
+ (*Opts.RecordCCResult)(toCodeCompletion(Bundle), Quality, Relevance);
+
dlog("CodeComplete: {0} ({1}) = {2}\n{3}{4}\n", First.Name,
llvm::to_string(Origin), Scores.Total, llvm::to_string(Quality),
llvm::to_string(Relevance));
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
