ian martins <ia...@jhu.edu> writes: >> I found this case: >> And it seems to me that the import regex dont see the asterisk. >> >> I attached a possible patch. > > Thanks again, John. You're right the regex is missing the asterisk > include. Thanks for the patch fixing. This works but it will add > redundant includes if the source block includes something that is also > in the list of classes to automatically include. > > for example, this: > > #+begin_src java :results value > import java.util.*; > return "test"; > #+end_src > > will end up pulling in > > import java.util.List; > import java.util.*; > > It wouldn't hurt anything, but could probably be prevented by changing > the regexp in =org-babel-java--import-maybe= to look for asterisk as > well as =class=. Do you feel like updating the patch? > > [1] https://code.orgmode.org/bzg/org-mode/src/master/lisp/ob-java.el#L314
Here is an updated patch. It seems to work on my cases. Of topic, I am very happy with the latest updates on ob-java and I think it works really good! Thanks for the awesome work Ian! Stay safe!
>From 92c72792fb18a73572ee35d34a5e1d5ce56d8b6a Mon Sep 17 00:00:00 2001 From: John Herrlin <jherr...@gmail.com> Date: Tue, 26 Jan 2021 08:19:19 +0100 Subject: [PATCH] ob-java: Allow import to end with asterisk * lisp/ob-java.el (org-babel-java--imports-re, org-babel-java--import-maybe): Allow import to end with asterisk. TINYCHANGE --- lisp/ob-java.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/ob-java.el b/lisp/ob-java.el index 07ff8e9ab..1f2b980f6 100644 --- a/lisp/ob-java.el +++ b/lisp/ob-java.el @@ -88,7 +88,7 @@ like javac -verbose." "Regexp for the package statement.") (defconst org-babel-java--imports-re (rx line-start (0+ space) "import" (opt (1+ space) "static") - (1+ space) (group (1+ (in alnum ?_ ?.))) ; capture the fully qualified class name + (1+ space) (group (1+ (in alnum ?_ ?. ?*))) ; capture the fully qualified class name (0+ space) ?\; line-end) "Regexp for import statements.") (defconst org-babel-java--class-re (rx line-start (0+ space) (opt (seq "public" (1+ space))) @@ -311,7 +311,8 @@ RESULT-FILE is the temp file to write the result." (goto-char (point-min)) (setq class-found (re-search-forward class nil t)) (goto-char (point-min)) - (setq import-found (re-search-forward (concat "^import .*" package ".*" class ";") nil t)) + (setq import-found + (re-search-forward (concat "^import .*" package ".*\\(?:\\*\\|" class "\\);") nil t)) (when (and class-found (not import-found)) (org-babel-java--move-past org-babel-java--package-re) (insert (concat "import " package "." class ";\n"))))) -- 2.30.0