mirror of
https://gitlab.com/dwt1/dotfiles.git
synced 2026-04-23 11:30:23 +10:00
Minor edits.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
;;; lang/java/+lsp.el -*- lexical-binding: t; -*-
|
||||
;;;###if (featurep! +lsp)
|
||||
;;;###if (and (featurep! +lsp) (not (featurep! :tools lsp +eglot)))
|
||||
|
||||
(use-package! lsp-java
|
||||
:after lsp-mode
|
||||
|
||||
@@ -26,8 +26,9 @@ If the depth is 2, the first two directories are removed: net.lissner.game.")
|
||||
|
||||
(add-hook 'java-mode-hook #'rainbow-delimiters-mode)
|
||||
|
||||
(cond ((featurep! +lsp) (load! "+lsp"))
|
||||
((featurep! +meghanada) (load! "+meghanada")))
|
||||
(cond ((featurep! +meghanada) (load! "+meghanada"))
|
||||
((featurep! :tools lsp +eglot))
|
||||
((featurep! +lsp) (load! "+lsp")))
|
||||
|
||||
|
||||
;;
|
||||
|
||||
@@ -7,3 +7,7 @@
|
||||
|
||||
(unless (executable-find "javac")
|
||||
(warn! "Couldn't find the javac executable, are you sure the JDK is installed?"))
|
||||
|
||||
(when (featurep! :editor format)
|
||||
(unless (executable-find "clang-format")
|
||||
(warn! "Couldn't find clang-format. Code formatting will not work.")))
|
||||
|
||||
@@ -13,4 +13,5 @@
|
||||
(package! company-emacs-eclim :pin "222ddd48fcf0ee01592dec77c58e0cf3f2ea1100")))
|
||||
|
||||
(when (featurep! +lsp)
|
||||
(package! lsp-java :pin "260016236fa0520b5b6ec7f51ca2086288524cba"))
|
||||
(unless (featurep! :tools lsp +eglot)
|
||||
(package! lsp-java :pin "3f1ed1762fd7cb2fece606df6fc63d35d0a6b835")))
|
||||
|
||||
Reference in New Issue
Block a user