Merge branch 'master' into zig-0.15.0

src/Project.zig

@@ -231,6 +231,8 @@ pub fn restore_state_v0(self: *Self, data: []const u8) error{
     JsonIncompatibleType,
     NotAnObject,
     BadArrayAllocExtract,
+    InvalidMapType,
+    InvalidUnion,
 }!void {
     tp.trace(tp.channel.debug, .{"restore_state_v0"});
     defer self.sort_files_by_mtime();

src/renderer/vaxis/renderer.zig

@@ -58,6 +58,8 @@ pub const Error = error{
     JsonIncompatibleType,
     NotAnObject,
     BadArrayAllocExtract,
+    InvalidMapType,
+    InvalidUnion,
 } || std.Thread.SpawnError;
 
 pub fn init(allocator: std.mem.Allocator, handler_ctx: *anyopaque, no_alternate: bool, _: *const fn (ctx: *anyopaque) void) Error!Self {
@@ -180,7 +182,7 @@ fn handleSegfaultPosixNoAbort(sig: i32, info: *const std.posix.siginfo_t, ctx_pt
 
 pub fn run(self: *Self) Error!void {
     self.vx.sgr = .legacy;
-    self.vx.conpty_hacks = true;
+    self.vx.enable_workarounds = true;
 
     panic_cleanup = .{ .allocator = self.allocator, .tty = &self.tty, .vx = &self.vx };
     if (!self.no_alternate) self.vx.enterAltScreen(self.tty.anyWriter()) catch return error.TtyWriteError;
@@ -639,7 +641,7 @@ const Loop = struct {
         switch (builtin.os.tag) {
             .windows => {
                 var parser: vaxis.Parser = .{
-                    .graphemes = &self.vaxis.unicode.graphemes,
+                    .grapheme_data = &self.vaxis.unicode.width_data.graphemes,
                 };
                 const a = self.vaxis.opts.system_clipboard_allocator orelse @panic("no tty allocator");
                 while (!self.should_quit) {
@@ -648,7 +650,7 @@ const Loop = struct {
             },
             else => {
                 var parser: vaxis.Parser = .{
-                    .graphemes = &self.vaxis.unicode.graphemes,
+                    .grapheme_data = &self.vaxis.unicode.width_data.graphemes,
                 };
 
                 const a = self.vaxis.opts.system_clipboard_allocator orelse @panic("no tty allocator");

src/renderer/win32/renderer.zig

@@ -36,6 +36,8 @@ pub const Error = error{
     JsonIncompatibleType,
     NotAnObject,
     BadArrayAllocExtract,
+    InvalidMapType,
+    InvalidUnion,
 } || std.Thread.SpawnError;
 
 pub const panic = messageBoxThenPanic(.{ .title = "Flow Panic" });

src/shell.zig

@@ -27,6 +27,8 @@ pub const Error = error{
     JsonIncompatibleType,
     NotAnObject,
     BadArrayAllocExtract,
+    InvalidMapType,
+    InvalidUnion,
 };
 
 pub const OutputHandler = fn (context: usize, parent: tp.pid_ref, arg0: []const u8, output: []const u8) void;