wip: redesign dispatch menu

Author: wbolster

python-pytest.el

@@ -120,34 +120,41 @@ When non-nil only ‘test_foo()’ will match, and nothing else."
 (define-transient-command python-pytest-dispatch ()
   "Show popup for running pytest."
   :man-page "pytest"
+  :incompatible '(("--exitfirst" "--maxfail="))
   :value '("--color")
-  ["Switches"
-   ("-c" "color" "--color")
-   ("-d" "run doctests" "--doctest-modules")
-   ("-f" "failed first" "--failed-first")
-   ("-l" "show locals" "--showlocals")
+  ["Output"
+   [("-c" "color" "--color")
+    ("-q" "quiet" "--quiet")
+    (python-pytest:-v)
+    ("-l" "show locals" "--showlocals")
+    ("-s" "no output capture" "--capture=no")]
+   [("--ft" "full tracebacks" "--full-trace")
+    (python-pytest:--tb)]]
+  ["Test selection"
+   [("--dm" "run doctests" "--doctest-modules")
+    ("-k" "only names matching expression" "-k=")
+    ("-m" "only marks matching expression" "-m=")]
+   [("--ff" "failed first" "--failed-first")
+    ("--nf" "new first" "--new-first")
+    ("--sw" "stepwise" "--stepwise")
+    ("--rx" "run xfail tests" "--runxfail")]]
+  ["Exit early"
+   ("-x" "exit after first failure" "--exitfirst")
+   ("--mf" "exit after N failures or errors" "--maxfail=")]
+  ["Debugger"
    ("-p" "debug on error" "--pdb")
-   ("-q" "quiet" "--quiet")
-   ("-s" "do not capture output" "--capture=no")
-   ("-t" "do not cut tracebacks" "--full-trace")
-   (python-pytest:-v)
-   ("-x" "exit after first failure" "--exitfirst")]
-  ["Options"
-   ("=k" "only names matching expression" "-k=")
-   ("=m" "only marks matching expression" "-m=")
-   (python-pytest:--tb)
-   ("=x" "exit after N failures or errors" "--maxfail=")]
+   ("--tr" "debug on each test" "--trace")]
   [["Run tests"
-    ("t" "Test all" python-pytest)
-    ("r" "Repeat last test run" python-pytest-repeat)
-    ("x" "Test last-failed" python-pytest-last-failed)]
-   ["Run tests for specific files"
-    ("f" "Test file (dwim)" python-pytest-file-dwim)
-    ("F" "Test this file" python-pytest-file)
-    ("m" "Test multiple files" python-pytest-files)]
-   ["Run tests for current function/class"
-    ("d" "Test def/class (dwim)" python-pytest-function-dwim)
-    ("D" "Test this def/class" python-pytest-function)]])
+    ("t" "Test" python-pytest)
+    ("r" "Repeat" python-pytest-repeat)
+    ("x" "Last failed" python-pytest-last-failed)]
+   [""
+    ("f" "File (dwim)" python-pytest-file-dwim)
+    ("F" "This file" python-pytest-file)
+    ("m" "Multiple files" python-pytest-files)]
+   [""
+    ("d" "def/class (dwim)" python-pytest-function-dwim)
+    ("D" "This def/class" python-pytest-function)]])
 
 (define-obsolete-function-alias 'python-pytest-popup 'python-pytest-dispatch)
 
@@ -435,7 +442,7 @@ When present ON-REPLACEMENT is substituted, else OFF-REPLACEMENT is appended."
 (transient-define-argument python-pytest:--tb ()
   :description "traceback style"
   :class 'transient-option
-  :key "=t"
+  :key "--tb"
   :argument "--tb="
   :choices '("long" "short" "line" "native" "no"))