mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 19:37:52 +00:00
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:
parent
bc511b1cb8
commit
f85bef28d9
|
@ -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")))))
|
||||
|
|
Loading…
Reference in a new issue