Prepare lsp-mode for :company-candidate-kind (#1995)

- company-mode is about to introduce :candidate-kind, see discussion at:

company-mode/company-mode#996

Author: yyoncho

lsp-completion.el

@@ -240,6 +240,38 @@ Also, additional data to attached to each candidate can be passed via PLIST."
       lsp-items)
     (-map (lambda (item) (apply #'lsp-completion--make-item item plist))))))
 
+(defconst lsp-completion--kind->symbol
+  '((1 . text)
+    (2 . method)
+    (3 . function)
+    (4 . constructor)
+    (5 . field)
+    (6 . variable)
+    (7 . class)
+    (8 . interface)
+    (9 . module)
+    (10 . property)
+    (11 . unit)
+    (12 . value)
+    (13 . enum)
+    (14 . keyword)
+    (15 . snippet)
+    (16 . color)
+    (17 . file)
+    (18 . reference)
+    (19 . folder)
+    (20 . enum-member)
+    (21 . constant)
+    (22 . struct)
+    (23 . event)
+    (24 . operator)
+    (25 . type-parameter)))
+
+(defun lsp-completion--candidate-kind (item)
+  "Return ITEM's kind."
+  (alist-get (lsp:completion-item-kind? (get-text-property 0 'lsp-completion-item item))
+             lsp-completion--kind->symbol))
+
 (defun lsp-completion--capf-company-match (candidate)
   "Return highlight of typed prefix inside CANDIDATE."
   (let* ((prefix (downcase
@@ -406,6 +438,7 @@ Also, additional data to attached to each candidate can be passed via PLIST."
           ;; retrieve candidates
           (t (funcall all-completions))))
        :annotation-function #'lsp-completion--annotate
+       :company-candidate-kind #'lsp-completion--candidate-kind
        :company-require-match 'never
        :company-prefix-length
        (save-excursion

test/lsp-completion-test.el

@@ -0,0 +1,37 @@
+;;; lsp-completion-test.el --- lsp-completion tests  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2020  Ivan Yonchovski
+
+;; Author: Ivan Yonchovski <[email protected]>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(require 'lsp-completion)
+(require 'ert)
+
+(ert-deftest lsp-completion-test-candidate-kind ()
+  (should (eq (lsp-completion--candidate-kind
+               (propertize " " 'lsp-completion-item
+                           (lsp-make-completion-item :kind 3)))
+              'function)))
+
+(provide 'lsp-completion-test)
+;;; lsp-completion-test.el ends here