From 2c0efc655013049ee5b1a679d760cb568a58b8c9 Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Mon, 23 Dec 2019 13:35:52 +0000 Subject: [PATCH 1/3] Java mode indentation has been fixed --- lib/extensions/development/init.el | 4 ++-- lib/extensions/java.el | 1 + lib/extensions/java/init.el | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/extensions/development/init.el b/lib/extensions/development/init.el index 79ff373..7a21d9a 100644 --- a/lib/extensions/development/init.el +++ b/lib/extensions/development/init.el @@ -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))) diff --git a/lib/extensions/java.el b/lib/extensions/java.el index 5d378ca..4928643 100644 --- a/lib/extensions/java.el +++ b/lib/extensions/java.el @@ -15,6 +15,7 @@ (with-ability lsp-java (depends-on 'lsp-java)) + ;;(depends-on 'dap-java)) (defun java-doc () diff --git a/lib/extensions/java/init.el b/lib/extensions/java/init.el index 8ed5ae0..c380c7f 100644 --- a/lib/extensions/java/init.el +++ b/lib/extensions/java/init.el @@ -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)) From 1d8dd0e564bfa4317c2e40a315fcc4013ad8c7e5 Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Tue, 24 Dec 2019 13:24:23 +0000 Subject: [PATCH 2/3] Method call style has been changed in java mode --- lib/extensions/java/init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/extensions/java/init.el b/lib/extensions/java/init.el index c380c7f..3d8f0fe 100644 --- a/lib/extensions/java/init.el +++ b/lib/extensions/java/init.el @@ -16,6 +16,7 @@ (c-set-offset 'arglist-intro '+) (setq java-basic-offset 2) (setq c-basic-offset 2) + (setq c-offsets-alist '((arglist-cont-nonempty . +))) (ability lsp-java ('lsp) (setq lsp-java-server-install-dir fg42-tmp) (lsp)) From cf3ed5d787b439026343b0658368bb4faf541a81 Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Tue, 24 Dec 2019 13:54:51 +0000 Subject: [PATCH 3/3] Wrong arglist indentation has been removed for java mode --- lib/extensions/java/init.el | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/extensions/java/init.el b/lib/extensions/java/init.el index 3d8f0fe..c380c7f 100644 --- a/lib/extensions/java/init.el +++ b/lib/extensions/java/init.el @@ -16,7 +16,6 @@ (c-set-offset 'arglist-intro '+) (setq java-basic-offset 2) (setq c-basic-offset 2) - (setq c-offsets-alist '((arglist-cont-nonempty . +))) (ability lsp-java ('lsp) (setq lsp-java-server-install-dir fg42-tmp) (lsp))