;; Quick start:
;;
;; - customize `javaimp-import-group-alist'
-;;
;; - call `javaimp-maven-visit-project', giving it the top-level project
;; directory where pom.xml resides
;;
;; This module does not add all needed imports automatically! It only helps
;; you to quickly add imports when stepping through compilation errors.
;;
-;;
;; Some details:
-;;
+;;
;; If Maven failed, you can see its output in the buffer named by
;; `javaimp-debug-buf-name' (default is "*javaimp-debug*").
;;
;; Contents of jar files and Maven project structures (pom.xml) are cached,
-;; so usually only first command should take a considerable amount of time
-;; to complete. If a modules's pom.xml or any of its parents' pom.xml was
-;; changed (i.e. any of them was modified after information was loaded),
-;; `mvn dependency:build-classpath' is re-run on the current module. If a
-;; jar file was changed, its contents are re-read.
-;;
-;; If you make some changes which change project hierarchy, you should
-;; re-visit the parent again with `javaimp-maven-visit-project'.
+;; so usually only the first command should take a considerable amount of
+;; time to complete. If a module's pom.xml or any of its parents' pom.xml
+;; (within visited tree) was modified after information was loaded, `mvn
+;; dependency:build-classpath' is re-run on the current module. If a jar
+;; file was changed, its contents are re-read.
;;
;; Currently inner classes are filtered out from completion alternatives.
;; You can always import top-level class and use qualified name.
-;;
+;;
;;
;; Example of initialization:
-;;
+;;
;; (require 'javaimp)
-;;
+;;
;; (add-to-list 'javaimp-import-group-alist
;; '("\\`\\(my\\.company\\.\\|my\\.company2\\.\\)" . 80))
-;;
+;;
;; (setq javaimp-additional-source-dirs '("generated-sources/thrift"))
-;;
+;;
;; (add-hook 'java-mode-hook
;; (lambda ()
;; (local-set-key "\C-ci" 'javaimp-add-import)
;; (local-set-key "\C-co" 'javaimp-organize-imports)))
-;;
-;;
+;;
+;;
;; TODO:
-;;
+;;
;; - use functions `cygwin-convert-file-name-from-windows' and
;; `cygwin-convert-file-name-to-windows' when they are available instead of
-;; calling `cygpath'. See https://cygwin.com/ml/cygwin/2013-03/msg00228.html.
+;; calling `cygpath'. See https://cygwin.com/ml/cygwin/2013-03/msg00228.html
;;
-;; - save/restore state
+;; - save/restore state, on restore check if a root exists and delete it if
+;; not
;;
;; - `javaimp-add-import': without prefix arg narrow alternatives by local name;
;; with prefix arg include all classes in alternatives
-;;
+;;
+;; - :type for defcustom
;;; Code:
;; User options
(defgroup javaimp ()
- "Add and reorder Java import statements in Maven projects")
+ "Add and reorder Java import statements in Maven projects"
+ :group 'c)
(defcustom javaimp-import-group-alist '(("\\`javax?\\." . 10))
"Specifies how to group classes and how to order resulting
"Defines the order of classes which were not matched by
`javaimp-import-group-alist'")
-(defcustom javaimp-jdk-home (getenv "JAVA_HOME")
- "Path to the JDK. It is used to find JDK jars to scan. By
-default, it is set from the JAVA_HOME environment variable.")
+(defcustom javaimp-java-home (getenv "JAVA_HOME")
+ "Path to the JDK. Directory jre/lib underneath this path is
+searched for JDK libraries. By default, it is initialized from
+the JAVA_HOME environment variable.")
(defcustom javaimp-additional-source-dirs nil
"List of directories where additional (e.g. generated)
;; Variables and constants
(defvar javaimp-project-forest nil
- "Visited projects.")
+ "Visited projects")
(defvar javaimp-cached-jars nil
"Alist of cached jars. Each element is of the form (FILE
(nth 5 (file-attributes file)))
(defun javaimp--get-jdk-jars ()
- (if javaimp-jdk-home
- (let ((jre-lib-dir
- (concat (file-name-as-directory javaimp-jdk-home)
- (file-name-as-directory "jre")
- (file-name-as-directory "lib"))))
- (directory-files jre-lib-dir t "\\.jar\\'"))))
+ (and javaimp-java-home
+ (file-accessible-directory-p javaimp-java-home)
+ (let ((lib-dir
+ (concat (file-name-as-directory javaimp-java-home)
+ (file-name-as-directory "jre")
+ (file-name-as-directory "lib"))))
+ (directory-files lib-dir t "\\.jar\\'"))))
(defun javaimp-cygpath-convert-maybe (path &optional mode is-really-path)
"On Cygwin, converts PATH using cygpath according to MODE and
After being processed by this command, the module tree becomes
known to javaimp and `javaimp-add-import' maybe called inside any
module file."
- (interactive "DVisit maven project: ")
+ (interactive "DVisit maven project in directory: ")
(let ((file (expand-file-name
(concat (file-name-as-directory path) "pom.xml"))))
(unless (file-readable-p file)
(message "Loaded tree for %s" file)))
\f
-;; Maven XML routines
+;; Maven XML routines
(defun javaimp--maven-xml-load-tree (file)
"Invokes `mvn help:effective-pom' on FILE and using its output
inheritance are not included."
(let ((xml-tree (javaimp--maven-xml-read-effective-pom file)))
(cond ((assq 'project xml-tree)
- (let ((project-elt (assq 'project xml-tree))
- (submodules (javaimp--xml-children
- (javaimp--xml-child 'modules project-elt) 'module)))
+ (let* ((project-elt (assq 'project xml-tree))
+ (submodules (javaimp--xml-children
+ (javaimp--xml-child 'modules project-elt)
+ 'module)))
(and submodules
;; no real children
(message "Independent submodules: %s"
(message "Reading classes in file: %s" file)
(with-temp-buffer
(let ((coding-system-for-read (and (eq system-type 'cygwin) 'utf-8-dos)))
- ;; On Cygwin, "jar" is a Windows program, so file path needs to be
+ ;; on cygwin, "jar" is a windows program, so file path needs to be
;; converted appropriately.
(process-file javaimp-jar-program nil t nil
;; `jar' accepts commands/options as a single string
result))))
\f
-;; Some API functions
-
-(defun javaimp-get-all-modules ()
- (javaimp-select-nodes (lambda (module) t)))
+;; Tree search routines
-(defun javaimp-find-node (predicate)
- (javaimp--find-in-forest javaimp-project-forest predicate))
+(defun javaimp--find-node (predicate)
+ (javaimp--find-node-in-forest javaimp-project-forest predicate))
-(defun javaimp-select-nodes (predicate)
- (javaimp--select-from-forest javaimp-project-forest predicate))
+(defun javaimp--select-nodes (predicate)
+ (javaimp--select-nodes-from-forest javaimp-project-forest predicate))
-\f
-;; Tree search routines
-
-(defun javaimp--find-in-forest (forest predicate)
+(defun javaimp--find-node-in-forest (forest predicate)
(catch 'found
(dolist (tree forest)
- (javaimp--find-node tree predicate))))
+ (javaimp--find-node-in-tree tree predicate))))
-(defun javaimp--find-node (tree predicate)
+(defun javaimp--find-node-in-tree (tree predicate)
(if tree
(progn (if (funcall predicate (javaimp-node-contents tree))
(throw 'found tree))
(dolist (child (javaimp-node-children tree))
- (javaimp--find-node child predicate)))))
+ (javaimp--find-node-in-tree child predicate)))))
-(defun javaimp--select-from-forest (forest predicate)
+(defun javaimp--select-nodes-from-forest (forest predicate)
(apply #'seq-concatenate 'list
(mapcar (lambda (tree)
- (javaimp--select-nodes tree predicate))
+ (javaimp--select-nodes-from-tree tree predicate))
forest)))
-(defun javaimp--select-nodes (tree predicate)
+(defun javaimp--select-nodes-from-tree (tree predicate)
(if tree
(append (if (funcall predicate (javaimp-node-contents tree))
(list tree))
(apply #'seq-concatenate 'list
(mapcar (lambda (child)
- (javaimp--select-nodes child predicate))
+ (javaimp--select-nodes-from-tree child predicate))
(javaimp-node-children tree))))))
+\f
+;; Some API functions
+
+;; do not expose tree structure, return only modules
+
+(defun javaimp-find-module (predicate)
+ (let ((node (javaimp--find-node predicate)))
+ (and node
+ (javaimp-node-contents node))))
+
+(defun javaimp-select-modules (predicate)
+ (mapcar #'javaimp-node-contents
+ (javaimp--select-nodes predicate)))
+
\f
;;; Adding imports
;;;###autoload
(defun javaimp-add-import (classname)
- "Imports CLASSNAME in the current file. Interactively,
+ "Imports classname in the current file. Interactively,
asks for a class to import, adds import statement and calls
`javaimp-organize-imports'. Import statements are not
duplicated. Completion alternatives are constructed based on
(let* ((file (expand-file-name
(or buffer-file-name
(error "Buffer is not visiting a file!"))))
- (node (or (javaimp-find-node
+ (node (or (javaimp--find-node
(lambda (m)
(or (string-prefix-p (javaimp-module-source-dir m) file)
(string-prefix-p (javaimp-module-test-source-dir m) file))))
"Returns list of top-level classes in current module"
(append
(let ((build-dir (javaimp-module-build-dir module)))
+ ;; additional source dirs
(and (seq-mapcat
(lambda (rel-dir)
(let ((dir (concat build-dir (file-name-as-directory rel-dir))))
(and (file-accessible-directory-p dir)
(javaimp--get-directory-classes dir nil))))
javaimp-additional-source-dirs)))
+ ;; source dir
(let ((dir (javaimp-module-source-dir module)))
(and (file-accessible-directory-p dir)
(javaimp--get-directory-classes dir nil)))
+ ;; test source dir
(let ((dir (javaimp-module-test-source-dir module)))
(and (file-accessible-directory-p dir)
(javaimp--get-directory-classes dir nil)))))
(apply #'seq-concatenate 'list
(mapcar (lambda (subdir)
(let ((name (car subdir)))
- (javaimp--get-directory-classes
+ (javaimp--get-directory-classes
(concat dir (file-name-as-directory name)) (concat prefix name "."))))
- (seq-filter (lambda (file) (and (cadr file) ;only directories
- (null (member (car file) '("." "..")))))
+ (seq-filter (lambda (file)
+ (and (eq (cadr file) t) ;only directories
+ (null (member (car file) '("." "..")))))
(directory-files-and-attributes dir nil nil t))))))
\f
(defun javaimp-organize-imports (&rest new-imports)
"Groups import statements according to the value of
`javaimp-import-group-alist' (which see) and prints resulting
-groups leaving one blank line in between.
+groups leaving one blank line between groups.
-Classes within a single group are ordered in a lexicographic
-order.
+If the file already contains some import statements, this command
+rewrites them, starting with the same place. Else, if the the
+file contains package directive, this command inserts one blank
+line below and then imports. Otherwise, imports are inserted at
+the beginning of buffer.
-Imports not matched by any regexp in `javaimp-import-group-alist'
+Classes within a single group are ordered in a lexicographic
+order. Imports not matched by any regexp in `javaimp-import-group-alist'
are assigned a default order defined by
`javaimp-import-default-order'.
(first (car old-data))
(last (cadr old-data))
(all-imports (append new-imports (cddr old-data))))
- ;; delete old imports, if any
- (if first
+ (if all-imports
(progn
- (goto-char last)
- (forward-line)
- (delete-region first (point))))
- (javaimp--prepare-for-insertion first)
- (setq all-imports
- (delete-duplicates all-imports
- :test (lambda (first second)
- (equal (car first) (car second)))))
- ;; assign order
- (let ((with-order
- (mapcar
- (lambda (import)
- (let ((order (or (assoc-default (car import)
- javaimp-import-group-alist
- 'string-match)
- javaimp-import-default-order)))
- (cons import order)))
- all-imports)))
- (setq with-order
- (sort with-order
- (lambda (first second)
- ;; sort by order, name
- (if (= (cdr first) (cdr second))
- (string< (caar first) (caar second))
- (< (cdr first) (cdr second))))))
- (javaimp--insert-imports with-order)))))
+ ;; delete old imports, if any
+ (if first
+ (progn
+ (goto-char last)
+ (forward-line)
+ (delete-region first (point))))
+ (javaimp--prepare-for-insertion first)
+ (setq all-imports
+ (cl-delete-duplicates
+ all-imports
+ :test (lambda (first second)
+ (equal (car first) (car second)))))
+ ;; assign order
+ (let ((with-order
+ (mapcar
+ (lambda (import)
+ (let ((order (or (assoc-default (car import)
+ javaimp-import-group-alist
+ 'string-match)
+ javaimp-import-default-order)))
+ (cons import order)))
+ all-imports)))
+ (setq with-order
+ (sort with-order
+ (lambda (first second)
+ ;; sort by order, name
+ (if (= (cdr first) (cdr second))
+ (string< (caar first) (caar second))
+ (< (cdr first) (cdr second))))))
+ (javaimp--insert-imports with-order)))
+ (message "Nothing to organize!")))))
(defun javaimp--parse-imports ()
(let (first last list)
;; if there were any imports, we start inserting at the same place
(goto-char start))
((re-search-forward "^\\s-*package\\s-" nil t)
- ;; if there's a package directive, move to the next line, creating it
- ;; if needed
+ ;; if there's a package directive, insert one blank line below and
+ ;; leave point after it
(end-of-line)
(if (eobp)
(insert ?\n)