[clangd] Check preceding char when completion triggers on ':' or '>'
Summary:
Only run completion when we were trigerred on '->' and '::', otherwise
send an error code in return.
To avoid automatically invoking completions in cases like 'a >^' or
'a ? b :^'.
Reviewers: hokein
Reviewed By: hokein
Subscribers: ioeric, MaskRay, jkorous, arphaman, kadircet, cfe-commits
Differential Revision: https://reviews.llvm.org/D55994
llvm-svn: 350304
diff --git a/clang-tools-extra/clangd/Protocol.cpp b/clang-tools-extra/clangd/Protocol.cpp
index 972ba25..fd94ca7 100644
--- a/clang-tools-extra/clangd/Protocol.cpp
+++ b/clang-tools-extra/clangd/Protocol.cpp
@@ -550,6 +550,29 @@
O.map("position", R.position);
}
+bool fromJSON(const llvm::json::Value &Params, CompletionContext &R) {
+ json::ObjectMapper O(Params);
+ if (!O)
+ return false;
+
+ int triggerKind;
+ if (!O.map("triggerKind", triggerKind))
+ return false;
+ R.triggerKind = static_cast<CompletionTriggerKind>(triggerKind);
+
+ if (auto *TC = Params.getAsObject()->get("triggerCharacter"))
+ return fromJSON(*TC, R.triggerCharacter);
+ return true;
+}
+
+bool fromJSON(const llvm::json::Value &Params, CompletionParams &R) {
+ if (!fromJSON(Params, static_cast<TextDocumentPositionParams &>(R)))
+ return false;
+ if (auto *Context = Params.getAsObject()->get("context"))
+ return fromJSON(*Context, R.context);
+ return true;
+}
+
static StringRef toTextKind(MarkupKind Kind) {
switch (Kind) {
case MarkupKind::PlainText: