aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2019-05-28 07:57:27 -0700
committerGravatar Tom Willemse2019-05-28 07:57:27 -0700
commitba82b2a87d61b0440688c235883b307efd3409ff (patch)
tree50103ff2cc709f1dc2210ac88ba230a9d958e4b5
parentb3f2604de1f400d31e3c45c40b96fca3bdcee000 (diff)
downloademacs-config-ba82b2a87d61b0440688c235883b307efd3409ff.tar.gz
emacs-config-ba82b2a87d61b0440688c235883b307efd3409ff.zip
Move the ‘lsp-java’ data to a better location
-rw-r--r--oni-java.el16
1 files changed, 13 insertions, 3 deletions
diff --git a/oni-java.el b/oni-java.el
index ec5ed7e..319b2a2 100644
--- a/oni-java.el
+++ b/oni-java.el
@@ -4,8 +4,8 @@
;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local
-;; Version: 20190421175627
-;; Package-Requires: (oni-fci lsp-java company-lsp lsp-ui)
+;; Version: 20190528071542
+;; Package-Requires: (oni-fci oni-data-dir lsp-java company-lsp lsp-ui)
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -26,12 +26,22 @@
;;; Code:
-(with-eval-after-load 'lsp (require 'lsp-java))
+(require 'lsp-java)
+(require 'oni-data-dir)
(defun oni-java-enable-buffer-formatting ()
"Format the buffer before save."
(add-hook 'before-save-hook 'lsp-format-buffer nil :local))
+(setq lsp-java-server-install-dir
+ (oni-data-dir-locate "lsp-java/server/"))
+
+(setq lsp-java-workspace-dir
+ (oni-data-dir-locate "lsp-java/workspace/"))
+
+(setq lsp-java-workspace-cache-dir
+ (oni-data-dir-locate "lsp-java/workspace/cache/"))
+
(add-hook 'java-mode-hook 'electric-pair-local-mode)
(add-hook 'java-mode-hook 'electric-indent-local-mode)
(add-hook 'java-mode-hook 'fci-mode)