Merge pull request #2961 from williamthome/feat/bash-completion-file-support

Add file completion support for bash completion

Author: ferd

apps/rebar/src/rebar_completion_bash.erl

@@ -82,13 +82,24 @@ main(Commands, #{shell:=bash, aliases:=Aliases}) ->
     "           cmdsnvars=\"",lists:join(" \\\n", CmdNames),"\"\n",
     "       ",[cmd_clause(Cmd) || Cmd <- Commands],
     "       fi\n",
-    "    COMPREPLY=( $(compgen -W \"${sopts} ${lopts} ${cmdsnvars} \" -- ${cur}) )\n",
-    "    if [ -n \"$COMPREPLY\" ] ; then\n",
-    "        # append space if matched\n",
-    "       COMPREPLY=\"${COMPREPLY} \"\n",
-    "        # remove trailing space after equal sign\n",
-    "        COMPREPLY=${COMPREPLY/%= /=}\n",
+    "    \n",
+    "    # File completion for commands that accept file arguments\n",
+    "    if [[ (${prev1} == ct || ${prev1} == eunit) && \"$cur\" != -* ]]; then\n",
+    "        # Complete with .erl files and directories for test commands\n",
+    "        COMPREPLY=( $(compgen -f -X '!*.erl' -- ${cur}) $(compgen -d -- ${cur}) )\n",
+    "    elif [[ (${prev1} == completion || ${prev1} == shell || ${prev1} == tar) && \"$cur\" != -* ]]; then\n",
+    "        # Complete with files and directories for other file-accepting commands\n",
+    "        COMPREPLY=( $(compgen -f -- ${cur}) $(compgen -d -- ${cur}) )\n",
+    "    else\n",
+    "        COMPREPLY=( $(compgen -W \"${sopts} ${lopts} ${cmdsnvars} \" -- ${cur}) )\n",
     "    fi\n",
+    "    \n",
+    "    # If no completions found, fall back to normal completion\n",
+    "    if [ ${#COMPREPLY[@]} -eq 0 ]; then\n",
+    "        COMPREPLY=( $(compgen -W \"${sopts} ${lopts} ${cmdsnvars} \" -- ${cur}) )\n",
+    "    fi\n",
+    "    \n",
+    "    # Let bash handle spacing naturally\n",
     "    return 0\n",
     "}\n"].
 
@@ -110,4 +121,4 @@ cmd_depth([_ | Rest],Depth,Max) ->
 
 complete(#{shell:=bash, aliases:=Aliases}) ->
     Triggers = ["rebar3" | Aliases],
-    [["complete -o nospace -F _rebar3 ", Trigger, "\n"] || Trigger <- Triggers].
+    [["complete -o filenames -F _rebar3 ", Trigger, "\n"] || Trigger <- Triggers].

apps/rebar/test/rebar_completion_SUITE.erl

@@ -9,7 +9,7 @@ suite() ->
     [].
 
 all() ->
-    [test_completion_gen, check_bash, check_zsh].
+    [test_completion_gen, check_bash, check_zsh, check_bash_file_completion].
 
 groups() ->
     [].
@@ -30,6 +30,13 @@ init_per_testcase(check_bash, Config) ->
         false ->
             {skip, "bash not found"}
     end;
+init_per_testcase(check_bash_file_completion, Config) ->
+    case shell_available(bash) of
+        true ->
+            rebar_test_utils:init_rebar_state(Config, "completion_");
+        false ->
+            {skip, "bash not found"}
+    end;
 init_per_testcase(check_zsh, Config) ->
     case shell_available(zsh) of
         true ->
@@ -69,7 +76,7 @@ check_bash(Config) ->
     %% function definition
     {match, _} = re:run(Completion, "_rebar3\\(\\)\\{"),
     %% aliases
-    CompleteCmd = "complete -o nospace -F _rebar3 ",
+    CompleteCmd = "complete -o filenames -F _rebar3 ",
     lists:foreach(fun(Alias) ->
                     ?assertMatch({Alias, {match, _}}, {Alias, re:run(Completion, CompleteCmd++Alias++"\n")})
                   end,
@@ -91,6 +98,27 @@ check_zsh(Config) ->
                   end,
                   ["rebar3" | Aliases]).
 
+check_bash_file_completion(Config) ->
+    ComplFile = ?config(compl_file, Config),
+    Opts = #{shell => bash, file => ComplFile},
+    completion_gen(Config, Opts),
+    {ok, Completion} = file:read_file(ComplFile),
+    
+    %% Check that file completion logic is present for ct and eunit
+    {match, _} = re:run(Completion, "\\$\\{prev1\\} == ct \\|\\| \\$\\{prev1\\} == eunit"),
+    
+    %% Check that .erl file completion is included
+    {match, _} = re:run(Completion, "compgen -f -X '!\\*\\.erl'"),
+    
+    %% Check that directory completion is included
+    {match, _} = re:run(Completion, "compgen -d"),
+    
+    %% Check that other file-accepting commands are handled
+    {match, _} = re:run(Completion, "\\$\\{prev1\\} == completion \\|\\| \\$\\{prev1\\} == shell \\|\\| \\$\\{prev1\\} == tar"),
+    
+    %% Check that fallback completion is present
+    {match, _} = re:run(Completion, "If no completions found, fall back to normal completion").
+
 %% helpers
 
 completion_gen(Config, CmplOpts) ->