[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 4a83f36 5/5: Merge commit '53bcfc9e49f6306ac3e911a9de3d4a2
From: |
Stephen Leake |
Subject: |
[elpa] master 4a83f36 5/5: Merge commit '53bcfc9e49f6306ac3e911a9de3d4a2a74c70f95' |
Date: |
Fri, 1 Feb 2019 18:12:08 -0500 (EST) |
branch: master
commit 4a83f363e201198a098f347cdc8a12bc1047470e
Merge: 02764f9 53bcfc9
Author: Stephen Leake <address@hidden>
Commit: Stephen Leake <address@hidden>
Merge commit '53bcfc9e49f6306ac3e911a9de3d4a2a74c70f95'
---
packages/javaimp/javaimp.el | 52 ++++++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 27 deletions(-)
diff --git a/packages/javaimp/javaimp.el b/packages/javaimp/javaimp.el
index e00c956..8a3f4f3 100644
--- a/packages/javaimp/javaimp.el
+++ b/packages/javaimp/javaimp.el
@@ -4,7 +4,7 @@
;; Author: Filipp Gunbin <address@hidden>
;; Maintainer: Filipp Gunbin <address@hidden>
-;; Version: 0.6
+;; Version: 0.6.1
;; Keywords: java, maven, programming
;; This program is free software; you can redistribute it and/or modify
@@ -94,7 +94,7 @@
"Add and reorder Java import statements in Maven projects"
:group 'c)
-(defcustom javaimp-import-group-alist '(("\\`javax?\\." . 10))
+(defcustom javaimp-import-group-alist '(("\\`java\\." . 10) ("\\`javax\\." .
15))
"Specifies how to group classes and how to order resulting
groups in the imports list.
@@ -568,31 +568,29 @@ duplicated. Completion alternatives are constructed
based on
this module's dependencies' classes, JDK classes and top-level
classes in the current module."
(interactive
- (progn
- (barf-if-buffer-read-only)
- (let* ((file (expand-file-name
- (or buffer-file-name
- (error "Buffer is not visiting a file!"))))
- (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))))
- (error "Cannot find module by file: %s" file))))
- (javaimp--maven-update-module-maybe node)
- (let ((module (javaimp-node-contents node)))
- (list (completing-read
- "Import: "
- (append
- ;; we're not caching full list of classes coming from module
- ;; dependencies because jars may change and we need to reload
- ;; them
- (let ((jars (append (javaimp-module-dep-jars module)
- (javaimp--get-jdk-jars))))
- (apply #'seq-concatenate 'list
- (mapcar #'javaimp--get-jar-classes jars)))
- (and javaimp-include-current-module-classes
- (javaimp--get-module-classes module)))
- nil t nil nil (symbol-name (symbol-at-point))))))))
+ (let* ((file (expand-file-name (or buffer-file-name
+ (error "Buffer is not visiting a
file!"))))
+ (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))))
+ (error "Cannot find module by file: %s" file))))
+ (javaimp--maven-update-module-maybe node)
+ (let ((module (javaimp-node-contents node)))
+ (list (completing-read
+ "Import: "
+ (append
+ ;; we're not caching full list of classes coming from module
+ ;; dependencies because jars may change and we need to reload
+ ;; them
+ (let ((jars (append (javaimp-module-dep-jars module)
+ (javaimp--get-jdk-jars))))
+ (apply #'seq-concatenate 'list
+ (mapcar #'javaimp--get-jar-classes jars)))
+ (and javaimp-include-current-module-classes
+ (javaimp--get-module-classes module)))
+ nil t nil nil (symbol-name (symbol-at-point)))))))
+ (barf-if-buffer-read-only)
(javaimp-organize-imports (cons classname 'ordinary)))
(defun javaimp--get-module-classes (module)
- [elpa] master updated (53bcfc9 -> 4a83f36), Stephen Leake, 2019/02/01
- [elpa] master 3b3ca82 3/5: Fix bugs, add tests in uniquify-files, Stephen Leake, 2019/02/01
- [elpa] master 02764f9 4/5: Improve uniquify-files-test.el, improve uniquify-files to handle new tests, Stephen Leake, 2019/02/01
- [elpa] master a323e93 2/5: In uniquify-files, handle list tables, refactor code, update tests, Stephen Leake, 2019/02/01
- [elpa] master 16390ac 1/5: In path-iterator, add new function and test, Stephen Leake, 2019/02/01
- [elpa] master 4a83f36 5/5: Merge commit '53bcfc9e49f6306ac3e911a9de3d4a2a74c70f95',
Stephen Leake <=