From aad8ec1895714f4fec6abfe444c9a69b4ee8f308 Mon Sep 17 00:00:00 2001 From: minh Date: Sun, 10 Mar 2024 11:52:34 +0700 Subject: [PATCH] feat(java): java.el takes java-ts-mode into account allow +java-current-package and +java-current-class functions to operate on java-ts-mode (the java tree-sitter mode) not just java-mode. --- modules/lang/java/autoload/java.el | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/lang/java/autoload/java.el b/modules/lang/java/autoload/java.el index ed0ebddcd..82fc4a7f1 100644 --- a/modules/lang/java/autoload/java.el +++ b/modules/lang/java/autoload/java.el @@ -44,8 +44,9 @@ It does this by ignoring everything before the nearest package root (see root)." (cond ((doom-special-buffer-p (current-buffer)) "{PackageName}") - ((not (eq major-mode 'java-mode)) - (user-error "Not in java-mode")) + ((and (not (eq major-mode 'java-mode)) + (not (eq major-mode 'java-ts-mode)) + (user-error "Not in java-mode or java-ts-mode"))) ((when-let (project-root (doom-project-root)) (let* ((project-root (file-truename project-root)) (file-path @@ -73,8 +74,9 @@ root)." "Get the class name for the current file." (cond ((doom-special-buffer-p (current-buffer)) "{ClassName}") - ((not (eq major-mode 'java-mode)) - (user-error "Not in java-mode")) + ((and (not (eq major-mode 'java-mode)) + (not (eq major-mode 'java-ts-mode)) + (user-error "Not in java-mode or java-ts-mode"))) (buffer-file-name (file-name-sans-extension (file-name-base (buffer-file-name)))) ((user-error "Can't deduce the class name"))))