Merge branch 'master' into zig-0.15.0

src/command.zig

@@ -188,17 +188,21 @@ pub fn get_arguments(id: ID) ?[]const ArgumentType {
     return (commands.items[id] orelse return null).meta.arguments;
 }
 
-const suppressed_errors = .{
+const suppressed_errors = std.StaticStringMap(void).initComptime(.{
-    "enable_fast_scroll",
+    .{ "enable_fast_scroll", void },
-    "disable_fast_scroll",
+    .{ "disable_fast_scroll", void },
-    "clear_diagnostics",
+    .{ "clear_diagnostics", void },
-};
+});
 
 pub fn executeName(name: []const u8, ctx: Context) tp.result {
     const id = get_id(name);
     if (id) |id_| return execute(id_, ctx);
-    inline for (suppressed_errors) |err| if (std.mem.eql(u8, err, name)) return;
+    return notFoundError(name);
-    return tp.exit_fmt("CommandNotFound: {s}", .{name});
+}
+
+pub fn notFoundError(name: []const u8) !void {
+    if (!suppressed_errors.has(name))
+        return tp.exit_fmt("CommandNotFound: {s}", .{name});
 }
 
 fn CmdDef(comptime T: type) type {

src/keybind/keybind.zig

@@ -18,7 +18,7 @@ const SelectionStyle = @import("Buffer").Selection.Style;
 const parse_flow = @import("parse_flow.zig");
 const parse_vim = @import("parse_vim.zig");
 
-const builtin_keybinds = std.static_string_map.StaticStringMap([]const u8).initComptime(.{
+const builtin_keybinds = std.StaticStringMap([]const u8).initComptime(.{
     .{ "flow", @embedFile("builtin/flow.json") },
     .{ "vim", @embedFile("builtin/vim.json") },
     .{ "helix", @embedFile("builtin/helix.json") },
@@ -291,7 +291,7 @@ const Command = struct {
     fn execute(self: *@This()) !void {
         const id = self.command_id orelse
             command.get_id_cache(self.command, &self.command_id) orelse {
-            return tp.exit_fmt("CommandNotFound: {s}", .{self.command});
+            return command.notFoundError(self.command);
         };
         var buf: [2048]u8 = undefined;
         @memcpy(buf[0..self.args.len], self.args);

src/syntax/src/file_type.zig

@@ -95,7 +95,7 @@ pub const FirstLineMatch = struct {
 };
 
 const static_file_type_list = load_file_types(@import("file_types.zig"));
-const static_file_types = std.static_string_map.StaticStringMap(FileType).initComptime(static_file_type_list);
+const static_file_types = std.StaticStringMap(FileType).initComptime(static_file_type_list);
 
 fn vec(comptime args: anytype) []const []const u8 {
     var cmd: []const []const u8 = &[_][]const u8{};
@@ -147,7 +147,7 @@ pub const FileTypeQueries = struct {
     injections_bin: ?[]const u8,
 };
 
-pub const queries = std.static_string_map.StaticStringMap(FileTypeQueries).initComptime(load_queries());
+pub const queries = std.StaticStringMap(FileTypeQueries).initComptime(load_queries());
 
 fn load_queries() []const struct { []const u8, FileTypeQueries } {
     if (!build_options.use_tree_sitter) return &.{};

src/tui/status/widget.zig

@@ -5,7 +5,7 @@ const log = @import("log");
 
 const Widget = @import("../Widget.zig");
 
-const widgets = std.static_string_map.StaticStringMap(CreateFunction).initComptime(.{
+const widgets = std.StaticStringMap(CreateFunction).initComptime(.{
     .{ "mode", @import("modestate.zig").create },
     .{ "file", @import("filestate.zig").create },
     .{ "log", @import("minilog.zig").create },

src/win32/FontFace.zig

@@ -2,29 +2,31 @@ const FontFace = @This();
 
 const std = @import("std");
 
-// it seems that Windows only supports font faces with up to 31 characters
+// it seems that Windows only supports font faces with up to 31 characters,
-pub const max = 31;
+// but we use a larger buffer here because GetFamilyNames can apparently
+// return longer strings
+pub const max = 254;
 
 buf: [max + 1]u16,
-len: u5,
+len: usize,
 
 pub fn initUtf8(utf8: []const u8) error{ TooLong, InvalidUtf8 }!FontFace {
     const utf16_len = std.unicode.calcUtf16LeLen(utf8) catch return error.InvalidUtf8;
     if (utf16_len > max)
         return error.TooLong;
-    var result: FontFace = .{ .buf = undefined, .len = @intCast(utf16_len) };
+    var self: FontFace = .{ .buf = undefined, .len = utf16_len };
-    result.buf[utf16_len] = 0;
+    const actual_len = try std.unicode.utf8ToUtf16Le(&self.buf, utf8);
-    const actual_len = try std.unicode.utf8ToUtf16Le(&result.buf, utf8);
     std.debug.assert(actual_len == utf16_len);
-    return result;
+    self.buf[actual_len] = 0;
+    return self;
 }
 
 pub fn ptr(self: *const FontFace) [*:0]const u16 {
-    std.debug.assert(self.buf[@as(usize, self.len)] == 0);
+    return self.slice().ptr;
-    return @ptrCast(&self.buf);
 }
 pub fn slice(self: *const FontFace) [:0]const u16 {
-    return self.ptr()[0..self.len :0];
+    std.debug.assert(self.buf[self.len] == 0);
+    return self.buf[0..self.len :0];
 }
 pub fn eql(self: *const FontFace, other: *const FontFace) bool {
     return std.mem.eql(u16, self.slice(), other.slice());