diff --git a/modules/lang/java/+meghanada.el b/modules/lang/java/+meghanada.el index 4b7fe91cf..70fc4d404 100644 --- a/modules/lang/java/+meghanada.el +++ b/modules/lang/java/+meghanada.el @@ -10,19 +10,12 @@ meghanada-use-eldoc t meghanada-use-auto-start t) - (add-hook 'java-mode-hook #'rainbow-delimiters-mode) - - ;; Setup on first use - (unless (bound-and-true-p byte-compile-current-file) - (meghanada-install-server) - (if (file-exists-p (meghanada--locate-server-jar)) - (add-hook! 'meghanada-mode-hook #'(flycheck-mode eldoc-mode)) - (warn "java-mode: meghanada-server not installed, java-mode will run with reduced functionality"))) - (set! :jump 'java-mode :definition #'meghanada-jump-declaration :references #'meghanada-reference) + (add-hook! 'meghanada-mode-hook #'(flycheck-mode eldoc-mode)) + ;; (def-menu! +java/refactor-menu "Refactoring commands for `java-mode' buffers." diff --git a/modules/lang/java/config.el b/modules/lang/java/config.el index e96aaee00..8194c7923 100644 --- a/modules/lang/java/config.el +++ b/modules/lang/java/config.el @@ -1,5 +1,7 @@ ;;; lang/java/config.el -*- lexical-binding: t; -*- +(add-hook 'java-mode-hook #'rainbow-delimiters-mode) + (cond ((featurep! +meghanada) (load! +meghanada)) ((featurep! +eclim) ; FIXME lang/java +eclim ;;(load! +eclim)