Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle short boolean flags in zsh/fish completions (#4039)

Browse Source 
Closes: https://github.com/ghostty-org/ghostty/issues/2992
This commit is contained in:
Mitchell Hashimoto
2024-12-31 06:45:44 -08:00
committed by GitHub
parent ecfca17ad6 85ed9b626e
commit a30b2eda39
2 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/build/fish_completions.zig
View File

@ -56,7 +56,7 @@ fn writeFishCompletions(writer: anytype) !void {
else { else {
try writer.writeAll(if (field.type != Config.RepeatablePath) " -f" else " -F"); try writer.writeAll(if (field.type != Config.RepeatablePath) " -f" else " -F");
switch (@typeInfo(field.type)) { switch (@typeInfo(field.type)) {
.Bool => try writer.writeAll(" -a \"true false\""), .Bool => {},
.Enum => |info| { .Enum => |info| {
try writer.writeAll(" -a \""); try writer.writeAll(" -a \"");
for (info.fields, 0..) |f, i| { for (info.fields, 0..) |f, i| {
@ -114,7 +114,7 @@ fn writeFishCompletions(writer: anytype) !void {
} else try writer.writeAll(" -f"); } else try writer.writeAll(" -f");
switch (@typeInfo(opt.type)) { switch (@typeInfo(opt.type)) {
.Bool => try writer.writeAll(" -a \"true false\""), .Bool => {},
.Enum => |info| { .Enum => |info| {
try writer.writeAll(" -a \""); try writer.writeAll(" -a \"");
for (info.fields, 0..) |f, i| { for (info.fields, 0..) |f, i| {

50
src/build/zsh_completions.zig
View File

@ -7,6 +7,8 @@ const Action = @import("../cli/action.zig").Action;
/// and options. /// and options.
pub const zsh_completions = comptimeGenerateZshCompletions(); pub const zsh_completions = comptimeGenerateZshCompletions();
const equals_required = "=-:::";
fn comptimeGenerateZshCompletions() []const u8 { fn comptimeGenerateZshCompletions() []const u8 {
comptime { comptime {
@setEvalBranchQuota(50000); @setEvalBranchQuota(50000);
@ -47,34 +49,42 @@ fn writeZshCompletions(writer: anytype) !void {
if (field.name[0] == '_') continue; if (field.name[0] == '_') continue;
try writer.writeAll(" \"--"); try writer.writeAll(" \"--");
try writer.writeAll(field.name); try writer.writeAll(field.name);
try writer.writeAll("=-:::");
if (std.mem.startsWith(u8, field.name, "font-family")) if (std.mem.startsWith(u8, field.name, "font-family")) {
try writer.writeAll("_fonts") try writer.writeAll(equals_required);
else if (std.mem.eql(u8, "theme", field.name)) try writer.writeAll("_fonts");
try writer.writeAll("_themes") } else if (std.mem.eql(u8, "theme", field.name)) {
else if (std.mem.eql(u8, "working-directory", field.name)) try writer.writeAll(equals_required);
try writer.writeAll("{_files -/}") try writer.writeAll("_themes");
else if (field.type == Config.RepeatablePath) } else if (std.mem.eql(u8, "working-directory", field.name)) {
try writer.writeAll("_files") // todo check if this is needed try writer.writeAll(equals_required);
else { try writer.writeAll("{_files -/}");
try writer.writeAll("("); } else if (field.type == Config.RepeatablePath) {
try writer.writeAll(equals_required);
try writer.writeAll("_files"); // todo check if this is needed
} else {
switch (@typeInfo(field.type)) { switch (@typeInfo(field.type)) {
.Bool => try writer.writeAll("true false"), .Bool => {},
.Enum => |info| { .Enum => |info| {
try writer.writeAll(equals_required);
try writer.writeAll("(");
for (info.fields, 0..) |f, i| { for (info.fields, 0..) |f, i| {
if (i > 0) try writer.writeAll(" "); if (i > 0) try writer.writeAll(" ");
try writer.writeAll(f.name); try writer.writeAll(f.name);
} }
try writer.writeAll(")");
}, },
.Struct => |info| { .Struct => |info| {
try writer.writeAll(equals_required);
if (!@hasDecl(field.type, "parseCLI") and info.layout == .@"packed") { if (!@hasDecl(field.type, "parseCLI") and info.layout == .@"packed") {
try writer.writeAll("(");
for (info.fields, 0..) |f, i| { for (info.fields, 0..) |f, i| {
if (i > 0) try writer.writeAll(" "); if (i > 0) try writer.writeAll(" ");
try writer.writeAll(f.name); try writer.writeAll(f.name);
try writer.writeAll(" no-"); try writer.writeAll(" no-");
try writer.writeAll(f.name); try writer.writeAll(f.name);
} }
try writer.writeAll(")");
} else { } else {
//resize-overlay-duration //resize-overlay-duration
//keybind //keybind
@ -85,12 +95,14 @@ fn writeZshCompletions(writer: anytype) !void {
//foreground //foreground
//font-variation* //font-variation*
//font-feature //font-feature
try writer.writeAll(" "); try writer.writeAll("( )");
} }
}, },
else => try writer.writeAll(" "), else => {
try writer.writeAll(equals_required);
try writer.writeAll("( )");
},
} }
try writer.writeAll(")");
} }
try writer.writeAll("\" \\\n"); try writer.writeAll("\" \\\n");
@ -170,10 +182,11 @@ fn writeZshCompletions(writer: anytype) !void {
try writer.writeAll(padding ++ " '--"); try writer.writeAll(padding ++ " '--");
try writer.writeAll(opt.name); try writer.writeAll(opt.name);
try writer.writeAll("=-:::");
switch (@typeInfo(opt.type)) { switch (@typeInfo(opt.type)) {
.Bool => try writer.writeAll("(true false)"), .Bool => {},
.Enum => |info| { .Enum => |info| {
try writer.writeAll(equals_required);
try writer.writeAll("("); try writer.writeAll("(");
for (info.fields, 0..) |f, i| { for (info.fields, 0..) |f, i| {
if (i > 0) try writer.writeAll(" "); if (i > 0) try writer.writeAll(" ");
@ -182,6 +195,7 @@ fn writeZshCompletions(writer: anytype) !void {
try writer.writeAll(")"); try writer.writeAll(")");
}, },
.Optional => |optional| { .Optional => |optional| {
try writer.writeAll(equals_required);
switch (@typeInfo(optional.child)) { switch (@typeInfo(optional.child)) {
.Enum => |info| { .Enum => |info| {
try writer.writeAll("("); try writer.writeAll("(");
@ -199,11 +213,13 @@ fn writeZshCompletions(writer: anytype) !void {
} }
}, },
else => { else => {
try writer.writeAll(equals_required);
if (std.mem.eql(u8, "config-file", opt.name)) { if (std.mem.eql(u8, "config-file", opt.name)) {
try writer.writeAll("_files"); try writer.writeAll("_files");
} else try writer.writeAll("( )"); } else try writer.writeAll("( )");
}, },
} }
try writer.writeAll("' \\\n"); try writer.writeAll("' \\\n");
} }
try writer.writeAll(padding ++ ";;\n"); try writer.writeAll(padding ++ ";;\n");