Compare commits

..

No commits in common. "c5bb3799a02bbcd5a7feb03f37bc7bc4732323c7" and "a0002cee56b7ec09d380a2b53b74ac5a3cb064c3" have entirely different histories.

2 changed files with 9 additions and 20 deletions

View File

@ -41,26 +41,16 @@
`(html-web-mode . ,(eglot-alternatives `(html-web-mode . ,(eglot-alternatives
'(("vscode-html-language-server" "--stdio") '(("vscode-html-language-server" "--stdio")
("html-languageserver" "--stdio"))))) ("html-languageserver" "--stdio")))))
;; Custom eglot java server for deeper customization ;; Support jdtls' ability to jump into class files
(defclass eglot-java-server (eglot-lsp-server) ()
:documentation "Eglot integration with JDTLS.")
(add-to-list 'eglot-server-programs (add-to-list 'eglot-server-programs
'(java-mode . '(java-mode . ("jdtls" :initializationOptions
(eglot-java-server .
("jdtls" :initializationOptions
(:extendedClientCapabilities (:extendedClientCapabilities
(:classFileContentsSupport t) (:classFileContentsSupport t)
:runtimes [(:name "JavaSE-11" :runtimes [(:name "JavaSE-11"
:path "/Library/Java/JavaVirtualMachines/amazon-corretto-11.jdk") :path "/Library/Java/JavaVirtualMachines/amazon-corretto-11.jdk")
(:name "JavaSE-17" (:name "JavaSE-17"
:path "/Library/Java/JavaVirtualMachines/amazon-corretto-17.jdk" :path "/Library/Java/JavaVirtualMachines/amazon-corretto-17.jdk"
:default t)]))))) :default t)]))))
;; Fix JDTLS's weird handling of workspaceEdit
(cl-defmethod eglot-execute-command
((_server eglot-java-server) (_cmd (eql java.apply.workspaceEdit)) arguments)
"Eclipse JDT breaks spec and replies with edits as arguments."
(mapc #'eglot--apply-workspace-edit arguments))
;; Support jdtls' ability to jump into class files
(defun jdt-class-file-name-handler (operation &rest args) (defun jdt-class-file-name-handler (operation &rest args)
"File name handler for jdtls' `jdt://' URIs." "File name handler for jdtls' `jdt://' URIs."
(cond (cond

View File

@ -10,7 +10,6 @@ brew "direnv"
brew "ffmpeg" brew "ffmpeg"
brew "git" brew "git"
brew "git-lfs" brew "git-lfs"
brew "go"
brew "gnupg" brew "gnupg"
brew "grpcurl" brew "grpcurl"
brew "isync" brew "isync"