Skip to content

Fix updating eglot-sever-programs when multiple java-related assocs e… #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
heinzfridolin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix updating eglot-sever-programs when multiple java-related assocs e… #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions eglot-java.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,22 +1413,15 @@ DESTINATION-DIR is the directory where the LSP server will be installed."
(setq eglot-java-jdt-uri-handling-patch-applied t))
(unless eglot-java-eglot-server-programs-manual-updates
;; there are multiple allowed syntaxes for mode associations
(let ((existing-java-related-assocs (mapcan (lambda (item)
(if (listp (car item))
(when (member 'java-mode (car item))
(car item))
(when (eq 'java-mode (car item))
(cons (car item) nil))))
(let ((first-java-related-assoc (cl-find-if (lambda (item)
(let ((modes (car item)))
(or (eq modes 'java-mode)
(and (listp modes)
(memq 'java-mode modes)))))
eglot-server-programs)))
(if existing-java-related-assocs
(let ((eff-existing-java-related-assocs (if (= 1 (length existing-java-related-assocs))
(if (assq existing-java-related-assocs eglot-server-programs)
existing-java-related-assocs
(car existing-java-related-assocs))
existing-java-related-assocs)))
(unless (eq 'eglot-java--eclipse-contact (assq eff-existing-java-related-assocs eglot-server-programs))
(setcdr (assoc eff-existing-java-related-assocs eglot-server-programs) 'eglot-java--eclipse-contact)))
(add-to-list eglot-server-programs 'java-mode 'eglot-java--eclipse-contact))))
(if first-java-related-assoc
(setcdr first-java-related-assoc 'eglot-java--eclipse-contact)
(add-to-list eglot-server-programs '((java-mode java-ts-mode) eglot-java--eclipse-contact)))))
(unless (member 'eglot-java--project-try project-find-functions)
(add-to-list 'project-find-functions 'eglot-java--project-try t)))))

Expand Down