Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-15 00:06:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fish/zsh completion simple fixes (#2964)

Browse Source 
Adds -e handling to both completions. Updates eval overhead on fish to
avoid similar adjustments made in #2962. Fixes improperly escaped sed
expression for generating theme names in completions.

I agree to re-license these commits as MIT
This commit is contained in:
Mitchell Hashimoto
2024-12-14 08:23:40 -08:00
committed by GitHub
parent a73cb2b258 5195042f96
commit fba10a442c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/build/fish_completions.zig
View File

@ -9,7 +9,7 @@ pub const fish_completions = comptimeGenerateFishCompletions();
fn comptimeGenerateFishCompletions() []const u8 { fn comptimeGenerateFishCompletions() []const u8 {
comptime { comptime {
@setEvalBranchQuota(18000); @setEvalBranchQuota(50000);
var counter = std.io.countingWriter(std.io.null_writer); var counter = std.io.countingWriter(std.io.null_writer);
try writeFishCompletions(&counter.writer()); try writeFishCompletions(&counter.writer());
@ -38,7 +38,7 @@ fn writeFishCompletions(writer: anytype) !void {
try writer.writeAll("complete -c ghostty -f\n"); try writer.writeAll("complete -c ghostty -f\n");
try writer.writeAll("complete -c ghostty -l help -f\n"); try writer.writeAll("complete -c ghostty -s e -l help -f\n");
try writer.writeAll("complete -c ghostty -n \"not __fish_seen_subcommand_from $commands\" -l version -f\n"); try writer.writeAll("complete -c ghostty -n \"not __fish_seen_subcommand_from $commands\" -l version -f\n");
for (@typeInfo(Config).Struct.fields) |field| { for (@typeInfo(Config).Struct.fields) |field| {

9
src/build/zsh_completions.zig
View File

@ -32,7 +32,7 @@ fn writeZshCompletions(writer: anytype) !void {
\\} \\}
\\ \\
\\_themes() { \\_themes() {
\\ local theme_list=$(ghostty +list-themes | sed -E 's/^(.*) \(.*\$/\0/') \\ local theme_list=$(ghostty +list-themes | sed -E 's/^(.*) \(.*$/\1/')
\\ local themes=(${(f)theme_list}) \\ local themes=(${(f)theme_list})
\\ _describe -t themes 'themes' themes \\ _describe -t themes 'themes' themes
\\} \\}
@ -101,13 +101,13 @@ fn writeZshCompletions(writer: anytype) !void {
\\_ghostty() { \\_ghostty() {
\\ typeset -A opt_args \\ typeset -A opt_args
\\ local context state line \\ local context state line
\\ local opt=('--help' '--version') \\ local opt=('-e' '--help' '--version')
\\ \\
\\ _arguments -C \ \\ _arguments -C \
\\ '1:actions:->actions' \ \\ '1:actions:->actions' \
\\ '*:: :->rest' \ \\ '*:: :->rest' \
\\ \\
\\ if [[ "$line[1]" == "--help" || "$line[1]" == "--version" ]]; then \\ if [[ "$line[1]" == "--help" || "$line[1]" == "--version" || "$line[1]" == "-e" ]]; then
\\ return \\ return
\\ fi \\ fi
\\ \\
@ -127,6 +127,9 @@ fn writeZshCompletions(writer: anytype) !void {
var count: usize = 0; var count: usize = 0;
const padding = " "; const padding = " ";
for (@typeInfo(Action).Enum.fields) |field| { for (@typeInfo(Action).Enum.fields) |field| {
if (std.mem.eql(u8, "help", field.name)) continue;
if (std.mem.eql(u8, "version", field.name)) continue;
try writer.writeAll(padding ++ "'+"); try writer.writeAll(padding ++ "'+");
try writer.writeAll(field.name); try writer.writeAll(field.name);
try writer.writeAll("'\n"); try writer.writeAll("'\n");