alec/erythros
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

System/Libraries/Stdio: Sort autocomplete results alphabetically

Browse source
This commit is contained in:
Alec Murphy 2025-03-26 13:02:51 -04:00
parent ccac8b2baa
commit 51f8a5a9d4
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
System/Libraries/Stdio.HC
View file

@ -147,11 +147,17 @@ U0 @stdio_read_line_autocomplete_cmd(@shell* sh, U8* str, U8* line, I64* pos)
} }
} }
U0 @stdio_read_line_autocomplete_list_cmds(@shell* sh, U8* prompt, U8* str, U8* line, I64* pos) I64 @stdio_read_line_autocomplete_sort_cmds(U8** e1, U8** e2)
{
return StrCmp(*e1, *e2);
}
U0 @stdio_read_line_autocomplete_list_cmds(@shell* sh, U8* prompt, U8* str, U8* line, I64* pos, I64 cmd_count)
{ {
I64 cnt = 0; I64 cnt = 0;
I64 i; I64 i;
U8** cmds = CAlloc(sizeof(U8*) * cmd_count);
CHashSrcSym* sym; CHashSrcSym* sym;
CHashTable* tbl = adam_task->hash_table; CHashTable* tbl = adam_task->hash_table;
while (tbl) { while (tbl) {
@ -163,7 +169,7 @@ U0 @stdio_read_line_autocomplete_list_cmds(@shell* sh, U8* prompt, U8* str, U8*
if (!cnt) { if (!cnt) {
@stdio_write_line(sh, "\n"); @stdio_write_line(sh, "\n");
} }
@stdio_write_line(sh, "%s\n", sym->str + StrLen("@shell_cmd_")); cmds[cnt] = sym->str + StrLen("@shell_cmd_");
++cnt; ++cnt;
} }
} }
@ -173,8 +179,13 @@ U0 @stdio_read_line_autocomplete_list_cmds(@shell* sh, U8* prompt, U8* str, U8*
tbl = tbl->next; tbl = tbl->next;
} }
if (cnt) { if (cnt) {
QSort(cmds, cnt, sizeof(U8*), &@stdio_read_line_autocomplete_sort_cmds);
for (i = 0; i < cnt; i++) {
@stdio_write_line(sh, "%s\n", cmds[i]);
}
@stdio_write_line(sh, "%s%s", prompt, line); @stdio_write_line(sh, "%s%s", prompt, line);
} }
Free(cmds);
} }
U0 @stdio_read_line_autocomplete(@shell* sh, U8* prompt, U8* str, I64* pos) U0 @stdio_read_line_autocomplete(@shell* sh, U8* prompt, U8* str, I64* pos)
@ -192,7 +203,7 @@ U0 @stdio_read_line_autocomplete(@shell* sh, U8* prompt, U8* str, I64* pos)
break; break;
default: default:
// TODO: if we have >1, print the list // TODO: if we have >1, print the list
@stdio_read_line_autocomplete_list_cmds(sh, prompt, ac_buf, str, pos); @stdio_read_line_autocomplete_list_cmds(sh, prompt, ac_buf, str, pos, cmd_count);
// and reprint str below it? // and reprint str below it?
break; break;
} }