From 48e88950e1fce966da112e5f06cede74113d00e0 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Fri, 29 Dec 2017 16:32:43 -0800 Subject: [PATCH] Complete CompletionItemKind --- src/clang_complete.cc | 8 ++++++-- src/language_server_api.h | 9 ++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/clang_complete.cc b/src/clang_complete.cc index 68b7536c..d30f1ac2 100644 --- a/src/clang_complete.cc +++ b/src/clang_complete.cc @@ -109,7 +109,6 @@ lsCompletionItemKind GetCompletionKind(CXCursorKind cursor_kind) { case CXCursor_ClassTemplate: case CXCursor_ClassTemplatePartialSpecialization: case CXCursor_ClassDecl: - case CXCursor_StructDecl: case CXCursor_UsingDeclaration: case CXCursor_TypedefDecl: case CXCursor_TypeAliasDecl: @@ -121,7 +120,6 @@ lsCompletionItemKind GetCompletionKind(CXCursorKind cursor_kind) { case CXCursor_ObjCCategoryImplDecl: return lsCompletionItemKind::Class; - case CXCursor_EnumConstantDecl: case CXCursor_EnumDecl: return lsCompletionItemKind::Enum; @@ -153,6 +151,12 @@ lsCompletionItemKind GetCompletionKind(CXCursorKind cursor_kind) { case CXCursor_NotImplemented: return lsCompletionItemKind::Text; + case CXCursor_EnumConstantDecl: + return lsCompletionItemKind::EnumMember; + + case CXCursor_StructDecl: + return lsCompletionItemKind::Struct; + default: LOG_S(WARNING) << "Unhandled completion kind " << cursor_kind; return lsCompletionItemKind::Text; diff --git a/src/language_server_api.h b/src/language_server_api.h index 75cc2328..8169f6ef 100644 --- a/src/language_server_api.h +++ b/src/language_server_api.h @@ -324,7 +324,14 @@ enum class lsCompletionItemKind { Snippet = 15, Color = 16, File = 17, - Reference = 18 + Reference = 18, + Folder = 19, + EnumMember = 20, + Constant = 21, + Struct = 22, + Event = 23, + Operator = 24, + TypeParameter = 25, }; MAKE_REFLECT_TYPE_PROXY(lsCompletionItemKind, int);