explicitly handle bool values

This commit is contained in:
Maciej Bartczak
2024-12-31 09:36:23 +01:00
parent d01b2397f1
commit 85ed9b626e
2 changed files with 87 additions and 75 deletions

View File

@ -56,6 +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 => {},
.Enum => |info| { .Enum => |info| {
try writer.writeAll(" -a \""); try writer.writeAll(" -a \"");
for (info.fields, 0..) |f, i| { for (info.fields, 0..) |f, i| {
@ -113,6 +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 => {},
.Enum => |info| { .Enum => |info| {
try writer.writeAll(" -a \""); try writer.writeAll(" -a \"");
for (info.fields, 0..) |f, i| { for (info.fields, 0..) |f, i| {

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);
@ -48,50 +50,58 @@ fn writeZshCompletions(writer: anytype) !void {
try writer.writeAll(" \"--"); try writer.writeAll(" \"--");
try writer.writeAll(field.name); try writer.writeAll(field.name);
if (@typeInfo(field.type) != .Bool) { if (std.mem.startsWith(u8, field.name, "font-family")) {
try writer.writeAll("=-:::"); try writer.writeAll(equals_required);
try writer.writeAll("_fonts");
if (std.mem.startsWith(u8, field.name, "font-family")) } else if (std.mem.eql(u8, "theme", field.name)) {
try writer.writeAll("_fonts") try writer.writeAll(equals_required);
else if (std.mem.eql(u8, "theme", field.name)) try writer.writeAll("_themes");
try writer.writeAll("_themes") } else if (std.mem.eql(u8, "working-directory", field.name)) {
else if (std.mem.eql(u8, "working-directory", field.name)) try writer.writeAll(equals_required);
try writer.writeAll("{_files -/}") try writer.writeAll("{_files -/}");
else if (field.type == Config.RepeatablePath) } else if (field.type == Config.RepeatablePath) {
try writer.writeAll("_files") // todo check if this is needed try writer.writeAll(equals_required);
else { try writer.writeAll("_files"); // todo check if this is needed
try writer.writeAll("("); } else {
switch (@typeInfo(field.type)) { switch (@typeInfo(field.type)) {
.Enum => |info| { .Bool => {},
.Enum => |info| {
try writer.writeAll(equals_required);
try writer.writeAll("(");
for (info.fields, 0..) |f, i| {
if (i > 0) try writer.writeAll(" ");
try writer.writeAll(f.name);
}
try writer.writeAll(")");
},
.Struct => |info| {
try writer.writeAll(equals_required);
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(f.name);
} }
}, try writer.writeAll(")");
.Struct => |info| { } else {
if (!@hasDecl(field.type, "parseCLI") and info.layout == .@"packed") { //resize-overlay-duration
for (info.fields, 0..) |f, i| { //keybind
if (i > 0) try writer.writeAll(" "); //window-padding-x ...-y
try writer.writeAll(f.name); //link
try writer.writeAll(" no-"); //palette
try writer.writeAll(f.name); //background
} //foreground
} else { //font-variation*
//resize-overlay-duration //font-feature
//keybind try writer.writeAll("( )");
//window-padding-x ...-y }
//link },
//palette else => {
//background try writer.writeAll(equals_required);
//foreground try writer.writeAll("( )");
//font-variation* },
//font-feature
try writer.writeAll(" ");
}
},
else => try writer.writeAll(" "),
}
try writer.writeAll(")");
} }
} }
@ -173,41 +183,41 @@ fn writeZshCompletions(writer: anytype) !void {
try writer.writeAll(padding ++ " '--"); try writer.writeAll(padding ++ " '--");
try writer.writeAll(opt.name); try writer.writeAll(opt.name);
if (@typeInfo(opt.type) != .Bool) { switch (@typeInfo(opt.type)) {
try writer.writeAll("=-:::"); .Bool => {},
.Enum => |info| {
switch (@typeInfo(opt.type)) { try writer.writeAll(equals_required);
.Enum => |info| { 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(" "); try writer.writeAll(f.name);
try writer.writeAll(f.name); }
} 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("(");
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(")"); try writer.writeAll(")");
}, },
else => { else => {
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("( )");
}, },
} }
}, },
else => { else => {
if (std.mem.eql(u8, "config-file", opt.name)) { try writer.writeAll(equals_required);
try writer.writeAll("_files"); if (std.mem.eql(u8, "config-file", opt.name)) {
} else try writer.writeAll("( )"); try writer.writeAll("_files");
}, } else try writer.writeAll("( )");
} },
} }
try writer.writeAll("' \\\n"); try writer.writeAll("' \\\n");