From 85ed9b626ed5b04449702348c784838cc8e915da Mon Sep 17 00:00:00 2001 From: Maciej Bartczak <39600846+maciekbartczak@users.noreply.github.com> Date: Tue, 31 Dec 2024 09:36:23 +0100 Subject: [PATCH] explicitly handle bool values --- src/build/fish_completions.zig | 2 + src/build/zsh_completions.zig | 160 +++++++++++++++++---------------- 2 files changed, 87 insertions(+), 75 deletions(-) diff --git a/src/build/fish_completions.zig b/src/build/fish_completions.zig index 454036724..b75c4dd16 100644 --- a/src/build/fish_completions.zig +++ b/src/build/fish_completions.zig @@ -56,6 +56,7 @@ fn writeFishCompletions(writer: anytype) !void { else { try writer.writeAll(if (field.type != Config.RepeatablePath) " -f" else " -F"); switch (@typeInfo(field.type)) { + .Bool => {}, .Enum => |info| { try writer.writeAll(" -a \""); for (info.fields, 0..) |f, i| { @@ -113,6 +114,7 @@ fn writeFishCompletions(writer: anytype) !void { } else try writer.writeAll(" -f"); switch (@typeInfo(opt.type)) { + .Bool => {}, .Enum => |info| { try writer.writeAll(" -a \""); for (info.fields, 0..) |f, i| { diff --git a/src/build/zsh_completions.zig b/src/build/zsh_completions.zig index 27d3bedf3..5c42ea5ab 100644 --- a/src/build/zsh_completions.zig +++ b/src/build/zsh_completions.zig @@ -7,6 +7,8 @@ const Action = @import("../cli/action.zig").Action; /// and options. pub const zsh_completions = comptimeGenerateZshCompletions(); +const equals_required = "=-:::"; + fn comptimeGenerateZshCompletions() []const u8 { comptime { @setEvalBranchQuota(50000); @@ -48,50 +50,58 @@ fn writeZshCompletions(writer: anytype) !void { try writer.writeAll(" \"--"); try writer.writeAll(field.name); - if (@typeInfo(field.type) != .Bool) { - try writer.writeAll("=-:::"); - - if (std.mem.startsWith(u8, field.name, "font-family")) - try writer.writeAll("_fonts") - else if (std.mem.eql(u8, "theme", field.name)) - try writer.writeAll("_themes") - else if (std.mem.eql(u8, "working-directory", field.name)) - try writer.writeAll("{_files -/}") - else if (field.type == Config.RepeatablePath) - try writer.writeAll("_files") // todo check if this is needed - else { - try writer.writeAll("("); - switch (@typeInfo(field.type)) { - .Enum => |info| { + if (std.mem.startsWith(u8, field.name, "font-family")) { + try writer.writeAll(equals_required); + try writer.writeAll("_fonts"); + } else if (std.mem.eql(u8, "theme", field.name)) { + try writer.writeAll(equals_required); + try writer.writeAll("_themes"); + } else if (std.mem.eql(u8, "working-directory", field.name)) { + try writer.writeAll(equals_required); + try writer.writeAll("{_files -/}"); + } 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)) { + .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| { if (i > 0) try writer.writeAll(" "); try writer.writeAll(f.name); + try writer.writeAll(" no-"); + try writer.writeAll(f.name); } - }, - .Struct => |info| { - if (!@hasDecl(field.type, "parseCLI") and info.layout == .@"packed") { - for (info.fields, 0..) |f, i| { - if (i > 0) try writer.writeAll(" "); - try writer.writeAll(f.name); - try writer.writeAll(" no-"); - try writer.writeAll(f.name); - } - } else { - //resize-overlay-duration - //keybind - //window-padding-x ...-y - //link - //palette - //background - //foreground - //font-variation* - //font-feature - try writer.writeAll(" "); - } - }, - else => try writer.writeAll(" "), - } - try writer.writeAll(")"); + try writer.writeAll(")"); + } else { + //resize-overlay-duration + //keybind + //window-padding-x ...-y + //link + //palette + //background + //foreground + //font-variation* + //font-feature + try writer.writeAll("( )"); + } + }, + else => { + try writer.writeAll(equals_required); + try writer.writeAll("( )"); + }, } } @@ -173,41 +183,41 @@ fn writeZshCompletions(writer: anytype) !void { try writer.writeAll(padding ++ " '--"); try writer.writeAll(opt.name); - if (@typeInfo(opt.type) != .Bool) { - try writer.writeAll("=-:::"); - - switch (@typeInfo(opt.type)) { - .Enum => |info| { - try writer.writeAll("("); - for (info.fields, 0..) |f, i| { - if (i > 0) try writer.writeAll(" "); - try writer.writeAll(f.name); - } - try writer.writeAll(")"); - }, - .Optional => |optional| { - switch (@typeInfo(optional.child)) { - .Enum => |info| { - try writer.writeAll("("); - for (info.fields, 0..) |f, i| { - if (i > 0) try writer.writeAll(" "); - try writer.writeAll(f.name); - } - try writer.writeAll(")"); - }, - else => { - if (std.mem.eql(u8, "config-file", opt.name)) { - try writer.writeAll("_files"); - } else try writer.writeAll("( )"); - }, - } - }, - else => { - if (std.mem.eql(u8, "config-file", opt.name)) { - try writer.writeAll("_files"); - } else try writer.writeAll("( )"); - }, - } + switch (@typeInfo(opt.type)) { + .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(")"); + }, + .Optional => |optional| { + try writer.writeAll(equals_required); + switch (@typeInfo(optional.child)) { + .Enum => |info| { + try writer.writeAll("("); + for (info.fields, 0..) |f, i| { + if (i > 0) try writer.writeAll(" "); + try writer.writeAll(f.name); + } + try writer.writeAll(")"); + }, + else => { + if (std.mem.eql(u8, "config-file", opt.name)) { + try writer.writeAll("_files"); + } else try writer.writeAll("( )"); + }, + } + }, + else => { + try writer.writeAll(equals_required); + if (std.mem.eql(u8, "config-file", opt.name)) { + try writer.writeAll("_files"); + } else try writer.writeAll("( )"); + }, } try writer.writeAll("' \\\n");