Use lsp-protocol.el

Author: yyoncho

README.md

@@ -53,19 +53,11 @@ Then add the following lines to your `.emacs` and open a file from the any of th
 ### Quick start
 Minimal configuration with [company-lsp](https://github.com/tigersoldier/company-lsp) and [lsp-ui](https://github.com/emacs-lsp/lsp-ui) and [dap-mode](https://github.com/yyoncho/dap-mode/). Now you can explore the methods under `lsp-java-*`, `dap-java-*`, `dap-*`, and `lsp-*`
 ```elisp
-(require 'cc-mode)
+(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
 
-(condition-case nil
-    (require 'use-package)
-  (file-error
-   (require 'package)
-   (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
-   (package-initialize)
-   (package-refresh-contents)
-   (package-install 'use-package)
-   (require 'use-package)))
-
-(setq use-package-always-ensure t)
+(when (not (package-installed-p 'use-package))
+  (package-refresh-contents)
+  (package-install 'use-package))
 
 (use-package projectile)
 (use-package flycheck)
@@ -77,7 +69,7 @@ Minimal configuration with [company-lsp](https://github.com/tigersoldier/company
 (use-package lsp-ui)
 (use-package which-key :config (which-key-mode))
 (use-package lsp-java :config (add-hook 'java-mode-hook 'lsp))
-(use-package dap-mode :after lsp-mode :config (dap-mode t) (dap-ui-mode t))
+(use-package dap-mode :after lsp-mode :config (dap-auto-configure-mode))
 (use-package dap-java :ensure nil)
 (use-package helm-lsp)
 (use-package helm

lsp-java-boot.el

@@ -41,6 +41,10 @@
 
 (defvar lsp-java-boot--callback nil)
 
+(eval-when-compile
+  (lsp-interface
+   (boot:Lenses (:doc :codeLenses))))
+
 (defun lsp-java-boot--find-tools-jar ()
   "Calculate the path to tools.jar."
   (let ((tools-jar (or lsp-java-boot-java-tools-jar
@@ -54,7 +58,7 @@
   (with-lsp-workspace (lsp-find-workspace 'jdtls nil)
     (lsp-request "workspace/executeCommand"
                  (list :command "sts.java.addClasspathListener"
-                       :arguments (gethash "callbackCommandId" params))
+                       :arguments (lsp-get params :callbackCommandId))
                  :no-wait t)))
 
 (defun lsp-java-boot--sts-add-classpath-listener (_workspace params)
@@ -63,7 +67,7 @@
    (with-lsp-workspace (lsp-find-workspace 'jdtls nil)
      (lsp-request "workspace/executeCommand"
                   (list :command "sts.java.addClasspathListener"
-                        :arguments (gethash "callbackCommandId" params))
+                        :arguments (lsp-get params :callbackCommandId))
                   :no-wait t))))
 
 (defun lsp-java-boot--lens-backend (_ callback)
@@ -99,19 +103,19 @@ Store CALLBACK to use it `sts/highlight'."
 (defun lsp-java-boot--sts-hightlight (workspace params)
   "WORKSPACE PARAMS."
   (with-lsp-workspace workspace
-    (-let (((&hash "doc" (&hash "uri" "version") "codeLenses" code-lenses) params))
+    (-let (((&boot:Lenses :doc (&VersionedTextDocumentIdentifier :uri :version?) :code-lenses) params))
       (when-let (buf (find-buffer-visiting (lsp--uri-to-path uri)))
         (with-current-buffer buf
           (when (and lsp-java-boot--callback lsp-java-boot-lens-mode)
-            (funcall lsp-java-boot--callback code-lenses version)))))))
+            (funcall lsp-java-boot--callback code-lenses version?)))))))
 
 (defun lsp-java-boot--server-jar ()
   "Return the spring boot jar."
   (or (-> lsp-java-server-install-dir
           (expand-file-name)
           (f-join "boot-server")
-          f-files
-          cl-first)
+          (f-files)
+          (cl-first))
       (lsp-log "Unable to find spring boot server jar.")))
 
 (defun lsp-java-boot--ls-command (port)
@@ -140,11 +144,6 @@ Store CALLBACK to use it `sts/highlight'."
                                          ("sts/javadocHoverLink" #'lsp-java-boot--sts-javadoc-hover-link))
                   :notification-handlers  (ht ("sts/highlight" #'lsp-java-boot--sts-hightlight)
                                               ("sts/progress" #'ignore))
-                  :initialized-fn (lambda (workspace)
-                                    (puthash
-                                     "triggerCharacters"
-                                     '("." "@" "#" "*")
-                                     (gethash "completionProvider" (lsp--workspace-server-capabilities workspace))))
                   :multi-root t
                   :add-on? t
                   :server-id 'boot-ls