yogsototh/doom-emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat(java): java.el takes java-ts-mode into account

Browse source 
allow +java-current-package and +java-current-class functions to operate
on java-ts-mode (the java tree-sitter mode) not just java-mode.
This commit is contained in:
minh 2024-03-10 11:52:34 +07:00 committed by Yann Esposito (Yogsototh)
parent 651313a09b
commit e986f4769b
Signed by untrusted user who does not match committer: yogsototh
GPG key ID: 7B19A4C650D59646
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/lang/java/autoload/java.el
View file

@ -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"))))