shell: add shellcmd completion

* complete the first word as a shell command:
  - search for executables in `$PATH`
  - complete explicit executable paths `(./, ../, ~/, /)`
* complete subsequent words as file or directory arguments
* use `shellcmd` completion for `shell-command`,
  `interactive-shell-command` and `compile`
* add `shellcmd_print_entry`
This commit is contained in:
huwwa 2026-07-18 19:27:35 +03:00 • committed by Charlie Gordon
commit ddbc787441
3 changed files with 109 additions and 3 deletions

View file

@ -2045,6 +2045,30 @@ int file_print_entry(CompleteState *cp, EditState *s, const char *name) {
return len;
}
int shellcmd_print_entry(CompleteState *cp, EditState *s, const char *name)
{
EditBuffer *b = s->b;
const char *p;
int len;
qe_skip_spaces(&name);
/* display only the last command argument */
if ((p = strrchr(name, ' ')))
name = p + 1;
if (strend(name, "/", NULL))
b->cur_style = QE_STYLE_DIRED_DIRECTORY;
else
b->cur_style = QE_STYLE_DIRED_FILENAME;
len = eb_put_filename(b, name, dired_pf_flags);
b->tab_width = max3_int(16, len + 2, b->tab_width);
b->cur_style = QE_STYLE_DIRED_DEFAULT;
return len;
}
/*---------------- filelist mode ----------------*/
static char filelist_last_buf[MAX_FILENAME_SIZE];

View file

@ -4469,6 +4469,86 @@ void shell_colorize_line(QEColorizeContext *cp,
}
}
static void shellcmd_complete(CompleteState *cp, CompleteFunc enumerate)
{
char path[MAX_FILENAME_SIZE];
char file[MAX_FILENAME_SIZE];
char buf[MAX_FILENAME_SIZE];
char completion_buf[MAX_FILENAME_SIZE];
const char *current = cp->current, *cmd = current;
const char *p, *start, *path1;
FindFileState *ffst;
int flags = FF_NOXXDIR;
enum { SHC_PATH, SHC_EXPLICIT, SHC_ARGUMENT } completion;
qe_skip_spaces(&cmd);
p = strrchr(cmd, ' ');
start = p ? p + 1 : cmd;
if (!p && !strchr(cmd, '/')) {
completion = SHC_PATH;
flags |= FF_PATH;
pstrcpy(file, sizeof(file), cmd);
path1 = getenv("PATH");
if (!path1)
path1 = "/bin:/usr/bin";
} else {
completion = p ? SHC_ARGUMENT : SHC_EXPLICIT;
splitpath(path, sizeof(path), file, sizeof(file), start);
pstrcpy(buf, sizeof(buf), path);
if (buf[0] == '~')
canonicalize_absolute_path(cp->s, buf, sizeof(buf), path);
path1 = *buf ? buf : ".";
}
pstrcat(file, sizeof(file), "*");
if (cp->fuzzy)
flags |= 1; // recursion level
ffst = find_file_open(path1, file, flags);
while (find_file_next(ffst, buf, sizeof(buf)) == 0) {
struct stat sb;
buf_t out[1];
int is_dir;
if (stat(buf, &sb))
continue;
is_dir = S_ISDIR(sb.st_mode);
switch (completion) {
case SHC_ARGUMENT:
break;
case SHC_EXPLICIT:
if (!is_dir && !(sb.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
continue;
break;
case SHC_PATH:
if (!S_ISREG(sb.st_mode) || !(sb.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
continue;
break;
}
buf_init(out, completion_buf, sizeof(completion_buf));
buf_write(out, current, (int)(start - current));
if (completion != SHC_PATH)
buf_puts(out, path);
buf_puts(out, get_basename(buf));
if (is_dir)
buf_put_byte(out, '/');
(*enumerate)(cp, completion_buf, CT_SET);
}
find_file_close(&ffst);
}
static CompletionDef shellcmd_completion = {
.name = "shellcmd",
.enumerate = shellcmd_complete,
.print_entry = shellcmd_print_entry,
.flags = CF_SPACE_OK | CF_SAVE_LIST,
};
/* shell mode specific commands */
static const CmdDef shell_commands[] = {
CMD0( "shell-toggle-input", "C-o, C-c C-o",
@ -4549,11 +4629,11 @@ static const CmdDef shell_global_commands[] = {
CMD2( "shell-command", "M-!",
"Run a shell command and display a new buffer with its collected output",
do_shell_command, ESs,
"s{Shell command: }|shell-command|")
"s{Shell command: }[shellcmd]|shell-command|")
CMD2( "interactive-shell-command", "",
"Run a shell command interactively and display a new buffer with its collected output",
do_interactive_shell_command, ESs,
"#" "s{Interactive shell command: }|interactive-shell-command|")
"#" "s{Interactive shell command: }[shellcmd]|interactive-shell-command|")
CMD2( "ssh", "",
"Start a shell buffer with a new remote shell connection",
do_ssh, ESs,
@ -4561,7 +4641,7 @@ static const CmdDef shell_global_commands[] = {
CMD2( "compile", "C-x C-e",
"Run a compiler command and display a new buffer with its collected output",
do_compile, ESs,
"#" "s{Compile command: }|compile|")
"#" "s{Compile command: }[shellcmd]|compile|")
CMD2( "make", "C-x m",
"Run make and display a new buffer with its collected output",
do_compile, ESs,
@ -4751,6 +4831,7 @@ static int shell_init(QEmacsState *qs)
qe_register_mode(qs, &shell_mode, MODEF_NOCMD | MODEF_VIEW);
qe_register_commands(qs, &shell_mode, shell_commands, countof(shell_commands));
qe_register_commands(qs, NULL, shell_global_commands, countof(shell_global_commands));
qe_register_completion(qs, &shellcmd_completion);
/* populate and register pager mode and commands */
// XXX: remove this mess: should just inherit with fallback

1
qe.h
View file

@ -1486,6 +1486,7 @@ int command_print_entry(CompleteState *cp, EditState *s, const char *name);
int command_get_entry(EditState *s, char *dest, int size, int offset);
void file_complete(CompleteState *cp, CompleteFunc enumerate);
int file_print_entry(CompleteState *cp, EditState *s, const char *name);
int shellcmd_print_entry(CompleteState *cp, EditState *s, const char *name);
void buffer_complete(CompleteState *cp, CompleteFunc enumerate);
int buffer_print_entry(CompleteState *cp, EditState *s, const char *name);