Merge branch 'feature/java-lsp-improvements' into 'master'

Java mode indentation has been fixed

See merge request FG42/FG42!8
This commit is contained in:
Sameer Rahmani 2019-12-24 13:57:02 +00:00
commit 69f8af017c
3 changed files with 7 additions and 2 deletions

View File

@ -223,9 +223,9 @@
(ability yas ()
"Snippet configuration."
(let ((snippet_home (concat (file-name-directory
(locate-library "yasnippet")) "snippets"))
(locate-library "yasnippet-snippets"))
"snippets"))
(my_snippet (concat fg42-home "/lib/snippets")))
(setq yas-snippet-dirs (list my_snippet snippet_home)))

View File

@ -15,6 +15,7 @@
(with-ability lsp-java
(depends-on 'lsp-java))
;;(depends-on 'dap-java))
(defun java-doc ()

View File

@ -12,6 +12,10 @@
(require 'gradle-mode)
(add-hook 'java-mode-hook
'(lambda()
;; To fix the indentation of function arguments
(c-set-offset 'arglist-intro '+)
(setq java-basic-offset 2)
(setq c-basic-offset 2)
(ability lsp-java ('lsp)
(setq lsp-java-server-install-dir fg42-tmp)
(lsp))