tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

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
This commit is contained in:
John Herrlin 2021-01-26 08:19:19 +01:00 committed by Ian Martins
parent bc511b1cb8
commit f85bef28d9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ob-java.el
View File

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