From 3e7624cfc0ded1aa21b1d927da9101921040ae68 Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Wed, 6 May 2020 23:49:05 +0900 Subject: [PATCH 1/5] Add Groovy REPL support --- modules/lang/java/autoload.el | 6 ++++++ modules/lang/java/config.el | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/lang/java/autoload.el b/modules/lang/java/autoload.el index 86e06f26c..88b8b1d31 100644 --- a/modules/lang/java/autoload.el +++ b/modules/lang/java/autoload.el @@ -71,3 +71,9 @@ root)." (user-error "This buffer has no filepath; cannot guess its class name")) (or (file-name-sans-extension (file-name-base (buffer-file-name))) "ClassName")) + +;;;###autoload +(defun +java/groovy-open-repl () + (interactive) + (call-interactively #'run-groovy) + (pop-to-buffer groovy-buffer)) diff --git a/modules/lang/java/config.el b/modules/lang/java/config.el index 5e6dee5fd..ba5c00454 100644 --- a/modules/lang/java/config.el +++ b/modules/lang/java/config.el @@ -45,4 +45,5 @@ If the depth is 2, the first two directories are removed: net.lissner.game.") (use-package! groovy-mode :mode "\\.g\\(?:radle\\|roovy\\)$" :config - (set-eval-handler! 'groovy-mode "groovy")) + (set-eval-handler! 'groovy-mode "groovy") + (set-repl-handler! 'groovy-mode #'+java/groovy-open-repl)) From c3d22346ada7ff190fe0c32944bb8b050bdb9ca7 Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Wed, 6 May 2020 23:50:45 +0900 Subject: [PATCH 2/5] Set the docsets for Groovy --- modules/lang/java/config.el | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/lang/java/config.el b/modules/lang/java/config.el index ba5c00454..55242c7b1 100644 --- a/modules/lang/java/config.el +++ b/modules/lang/java/config.el @@ -45,5 +45,6 @@ If the depth is 2, the first two directories are removed: net.lissner.game.") (use-package! groovy-mode :mode "\\.g\\(?:radle\\|roovy\\)$" :config + (set-docsets! 'groovy-mode "Groovy" "Groovy_SDK") (set-eval-handler! 'groovy-mode "groovy") (set-repl-handler! 'groovy-mode #'+java/groovy-open-repl)) From 0e4f2fa578ce414186411b0ff6caf14140414346 Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Wed, 6 May 2020 23:53:37 +0900 Subject: [PATCH 3/5] Add doc for +java/groovy-open-repl --- modules/lang/java/autoload.el | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/lang/java/autoload.el b/modules/lang/java/autoload.el index 88b8b1d31..1ced3b749 100644 --- a/modules/lang/java/autoload.el +++ b/modules/lang/java/autoload.el @@ -74,6 +74,7 @@ root)." ;;;###autoload (defun +java/groovy-open-repl () + "Open a Groovy REPL." (interactive) (call-interactively #'run-groovy) (pop-to-buffer groovy-buffer)) From 849ca9b79f46f49b9e87a62198a5c75baaa4094c Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Thu, 7 May 2020 01:19:57 +0900 Subject: [PATCH 4/5] Fix typo: Groovy_SDK -> Groovy_JDK --- modules/lang/java/config.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lang/java/config.el b/modules/lang/java/config.el index 55242c7b1..f02a82992 100644 --- a/modules/lang/java/config.el +++ b/modules/lang/java/config.el @@ -45,6 +45,6 @@ If the depth is 2, the first two directories are removed: net.lissner.game.") (use-package! groovy-mode :mode "\\.g\\(?:radle\\|roovy\\)$" :config - (set-docsets! 'groovy-mode "Groovy" "Groovy_SDK") + (set-docsets! 'groovy-mode "Groovy" "Groovy_JDK") (set-eval-handler! 'groovy-mode "groovy") (set-repl-handler! 'groovy-mode #'+java/groovy-open-repl)) From d89e90190e451f120686a8dfad6b264f93ff6360 Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Thu, 7 May 2020 01:22:26 +0900 Subject: [PATCH 5/5] Get rid of redundant pop-to-buffer --- modules/lang/java/autoload.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lang/java/autoload.el b/modules/lang/java/autoload.el index 1ced3b749..f95d128f2 100644 --- a/modules/lang/java/autoload.el +++ b/modules/lang/java/autoload.el @@ -77,4 +77,4 @@ root)." "Open a Groovy REPL." (interactive) (call-interactively #'run-groovy) - (pop-to-buffer groovy-buffer)) + (get-buffer groovy-buffer))