From 5ed9a6b5a5dad3563a4aeab0fe3b79f92b3d59d8 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Thu, 26 May 2016 15:00:56 -0400 Subject: [PATCH 1/4] Remove obsolete mplist tests The mplist functions were removed in the 2.0 refactoring (4ae584f3ff0e9bda05420ec3b8598e59374b0899). --- test/lisp/use-package/use-package-tests.el | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el index 0644a5ee493..0cd389b20aa 100644 --- a/test/lisp/use-package/use-package-tests.el +++ b/test/lisp/use-package/use-package-tests.el @@ -25,24 +25,6 @@ (require 'ert) (require 'use-package) -(ert-deftest use-package-mplist-get () - (let ((mplist '(:foo bar baz bal :blob plap plup :blam)) - (tests '((:foo . (bar baz bal)) - (:blob . (plap plup)) - (:blam . t) - (:blow . nil)))) - (mapc (lambda (test) - (should - (equal - (use-package-mplist-get mplist - (car test)) - (cdr test)))) - tests))) - -(ert-deftest use-package-mplist-keys () - (should (equal (use-package-mplist-keys - '(:foo bar baz bal :blob plap plup :blam)) - '(:foo :blob :blam)))) ;; Local Variables: ;; indent-tabs-mode: nil From fc57b342991b94640d5ff565a47b5603adec0a6f Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Thu, 26 May 2016 15:08:32 -0400 Subject: [PATCH 2/4] Refactor pair normalizers; add tests for them This is not a pure refactoring, it also fixes a bug where :bind ([keysym] . "string") would actually bind keysym to nil (i.e., unbind it). It now binds to "string" as expected. --- lisp/use-package/use-package.el | 45 ++++++++++------------ test/lisp/use-package/use-package-tests.el | 21 ++++++++++ 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 4928ece0b0d..aeb39b4c343 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -681,47 +681,40 @@ manually updated package." ;; :bind, :bind* ;; -(defsubst use-package-is-sympair (x &optional allow-vector) - "Return t if X has the type (STRING . SYMBOL)." +(defsubst use-package-is-pair (x car-pred cdr-pred) + "Return non-nil if X is a cons satisfying the given predicates. +CAR-PRED and CDR-PRED are applied to X's `car' and `cdr', +respectively." (and (consp x) - (or (stringp (car x)) - (and allow-vector (vectorp (car x)))) - (symbolp (cdr x)))) - -(defsubst use-package-is-string-pair (x) - "Return t if X has the type (STRING . STRING)." - (and (consp x) - (stringp (car x)) - (stringp (cdr x)))) + (funcall car-pred (car x)) + (funcall cdr-pred (cdr x)))) (defun use-package-normalize-pairs - (name label arg &optional recursed allow-vector allow-string-cdrs) - "Normalize a list of string/symbol pairs. -If RECURSED is non-nil, recurse into sublists. -If ALLOW-VECTOR is non-nil, then the key to bind may specify a -vector of keys, as accepted by `define-key'. -If ALLOW-STRING-CDRS is non-nil, then the command name to bind to -may also be a string, as accepted by `define-key'." + (key-pred val-pred name label arg &optional recursed) + "Normalize a list of pairs. +KEY-PRED and VAL-PRED are predicates recognizing valid keys and +values, respectively. +If RECURSED is non-nil, recurse into sublists." (cond - ((or (stringp arg) (and allow-vector (vectorp arg))) + ((funcall key-pred arg) (list (cons arg (use-package-as-symbol name)))) - ((use-package-is-sympair arg allow-vector) + ((use-package-is-pair arg key-pred val-pred) (list arg)) ((and (not recursed) (listp arg) (listp (cdr arg))) (mapcar #'(lambda (x) (let ((ret (use-package-normalize-pairs - name label x t allow-vector allow-string-cdrs))) + key-pred val-pred name label x t))) (if (listp ret) (car ret) ret))) arg)) - ((and allow-string-cdrs (use-package-is-string-pair arg)) - (list arg)) (t arg))) (defun use-package-normalize-binder (name keyword args) (use-package-as-one (symbol-name keyword) args (lambda (label arg) - (use-package-normalize-pairs name label arg nil t t)))) + (use-package-normalize-pairs (lambda (k) (or (stringp k) (vectorp k))) + (lambda (b) (or (symbolp b) (stringp b))) + name label arg)))) (defalias 'use-package-normalize/:bind 'use-package-normalize-binder) (defalias 'use-package-normalize/:bind* 'use-package-normalize-binder) @@ -809,7 +802,9 @@ deferred until the prefix key sequence is pressed." (defun use-package-normalize-mode (name keyword args) (use-package-as-one (symbol-name keyword) args - (apply-partially #'use-package-normalize-pairs name))) + (apply-partially #'use-package-normalize-pairs + #'stringp #'symbolp + name))) (defalias 'use-package-normalize/:interpreter 'use-package-normalize-mode) diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el index 0cd389b20aa..aa9f542a803 100644 --- a/test/lisp/use-package/use-package-tests.el +++ b/test/lisp/use-package/use-package-tests.el @@ -25,6 +25,27 @@ (require 'ert) (require 'use-package) +(ert-deftest use-package-normalize-binder () + (let ((good-values '(:map map-sym + ("str" . sym) ("str" . "str") + ([vec] . sym) ([vec] . "str")))) + (should (equal (use-package-normalize-binder + 'foopkg :bind good-values) + good-values))) + (should-error (use-package-normalize-binder + 'foopkg :bind '("foo" . 99))) + (should-error (use-package-normalize-binder + 'foopkg :bind '(99 . sym)))) + +(ert-deftest use-package-normalize-mode () + (should (equal (use-package-normalize-mode 'foopkg :mode '(".foo")) + '((".foo" . foopkg)))) + (should (equal (use-package-normalize-mode 'foopkg :mode '(".foo" ".bar")) + '((".foo" . foopkg) (".bar" . foopkg)))) + (should (equal (use-package-normalize-mode 'foopkg :mode '((".foo" ".bar"))) + '((".foo" . foopkg) (".bar" . foopkg)))) + (should (equal (use-package-normalize-mode 'foopkg :mode '((".foo" . foo) (".bar" . bar))) + '((".foo" . foo) (".bar" . bar))))) ;; Local Variables: ;; indent-tabs-mode: nil From 65c7b42a14c5ad42d4b6c6e6547c793e0ccbfe80 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Thu, 26 May 2016 15:09:46 -0400 Subject: [PATCH 3/4] Don't allow nil as a mode function This means (use-package foopkg :mode (".foo")) will add (".foo" . foopkg) into auto-mode-alist instead of the broken (".foo" . nil), this is more consistent with the behaviour of (use-package foopkg :mode (".foo" ".bar")). --- lisp/use-package/use-package.el | 2 +- test/lisp/use-package/use-package-tests.el | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index aeb39b4c343..96137c3c78d 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -803,7 +803,7 @@ deferred until the prefix key sequence is pressed." (defun use-package-normalize-mode (name keyword args) (use-package-as-one (symbol-name keyword) args (apply-partially #'use-package-normalize-pairs - #'stringp #'symbolp + #'stringp (lambda (m) (and (not (null m)) (symbolp m))) name))) (defalias 'use-package-normalize/:interpreter 'use-package-normalize-mode) diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el index aa9f542a803..d3deef995b1 100644 --- a/test/lisp/use-package/use-package-tests.el +++ b/test/lisp/use-package/use-package-tests.el @@ -44,6 +44,8 @@ '((".foo" . foopkg) (".bar" . foopkg)))) (should (equal (use-package-normalize-mode 'foopkg :mode '((".foo" ".bar"))) '((".foo" . foopkg) (".bar" . foopkg)))) + (should (equal (use-package-normalize-mode 'foopkg :mode '((".foo"))) + '((".foo" . foopkg)))) (should (equal (use-package-normalize-mode 'foopkg :mode '((".foo" . foo) (".bar" . bar))) '((".foo" . foo) (".bar" . bar))))) From 9688d2f64bd01b86a98ccd87138e6fc0a345e62b Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Fri, 5 Aug 2016 18:43:34 -0400 Subject: [PATCH 4/4] Don't allow implicit package name arg for binders It's unlikely that (use-package foopkg :bind "") intendes to bind to 'foopkg command. --- lisp/use-package/use-package.el | 4 ++++ test/lisp/use-package/use-package-tests.el | 2 ++ 2 files changed, 6 insertions(+) diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 96137c3c78d..f99a3767777 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -712,6 +712,10 @@ If RECURSED is non-nil, recurse into sublists." (defun use-package-normalize-binder (name keyword args) (use-package-as-one (symbol-name keyword) args (lambda (label arg) + (unless (consp arg) + (use-package-error + (concat label " a ( . )" + " or list of these"))) (use-package-normalize-pairs (lambda (k) (or (stringp k) (vectorp k))) (lambda (b) (or (symbolp b) (stringp b))) name label arg)))) diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el index d3deef995b1..00682e9e0fc 100644 --- a/test/lisp/use-package/use-package-tests.el +++ b/test/lisp/use-package/use-package-tests.el @@ -32,6 +32,8 @@ (should (equal (use-package-normalize-binder 'foopkg :bind good-values) good-values))) + (should-error (use-package-normalize-binder + 'foopkg :bind '("foo"))) (should-error (use-package-normalize-binder 'foopkg :bind '("foo" . 99))) (should-error (use-package-normalize-binder