From d9ac17b4301f4bb6202e0beaa0442077a3c43ff4 Mon Sep 17 00:00:00 2001 From: zendrx Date: Fri, 21 Aug 2026 12:49:11 +0100 Subject: [PATCH 1/3] format now formats file doesnt print to stdout --- src/Runner.zig | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Runner.zig b/src/Runner.zig index 73d4648c..715c9906 100644 --- a/src/Runner.zig +++ b/src/Runner.zig @@ -204,10 +204,17 @@ pub fn runFile( var arena = std.heap.ArenaAllocator.init(runner.gc.allocator); defer arena.deinit(); - var stdout = bz_io.stdoutWriter(runner.process.io); + //used filez to prevent overshadow ig + var filez = if (std.fs.path.isAbsolute(file_name)) + try std.Io.Dir.openFileAbsolute(runner.process.io, file_name, .{ .mode = .write_only }) + else + try std.Io.Dir.cwd().openFile(runner.process.io, file_name, .{ .mode = .write_only }); + defer file.close(runner.process.io); + var buffer: [255]u8 = undefined; + var file_writer = filez.writer(runner.process.io, &buffer); try Renderer.render( arena.allocator(), - &stdout.interface, + &file_writer.interface, ast, runner.renderer_options, ); From 98a054891bc2315b96073c11ce7e8ae765dc4419 Mon Sep 17 00:00:00 2001 From: zendrx Date: Fri, 21 Aug 2026 13:34:09 +0100 Subject: [PATCH 2/3] added flag --- src/Runner.zig | 39 +++++++++++++++++++++++++-------------- src/main.zig | 2 ++ 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/Runner.zig b/src/Runner.zig index 715c9906..a2a608fd 100644 --- a/src/Runner.zig +++ b/src/Runner.zig @@ -157,6 +157,7 @@ pub fn runFile( provided_root_dir: ?[]const u8, file_name: []const u8, args: []const []const u8, + in_place: bool, ) !u8 { var file_io_scope = Perf.start(runner.perf, .file_io); defer file_io_scope.end(); @@ -204,20 +205,30 @@ pub fn runFile( var arena = std.heap.ArenaAllocator.init(runner.gc.allocator); defer arena.deinit(); - //used filez to prevent overshadow ig - var filez = if (std.fs.path.isAbsolute(file_name)) - try std.Io.Dir.openFileAbsolute(runner.process.io, file_name, .{ .mode = .write_only }) - else - try std.Io.Dir.cwd().openFile(runner.process.io, file_name, .{ .mode = .write_only }); - defer file.close(runner.process.io); - var buffer: [255]u8 = undefined; - var file_writer = filez.writer(runner.process.io, &buffer); - try Renderer.render( - arena.allocator(), - &file_writer.interface, - ast, - runner.renderer_options, - ); + if (in_place) { + //used filez to prevent overshadow ig + var filez = if (std.fs.path.isAbsolute(file_name)) + try std.Io.Dir.openFileAbsolute(runner.process.io, file_name, .{ .mode = .write_only }) + else + try std.Io.Dir.cwd().openFile(runner.process.io, file_name, .{ .mode = .write_only }); + defer file.close(runner.process.io); + var buffer: [255]u8 = undefined; + var file_writer = filez.writer(runner.process.io, &buffer); + try Renderer.render( + arena.allocator(), + &file_writer.interface, + ast, + runner.renderer_options, + ); + } else { + var stdout = bz_io.stdoutWriter(runner.process.io); + try Renderer.render( + arena.allocator(), + &stdout.interface, + ast, + runner.renderer_options, + ); + } } } else { return Parser.CompileError.Recoverable; diff --git a/src/main.zig b/src/main.zig index 166ab521..a5b07c48 100644 --- a/src/main.zig +++ b/src/main.zig @@ -72,6 +72,7 @@ const check_params = clap.parseParamsComptime( ); const format_params = clap.parseParamsComptime( + \\-i, --in-place overwrites file \\--line-width Formatter line width (defaults to 80) \\-L, --library ... Add search path for external libraries \\-r, --root-dir Root dir for package resolution @@ -549,6 +550,7 @@ fn run( sub_res.args.@"root-dir", sub_res.positionals[0] orelse &.{}, if (sub_res.positionals.len > 1) sub_res.positionals[1] else &.{}, + sub_res.args.@"in-place" == 1, ) catch { return 1; }; From 45bc9c8fe692f95d78c6edffcad964f4fb5a0c14 Mon Sep 17 00:00:00 2001 From: zendrx Date: Mon, 24 Aug 2026 13:42:17 +0100 Subject: [PATCH 3/3] removed flag and defer --- src/Runner.zig | 42 +++++++++++++++--------------------------- src/main.zig | 2 -- 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/src/Runner.zig b/src/Runner.zig index a2a608fd..e0bdb161 100644 --- a/src/Runner.zig +++ b/src/Runner.zig @@ -157,7 +157,6 @@ pub fn runFile( provided_root_dir: ?[]const u8, file_name: []const u8, args: []const []const u8, - in_place: bool, ) !u8 { var file_io_scope = Perf.start(runner.perf, .file_io); defer file_io_scope.end(); @@ -169,7 +168,7 @@ pub fn runFile( bz_io.print(runner.process.io, "File not found", .{}); return 1; }; - defer file.close(runner.process.io); + file.close(runner.process.io); var absolute_file_path_buffer: [std.Io.Dir.max_path_bytes]u8 = undefined; const absolute_file_path_len = try file.realPath(runner.process.io, &absolute_file_path_buffer); @@ -204,31 +203,20 @@ pub fn runFile( } else { var arena = std.heap.ArenaAllocator.init(runner.gc.allocator); defer arena.deinit(); - - if (in_place) { - //used filez to prevent overshadow ig - var filez = if (std.fs.path.isAbsolute(file_name)) - try std.Io.Dir.openFileAbsolute(runner.process.io, file_name, .{ .mode = .write_only }) - else - try std.Io.Dir.cwd().openFile(runner.process.io, file_name, .{ .mode = .write_only }); - defer file.close(runner.process.io); - var buffer: [255]u8 = undefined; - var file_writer = filez.writer(runner.process.io, &buffer); - try Renderer.render( - arena.allocator(), - &file_writer.interface, - ast, - runner.renderer_options, - ); - } else { - var stdout = bz_io.stdoutWriter(runner.process.io); - try Renderer.render( - arena.allocator(), - &stdout.interface, - ast, - runner.renderer_options, - ); - } + //used filez to prevent overshadow ig + var filez = if (std.fs.path.isAbsolute(file_name)) + try std.Io.Dir.openFileAbsolute(runner.process.io, file_name, .{ .mode = .write_only }) + else + try std.Io.Dir.cwd().openFile(runner.process.io, file_name, .{ .mode = .write_only }); + defer filez.close(runner.process.io); + var buffer: [255]u8 = undefined; + var file_writer = filez.writer(runner.process.io, &buffer); + try Renderer.render( + arena.allocator(), + &file_writer.interface, + ast, + runner.renderer_options, + ); } } else { return Parser.CompileError.Recoverable; diff --git a/src/main.zig b/src/main.zig index a5b07c48..166ab521 100644 --- a/src/main.zig +++ b/src/main.zig @@ -72,7 +72,6 @@ const check_params = clap.parseParamsComptime( ); const format_params = clap.parseParamsComptime( - \\-i, --in-place overwrites file \\--line-width Formatter line width (defaults to 80) \\-L, --library ... Add search path for external libraries \\-r, --root-dir Root dir for package resolution @@ -550,7 +549,6 @@ fn run( sub_res.args.@"root-dir", sub_res.positionals[0] orelse &.{}, if (sub_res.positionals.len > 1) sub_res.positionals[1] else &.{}, - sub_res.args.@"in-place" == 1, ) catch { return 1; };