improve(commands): make sure the same command isn't created twice

Walheimat · Nov 1, 2024 · f7fa03d · f7fa03d
1 parent c64a8b2
commit f7fa03d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ship-mate.el b/ship-mate.el
@@ -989,7 +989,7 @@ command."
          (prompt-var (intern (format "ship-mate-%s-prompt" name)))
          (key (ship-mate-command--key-for-command name key)))
 
-    `(progn
+    `(unless (memq ',name (ship-mate--plist-keys ship-mate-commands))
        ,@(delq
           nil
           `((defvar-local ,default-var ,default ,(format "Default for `%s'." function-name))

diff --git a/test/ship-mate-test.el b/test/ship-mate-test.el
@@ -572,7 +572,7 @@
            (:mock ship-mate-command--key-for-command :return key))
       (bydi-match-expansion
        (ship-mate-create-command test)
-       '(progn
+       '(unless (memq 'test (ship-mate--plist-keys ship-mate-commands))
           (defvar-local ship-mate-test-default-cmd nil "Default for `ship-mate-test'.")
           (defvar-local ship-mate-test-prompt nil "Whether `ship-mate-test' should prompt.")
           (defun ship-mate-test (&optional arg) "Test the current project.\n\nSee `ship-mate-command' for behavior of ARG."
@@ -587,7 +587,7 @@
 
       (bydi-match-expansion
        (ship-mate-create-command test :key "C-o" :default "make all" :prompt t)
-       '(progn
+       '(unless (memq 'test (ship-mate--plist-keys ship-mate-commands))
           (defvar-local ship-mate-test-default-cmd "make all" "Default for `ship-mate-test'.")
           (defvar-local ship-mate-test-prompt t "Whether `ship-mate-test' should prompt.")
           (defun ship-mate-test (&optional arg) "Test the current project.\n\nSee `ship-mate-command' for behavior of ARG."
@@ -602,7 +602,7 @@
 
       (bydi-match-expansion
        (ship-mate-create-command test :multiple t)
-       '(progn
+       '(unless (memq 'test (ship-mate--plist-keys ship-mate-commands))
           (defvar-local ship-mate-test-default-cmd nil "Default for `ship-mate-test'.")
           (defvar-local ship-mate-test-prompt nil "Whether `ship-mate-test' should prompt.")
           (defun ship-mate-test (&optional arg) "Test the current project.\n\nSee `ship-mate-command' for behavior of ARG."
@@ -619,7 +619,7 @@
       (setq key nil)
       (bydi-match-expansion
        (ship-mate-create-command test)
-       '(progn
+       '(unless (memq 'test (ship-mate--plist-keys ship-mate-commands))
           (defvar-local ship-mate-test-default-cmd nil "Default for `ship-mate-test'.")
           (defvar-local ship-mate-test-prompt nil "Whether `ship-mate-test' should prompt.")
           (defun ship-mate-test (&optional arg) "Test the current project.\n\nSee `ship-mate-command' for behavior of ARG."