don't expand text param templates if the param's value is the empty s…

…tring
tek · Jun 28, 2024 · d573e24 · d573e24
1 parent 8f38fa3
commit d573e24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/myo/lib/Myo/Command/CommandSpec.hs b/packages/myo/lib/Myo/Command/CommandSpec.hs
@@ -104,7 +104,9 @@ compileParam lookup noParam dynamic sub ptag seg = do
     (ParamOptional, UndefinedParam) -> pure ""
     (ParamOptional, DefinedParam t) -> dynamic ptag t
     (ParamTemplate _, UndefinedParam) -> pure ""
-    (ParamTemplate _, DefinedParam _) -> sub
+    (ParamTemplate _, DefinedParam t)
+      | Text.null t -> pure ""
+      | otherwise -> sub
     (ParamFlagTemplate _, UndefinedParam) -> pure ""
     (ParamFlagTemplate _, DefinedParam True) -> sub
     (ParamFlagTemplate _, DefinedParam False) -> pure ""

diff --git a/packages/test/test/Myo/Test/Command/CommandMenuTest.hs b/packages/test/test/Myo/Test/Command/CommandMenuTest.hs
@@ -64,11 +64,12 @@ commandEdit =
   Command.consSpec (CommandInterpreter.System Nothing) "1" spec
   where
     spec = CommandSpec tpl (coerce params)
-    tpl = parseCommandTemplate' ["{par1} {par2}"]
+    tpl = parseCommandTemplate' ["{par1} {par2}{par4:sub}"]
 
 editEvents :: [PromptEvent]
 editEvents =
   [
+    Mapping "k",
     Mapping "k",
     Mapping "e",
     Update "nest: {par3}",