[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/javaimp 81f0fd4 26/32: [javaimp] Minor corrections.
From: |
Stefan Monnier |
Subject: |
[elpa] externals/javaimp 81f0fd4 26/32: [javaimp] Minor corrections. |
Date: |
Tue, 1 Dec 2020 10:08:31 -0500 (EST) |
branch: externals/javaimp
commit 81f0fd4274bbab3ebc9c06d9a56e9590d20fa198
Author: Filipp Gunbin <fgunbin@fastmail.fm>
Commit: Filipp Gunbin <fgunbin@fastmail.fm>
[javaimp] Minor corrections.
* Add javax as separate entry in javaimp-import-group-alist.
* (javaimp-add-import): move (barf-if-buffer-read-only) outside interactive
form.
---
javaimp.el | 50 ++++++++++++++++++++++++--------------------------
1 file changed, 24 insertions(+), 26 deletions(-)
diff --git a/javaimp.el b/javaimp.el
index e00c956..bf1c1fc 100644
--- a/javaimp.el
+++ b/javaimp.el
@@ -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] externals/javaimp 88f1376 27/32: [javaimp] Bump version to 0.6.1, (continued)
- [elpa] externals/javaimp 88f1376 27/32: [javaimp] Bump version to 0.6.1, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 084153c 29/32: packages/javaimp/javaimp.el: Add News section, bump version to 0.7, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 3c95c22 32/32: * .gitignore: New file, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp d9f891b 25/32: javaimp.el: Fill :file module slot in a separate step., Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 5b37a9a 18/32: packages/javaimp: cosmetic fixes, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 736c1d9 19/32: packages/javaimp: whitespace/doc fixes, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp e2c3393 20/32: * packages/javaimp/javaimp.el (javaimp): Add a parent group, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 753245e 21/32: packages/javaimp: Restructure code, add some tests., Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 0e30ce9 16/32: packages/javaimp: full rewrite, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 2e65079 17/32: packages/javaimp: temporary revert version, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 81f0fd4 26/32: [javaimp] Minor corrections.,
Stefan Monnier <=
- [elpa] externals/javaimp 04fd94c 28/32: [javaimp]: Support gradle, split into multiple files, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 2c9373d 31/32: [javaimp] bump version to 0.7.1, Stefan Monnier, 2020/12/01
- [elpa] externals/javaimp 6fa1de1 30/32: [javaimp] Fix gradle project id output & parsing., Stefan Monnier, 2020/12/01