From 9337ab8d40b5f4e8d71cce00984fbfb9a31384f8 Mon Sep 17 00:00:00 2001 From: Lennart Spitzner Date: Fri, 12 Jan 2018 00:08:26 +0100 Subject: [PATCH] Switch to using newlines as separator between completions --- src/UI/Butcher/Monadic/BuiltinCommands.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/UI/Butcher/Monadic/BuiltinCommands.hs b/src/UI/Butcher/Monadic/BuiltinCommands.hs index 4d3ba8e..a82dafc 100644 --- a/src/UI/Butcher/Monadic/BuiltinCommands.hs +++ b/src/UI/Butcher/Monadic/BuiltinCommands.hs @@ -126,7 +126,7 @@ addShellCompletionCommand mainCmdParser = do let lastWord = reverse $ takeWhile (not . Char.isSpace) $ reverse $ inputString rest - putStrLn $ List.intercalate "\t" $ compls <&> \case + putStrLn $ List.unlines $ compls <&> \case CompletionString s -> s CompletionFile -> "$(compgen -f -- " ++ lastWord ++ ")" CompletionDirectory -> "$(compgen -d -- " ++ lastWord ++ ")" @@ -149,13 +149,13 @@ completionScriptBash exeName = List.unlines $ [ "function _" ++ exeName ++ "()" , "{" - , " local IFS=$'\\t'" + , " local IFS=$'\\n'" , " COMPREPLY=()" , " local result=$(" ++ exeName ++ " completion bash-gen \"${COMP_WORDS[@]:1}\")" , " for r in ${result[@]}; do" - , " local IFS=$'\\n\\t '" + , " local IFS=$'\\n '" , " for s in $(eval echo ${r}); do" , " COMPREPLY+=(${s})" , " done"