diff options
author | Ilya Biryukov <ibiryukov@google.com> | 2017-10-23 06:06:21 +0000 |
---|---|---|
committer | Ilya Biryukov <ibiryukov@google.com> | 2017-10-23 06:06:21 +0000 |
commit | 4081446cdfc5d90eda67d29f9f0a9dcf1f50efec (patch) | |
tree | 5c55962cef468bb19c3922eb604f6dcd5172e907 | |
parent | 84a5e9b2193877729c0ba0fc9301604b9dd1f642 (diff) |
[clangd] Report proper kinds for 'Keyword' and 'Snippet' completion items.
Reviewers: rwols, malaperle, krasimir, bkramer, sammccall
Reviewed By: rwols, sammccall
Subscribers: klimek, cfe-commits
Differential Revision: https://reviews.llvm.org/D38720
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@316311 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | clangd/ClangdUnit.cpp | 22 | ||||
-rw-r--r-- | test/clangd/completion-items-kinds.test | 37 |
2 files changed, 56 insertions, 3 deletions
diff --git a/clangd/ClangdUnit.cpp b/clangd/ClangdUnit.cpp index a476eeb7..14eac6c2 100644 --- a/clangd/ClangdUnit.cpp +++ b/clangd/ClangdUnit.cpp @@ -268,8 +268,8 @@ template <class T> bool futureIsReady(std::shared_future<T> const &Future) { namespace { -CompletionItemKind getKind(CXCursorKind K) { - switch (K) { +CompletionItemKind getKindOfDecl(CXCursorKind CursorKind) { + switch (CursorKind) { case CXCursor_MacroInstantiation: case CXCursor_MacroDefinition: return CompletionItemKind::Text; @@ -311,6 +311,22 @@ CompletionItemKind getKind(CXCursorKind K) { } } +CompletionItemKind getKind(CodeCompletionResult::ResultKind ResKind, + CXCursorKind CursorKind) { + switch (ResKind) { + case CodeCompletionResult::RK_Declaration: + return getKindOfDecl(CursorKind); + case CodeCompletionResult::RK_Keyword: + return CompletionItemKind::Keyword; + case CodeCompletionResult::RK_Macro: + return CompletionItemKind::Text; // unfortunately, there's no 'Macro' + // completion items in LSP. + case CodeCompletionResult::RK_Pattern: + return CompletionItemKind::Snippet; + } + llvm_unreachable("Unhandled CodeCompletionResult::ResultKind."); +} + std::string escapeSnippet(const llvm::StringRef Text) { std::string Result; Result.reserve(Text.size()); // Assume '$', '}' and '\\' are rare. @@ -395,7 +411,7 @@ private: ProcessChunks(CCS, Item); // Fill in the kind field of the CompletionItem. - Item.kind = getKind(Result.CursorKind); + Item.kind = getKind(Result.Kind, Result.CursorKind); FillSortText(CCS, Item); diff --git a/test/clangd/completion-items-kinds.test b/test/clangd/completion-items-kinds.test new file mode 100644 index 00000000..8ad7cfa7 --- /dev/null +++ b/test/clangd/completion-items-kinds.test @@ -0,0 +1,37 @@ +# RUN: clangd -enable-snippets -run-synchronously < %s | FileCheck %s
+# It is absolutely vital that this file has CRLF line endings.
+#
+Content-Length: 125
+
+{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{},"trace":"off"}}
+Content-Length: 220
+
+{"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"file:///main.cpp","languageId":"cpp","version":1,"text":"#define MACRO X\nint variable;\nstruct Struct {};\n int function();\nint X = "}}}
+Content-Length: 148
+
+{"jsonrpc":"2.0","id":1,"method":"textDocument/completion","params":{"textDocument":{"uri":"file:///main.cpp"},"position":{"line":4,"character":7}}}
+Content-Length: 58
+# CHECK: {"jsonrpc":"2.0","id":1,"result":[
+#
+# Keyword
+# CHECK-DAG: {"label":"int","kind":14,"sortText":"000050int","filterText":"int","insertText":"int","insertTextFormat":1}
+#
+# Code pattern
+# CHECK-DAG: {"label":"static_cast<type>(expression)","kind":15,"sortText":"000040static_cast","filterText":"static_cast","insertText":"static_cast<${1:type}>(${2:expression})","insertTextFormat":2}
+#
+# Struct
+# CHECK-DAG: {"label":"Struct","kind":7,"sortText":"000050Struct","filterText":"Struct","insertText":"Struct","insertTextFormat":1}
+#
+# Macro
+# CHECK-DAG: {"label":"MACRO","kind":1,"sortText":"000070MACRO","filterText":"MACRO","insertText":"MACRO","insertTextFormat":1}
+#
+# Variable
+# CHECK-DAG: {"label":"variable","kind":6,"detail":"int","sortText":"000012variable","filterText":"variable","insertText":"variable","insertTextFormat":1}
+#
+# Function
+# CHECK-DAG: {"label":"function()","kind":3,"detail":"int","sortText":"000012function","filterText":"function","insertText":"function()","insertTextFormat":1}
+#
+#
+# CHECK: ]}
+
+{"jsonrpc":"2.0","id":3,"method":"shutdown","params":null}
|