jdormit/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: jdormit:293281eacab3fb73c7bbf5670b9e3ba971f36ed0
Branches Tags
jdormit:master
..
compare: jdormit:c82bf5510298bcc6694fc2fa0154d375d1df66fa
Branches Tags
jdormit:master

2 Commits
293281eaca ... c82bf55102

Author SHA1 Message Date
Jeremy Dormitzer
c82bf55102 Fix eglot-java contact settings, and add ability to set java agent 2023-05-01 10:13:43 -04:00
Jeremy Dormitzer
cc4557d6fc Don't defer loading elisp libs 2023-05-01 10:13:29 -04:00
2 changed files with 24 additions and 21 deletions
Show Stats Expand all files Collapse all files

24
emacs/.emacs.d/config/init-ide.el
View File

@ -52,20 +52,28 @@
`(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")))))
(defvar eglot-java-java-agent nil
"Java agent JVM arg for eglot JDTLS.")
;; Custom eglot java server for deeper customization ;; Custom eglot java server for deeper customization
(defclass eglot-java-server (eglot-lsp-server) () (defclass eglot-java-server (eglot-lsp-server) ()
:documentation "Eglot integration with JDTLS.") :documentation "Eglot integration with JDTLS.")
(add-to-list 'eglot-server-programs (defun eglot-java-contact (&optional interactive)
'(java-mode . `(eglot-java-server .
(eglot-java-server . ("jdtls" ,(if (s-blank? eglot-java-java-agent)
("jdtls" :initializationOptions ""
(:extendedClientCapabilities (format "--jvm-arg=-javaagent:%s" eglot-java-java-agent))
(:classFileContentsSupport t) :initializationOptions
:runtimes [(:name "JavaSE-11" (:extendedClientCapabilities (:classFileContentsSupport t)
:settings
(:java
(:home "/Library/Java/JavaVirtualMachines/amazon-corretto-17.jdk/Contents/Home"
:configuration
(: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)])))))))
(add-to-list 'eglot-server-programs '(java-mode . eglot-java-contact))
;; Fix JDTLS's weird handling of workspaceEdit ;; Fix JDTLS's weird handling of workspaceEdit
(cl-defmethod eglot-execute-command (cl-defmethod eglot-execute-command
((_server eglot-java-server) (_cmd (eql java.apply.workspaceEdit)) arguments) ((_server eglot-java-server) (_cmd (eql java.apply.workspaceEdit)) arguments)

15
emacs/.emacs.d/config/init-lib.el
View File

@ -30,23 +30,18 @@
deferred:timeout deferred:timeout
deferred:process)) deferred:process))
(use-package s (use-package s)
:defer t)
(use-package dash (use-package dash)
:defer t)
(use-package dash-functional (use-package dash-functional)
:defer t)
(use-package f (use-package f)
:defer t)
(use-package request (use-package request
:commands request) :commands request)
(use-package ht (use-package ht)
:defer t)
;; Elisp utilities ;; Elisp utilities
(defun make-process-sentinel (success err) (defun make-process-sentinel (success err)