diff options
| author | Gabriel Schneider <[email protected]> | 2026-10-30 17:35:06 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-10-30 17:35:06 -0300 |
| commit | 6d8da8721141284cf33bb901168b26135893eb86 (patch) | |
| tree | 791d63401d4e85fbca1d597a8ce0326e70efd545 /tools | |
| parent | efd43a3a2cf03bb741366331158b368abf9ac583 (diff) | |
| parent | bf6810a8f9d6cc82050e7d9c0cfb06358301b574 (diff) | |
| download | pardes-6d8da8721141284cf33bb901168b26135893eb86.tar.gz pardes-6d8da8721141284cf33bb901168b26135893eb86.zip | |
Merge latest upstream into the macOS branch for Zig 0.17
Retain the macOS branch history and local Acme selection color while adopting upstream's current core and platform changes. Pin Zig and ZLS to 0.17.0, and fetch the existing zstbi compatibility commit through upstream after its original fork was removed.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gen_builtins_json.zig | 14 | ||||
| -rw-r--r-- | tools/gen_themes.zig | 35 | ||||
| -rw-r--r-- | tools/lspprobe.zig | 184 | ||||
| -rw-r--r-- | tools/shared_libs_check.zig | 127 |
4 files changed, 161 insertions, 199 deletions
diff --git a/tools/gen_builtins_json.zig b/tools/gen_builtins_json.zig new file mode 100644 index 00000000..71df5307 --- /dev/null +++ b/tools/gen_builtins_json.zig @@ -0,0 +1,14 @@ +//! Writes every builtin as JSON to the path given (docs/typ/builtins-<tty|gui>.json, +//! by way of `zig build builtins-json`). +const std = @import("std"); +const pardes = @import("pardes"); + +pub fn main(init: std.process.Init) !void { + const args = try init.minimal.args.toSlice(init.arena.allocator()); + var file = try std.Io.Dir.cwd().createFile(init.io, args[1], .{}); + defer file.close(init.io); + var buf: [4096]u8 = undefined; + var w = file.writer(init.io, &buf); + try pardes.builtins_json.write(&w.interface); + try w.interface.flush(); +} diff --git a/tools/gen_themes.zig b/tools/gen_themes.zig index 3add2040..30808dfe 100644 --- a/tools/gen_themes.zig +++ b/tools/gen_themes.zig @@ -11,9 +11,10 @@ //! //! Why vendored and not read out of ~/05-genizah: `zig build` must work on a //! fresh clone with no network and no helix checkout. It is the WHOLE of what -//! both projects ship — helix's 214 runtime themes and zed's three families, -//! 1.5MB of text — because "which ones are worth having" is not a question a -//! build tool gets to answer on the user's behalf. +//! both projects ship — helix's runtime themes and zed's three families — +//! because "which ones are worth having" is not a question a build tool gets +//! to answer on the user's behalf. The one exception is helix's copy of a +//! theme pardes ports by hand (src/themes/: dracula, nord, ...): not vendored. //! //! NAMES. A helix theme is its file stem; a zed variant is its `name` slugged //! with `_zed` on the end. Both projects ship gruvbox, ayu and one, so the @@ -21,15 +22,18 @@ //! variant is one rule instead of eight exceptions — it also keeps a name from //! moving when the other source gains or loses a file. helix's own `acme.toml` //! is vendored as `acme_helix.toml` for the same reason, since pardes ships an -//! acme of its own; the file is otherwise untouched. Two themes answering to -//! one name is a bug (`Theme <name>` would silently pick one), so src/pardes.zig +//! acme of its own; the file is otherwise untouched. So are `monokai`, +//! `ayu_dark` and `nord` as `<name>_helix.toml`, kept (unlike helix's other +//! copies of themes ported here) because helix themes inherit them; those +//! `inherits` lines name the renamed file. Two themes answering to +//! one name is a bug (`Theme <name>` would silently pick one), so src/colors.zig //! asserts the ring's names are distinct at comptime. //! //! Provenance: vendor/themes/*.toml are helix's own runtime themes (from //! helix-editor/helix runtime/themes, each file keeping its author's header); //! *.json are zed's (zed-industries/zed assets/themes). The licences sit beside //! them as `<name>.LICENSE` — `helix.LICENSE` covering the runtime set, one per -//! zed family, plus the twenty-two helix keeps in `runtime/themes/licenses/` +//! zed family, plus the twenty-one helix keeps in `runtime/themes/licenses/` //! for the themes it took from somewhere else (their names group by SOURCE, not //! by file: `everforest.LICENSE` covers both everforest themes). build.zig's //! directory read skips anything that is not a .toml or a .json, which is what @@ -50,7 +54,7 @@ const Rgb = [3]u8; /// pardes's Theme, minus the type: the generated file spells an anonymous /// `.{...}` because a theme file deliberately imports NOTHING (it is data, not -/// code) — src/pardes.zig's `fold` is what turns it into a real Theme. +/// code) — src/colors.zig's `fold` is what turns it into a real Theme. const Theme = struct { name: []const u8, bg: ?Rgb, @@ -132,7 +136,7 @@ pub fn main(init: std.process.Init) !void { } // the INDEX, and the only reason it is generated rather than written: a zig // file cannot list a directory at comptime, so the imports have to come - // from whoever can. pardes.zig folds its declarations into the ring. + // from whoever can. colors.zig folds its declarations into the ring. buf.clearRetainingCapacity(); try buf.writer.writeAll("// Generated by tools/gen_themes.zig. Do not edit.\n"); for (themes) |t| try buf.writer.print("pub const {s} = @import(\"{s}.zig\");\n", .{ t.name, t.name }); @@ -152,13 +156,14 @@ fn byName(_: void, a: Theme, b: Theme) bool { fn emit(w: *std.Io.Writer, t: Theme) !void { try w.writeAll("// Generated by tools/gen_themes.zig. Do not edit.\npub const theme = .{\n"); try w.print(" .name = \"{s}\",\n", .{t.name}); - inline for (@typeInfo(Theme).@"struct".fields) |f| { - if (comptime std.mem.eql(u8, f.name, "name")) continue; - if (comptime std.mem.eql(u8, f.name, "palette")) continue; - try w.print(" .{s} = ", .{f.name}); - if (comptime @typeInfo(f.type) == .optional) { - if (@field(t, f.name)) |c| try rgb(w, c) else try w.writeAll("null"); - } else try rgb(w, @field(t, f.name)); + const info = @typeInfo(Theme).@"struct"; + inline for (info.field_names, info.field_types) |name, T| { + if (comptime std.mem.eql(u8, name, "name")) continue; + if (comptime std.mem.eql(u8, name, "palette")) continue; + try w.print(" .{s} = ", .{name}); + if (comptime @typeInfo(T) == .optional) { + if (@field(t, name)) |c| try rgb(w, c) else try w.writeAll("null"); + } else try rgb(w, @field(t, name)); try w.writeAll(",\n"); } if (t.palette) |p| { diff --git a/tools/lspprobe.zig b/tools/lspprobe.zig deleted file mode 100644 index 0b7d772c..00000000 --- a/tools/lspprobe.zig +++ /dev/null @@ -1,184 +0,0 @@ -//! One language query against the REAL seam, from the command line. -//! -//! pardes-lspprobe <kind> <file> <line>:<col> [arg] [--reps N] -//! -//! `kind` is an `lsp.Kind` tag (`definition`, `references`, ...) or its helix -//! key (`gd`, `gr`, `gy`, `gi`, `gD`). Line and column are 1-based, the way -//! the rows print them. Rows go to stdout; the timing line goes to stderr so -//! `lspprobe gd f.rs 10:5 | head` still composes. -//! -//! This is the development probe for the PROTOCOL CLIENT: point it at a file -//! in any workspace (a rust crate, a C tree with compile_commands.json) and it -//! exercises exactly what `gd` in the editor would — same seam, same client, -//! same child server. The server is spawned fresh per invocation and kept for -//! the process, so rep 0 is the true cold cost (spawn + handshake + whatever -//! indexing the deadline allows) and later reps are the warm per-press cost. -//! Generic on purpose: no project names anywhere — the workspace is whatever -//! the file's root markers say. -const std = @import("std"); -const lsp = @import("pardes").lsp; - -extern "c" fn realpath(path: [*:0]const u8, resolved: [*]u8) ?[*:0]u8; - -pub const std_options: std.Options = .{ .log_level = .err }; - -fn nowUs() u64 { - var ts: std.c.timespec = undefined; - _ = std.c.clock_gettime(.MONOTONIC, &ts); - return @as(u64, @intCast(ts.sec)) *| 1_000_000 +| @as(u64, @intCast(ts.nsec)) / 1000; -} - -const aliases = .{ - .{ "gd", lsp.Kind.definition }, - .{ "gD", lsp.Kind.declaration }, - .{ "gy", lsp.Kind.type_definition }, - .{ "gi", lsp.Kind.implementation }, - .{ "gr", lsp.Kind.references }, -}; - -fn usage() noreturn { - std.debug.print( - \\usage: pardes-lspprobe <kind> <file> <line>:<col> [arg] [--reps N] [--warm S] - \\ kind: gd gD gy gi gr, or any lsp.Kind tag (hover, references, - \\ document_symbols, workspace_symbols, incoming_calls, ...) - \\ arg: the new name for rename, the query for workspace_symbols - \\ --warm sleep S seconds after the first (cold) query — long enough - \\ for an indexing server to reach ready, narrated on stderr - \\ - , .{}); - std.process.exit(2); -} - -/// The editor's message row, here: the client's reader threads narrate server -/// state through the same sink the shells register, printed to stderr so the -/// rows on stdout stay clean. -fn statusSink(ctx: ?*anyopaque, text: []const u8) void { - _ = ctx; - std.debug.print("# status: {s}\n", .{text}); -} - -extern "c" fn usleep(usec: c_uint) c_int; - -pub fn main(init: std.process.Init) !void { - const gpa = std.heap.page_allocator; - const arena = init.arena.allocator(); - const io = std.Io.Threaded.global_single_threaded.io(); - - const args = try init.minimal.args.toSlice(arena); - if (args.len < 4) usage(); - - // comma-separated kinds share ONE server instance and its index — the - // whole battery against a big workspace pays the cold cost once - var kinds: [16]lsp.Kind = undefined; - var nkinds: usize = 0; - var kit = std.mem.tokenizeScalar(u8, args[1], ','); - while (kit.next()) |word| { - if (nkinds == kinds.len) usage(); - kinds[nkinds] = blk: { - inline for (aliases) |a| if (std.mem.eql(u8, word, a[0])) break :blk a[1]; - break :blk std.meta.stringToEnum(lsp.Kind, word) orelse usage(); - }; - nkinds += 1; - } - if (nkinds == 0) usage(); - - var pz: [4096:0]u8 = undefined; - const pz_s = std.fmt.bufPrintSentinel(&pz, "{s}", .{args[2]}, 0) catch usage(); - var realbuf: [4096]u8 = undefined; - const path = std.mem.span(realpath(pz_s.ptr, &realbuf) orelse { - std.debug.print("cannot resolve {s}\n", .{args[2]}); - std.process.exit(1); - }); - const source = std.Io.Dir.cwd().readFileAllocOptions( - io, - path, - arena, - .limited(64 << 20), - .of(u8), - 0, - ) catch { - std.debug.print("cannot read {s}\n", .{path}); - std.process.exit(1); - }; - - const colon = std.mem.indexOfScalar(u8, args[3], ':') orelse usage(); - const line = std.fmt.parseInt(u32, args[3][0..colon], 10) catch usage(); - const col = std.fmt.parseInt(u32, args[3][colon + 1 ..], 10) catch usage(); - if (line == 0 or col == 0) usage(); - - var arg: []const u8 = ""; - var reps: u32 = 1; - var warm_s: u32 = 0; - var i: usize = 4; - while (i < args.len) : (i += 1) { - if (std.mem.eql(u8, args[i], "--reps")) { - i += 1; - if (i >= args.len) usage(); - reps = @max(1, std.fmt.parseInt(u32, args[i], 10) catch usage()); - } else if (std.mem.eql(u8, args[i], "--warm")) { - i += 1; - if (i >= args.len) usage(); - warm_s = std.fmt.parseInt(u32, args[i], 10) catch usage(); - } else arg = args[i]; - } - - lsp.setStatusSink(null, statusSink); - - // 1-based line:col -> byte offset - var off: usize = 0; - var ln: u32 = 1; - while (ln < line and off < source.len) : (off += 1) { - if (source[off] == '\n') ln += 1; - } - off = @min(off + col - 1, source.len); - - const root = std.fs.path.dirname(path) orelse "/"; - const timings = try arena.alloc(u64, reps); - var stdout_buf: [64 * 1024]u8 = undefined; - var stdout = std.Io.File.stdout().writer(io, &stdout_buf); - var first_query = true; - - for (kinds[0..nkinds]) |kind| { - var rows: []const u8 = ""; - for (0..reps) |r| { - // one warm pause for the whole battery, right after the very - // first (cold, server-spawning) query — the status lines on - // stderr narrate what the server does with the time - var out: std.Io.Writer.Allocating = .init(gpa); - defer out.deinit(); - var scratch: std.heap.ArenaAllocator = .init(gpa); - defer scratch.deinit(); - const t0 = nowUs(); - try lsp.query(gpa, scratch.allocator(), .{ - .kind = kind, - .path = path, - .source = source, - .offset = @intCast(off), - .arg = arg, - .root = root, - }, &out.writer); - timings[r] = nowUs() -| t0; - rows = try arena.dupe(u8, out.written()); - if (first_query) { - first_query = false; - if (warm_s > 0) for (0..warm_s * 10) |_| { - _ = usleep(100_000); - }; - } - } - - try stdout.interface.print("## {t}\n", .{kind}); - try stdout.interface.writeAll(rows); - try stdout.interface.flush(); - - const n = std.mem.count(u8, rows, "\n"); - const cold = timings[0]; - std.mem.sort(u64, timings[0..reps], {}, std.sort.asc(u64)); - if (reps == 1) - std.debug.print("# {t}: {d} row(s) in {d}us\n", .{ kind, n, cold }) - else - std.debug.print("# {t}: {d} row(s); first {d}us, min {d}us, median {d}us ({d} reps)\n", .{ - kind, n, cold, timings[0], timings[reps / 2], reps, - }); - } -} diff --git a/tools/shared_libs_check.zig b/tools/shared_libs_check.zig new file mode 100644 index 00000000..d18c6850 --- /dev/null +++ b/tools/shared_libs_check.zig @@ -0,0 +1,127 @@ +//! One copy of each codec in a pardes binary (docs/shared-libs.md). +//! +//! zig build shared-libs-check -Dplatform=tty|gui +//! +//! Reads the linked executable's ELF symbol table and fails when a family of +//! symbols the build has chosen against is in it: a second PNG, JPEG or +//! inflate implementation beside the one docs/shared-libs.md names for the +//! job. The families are named by functions each copy defines (static ones +//! too: the symbol table keeps locals), so a dependency that brings its own +//! copy back shows here, whatever its symbols are called in the end. +const std = @import("std"); + +const Family = struct { + /// What the family is, and what the build uses instead. + what: []const u8, + /// Functions only that copy defines; an optimized build inlines some + /// of them, so a copy counts as linked when any is there, as many + /// times as the most of them are. + symbols: []const []const u8, + /// How many copies may be linked (0: none). + most: usize = 0, +}; + +const stb_png = [_][]const u8{ "stbi__png_load", "stbi__parse_png_file", "stbi__create_png_image_raw" }; +const stb_jpeg = [_][]const u8{ "stbi__jpeg_load", "stbi__decode_jpeg_header", "stbi__jpeg_decode_block" }; +const stb_inflate = [_][]const u8{ "stbi__parse_zlib", "stbi__do_zlib", "stbi__zbuild_huffman", "stbi__zhuffman_decode" }; +const stb_deflate = [_][]const u8{ "stbi_zlib_compress", "stbiw__zlib_bitrev", "stbi_write_png_to_mem" }; + +/// Banned in every binary that links ghostty-vt (wuffs decodes PNG and +/// JPEG; zlib and wuffs are the two inflates, see docs/shared-libs.md). +const with_wuffs = [_]Family{ + .{ .what = "stb_image's PNG decoder (wuffs decodes PNG: STBI_NO_PNG)", .symbols = &stb_png }, + .{ .what = "stb_image's JPEG decoder (wuffs decodes JPEG: STBI_NO_JPEG)", .symbols = &stb_jpeg }, + .{ .what = "stb_image's own inflate (zlib and wuffs inflate)", .symbols = &stb_inflate }, +}; + +/// Banned everywhere. +const always = [_]Family{ + // SDL's SDL_stb.c (SDL_LoadPNG, camera MJPEG) is off: SDL_DISABLE_STB. + .{ .what = "a second stb_image PNG decoder (SDL_stb.c)", .symbols = &stb_png, .most = 1 }, + .{ .what = "a second stb_image JPEG decoder (SDL_stb.c)", .symbols = &stb_jpeg, .most = 1 }, + // zstbi's stb_image_write, patched out: its own deflate beside zlib's. + .{ .what = "stb_image_write and its deflate (zlib deflates)", .symbols = &stb_deflate }, + // One zlib: FreeType's, which MuPDF links (mupdf.zig). + .{ .what = "a second zlib", .symbols = &.{ "inflate_table", "inflate_fast", "deflate_slow" }, .most = 1 }, + // One FreeType: the build's, which MuPDF is compiled against. + .{ .what = "a second FreeType", .symbols = &.{ "FT_Init_FreeType", "FT_New_Library" }, .most = 1 }, +}; + +pub fn main(init: std.process.Init) !void { + var arena_state: std.heap.ArenaAllocator = .init(std.heap.page_allocator); + defer arena_state.deinit(); + const arena = arena_state.allocator(); + const args = try init.minimal.args.toSlice(arena); + if (args.len != 2) return error.BadArgs; + const bytes = try readFile(arena, try arena.dupeSentinel(u8, args[1], 0)); + + var counts = std.StringHashMap(usize).init(arena); + try symbols(bytes, &counts); + if (counts.count() == 0) { + std.debug.print("shared-libs-check: {s} has no symbol table (stripped?): nothing to check\n", .{args[1]}); + return; + } + const wuffs = counts.get("wuffs_zlib__decoder__transform_io") != null or + counts.get("wuffs_base__pixel_swizzler__prepare") != null; + var failed = false; + for ([2][]const Family{ &always, if (wuffs) &with_wuffs else &.{} }) |set| for (set) |family| { + var n: usize = 0; + var seen: []const u8 = family.symbols[0]; + for (family.symbols) |symbol| { + const here = counts.get(symbol) orelse 0; + if (here > n) { + n = here; + seen = symbol; + } + } + if (n > family.most) { + failed = true; + std.debug.print("shared-libs-check: {s}: `{s}` is linked {d} times (at most {d})\n", .{ family.what, seen, n, family.most }); + } + }; + if (failed) return error.DuplicateLibrary; + std.debug.print("shared-libs-check: one copy of each ({d} symbols{s})\n", .{ counts.count(), if (wuffs) ", wuffs present" else "" }); +} + +/// Counts every name in the ELF64 little-endian symbol tables of `bytes`. +fn symbols(bytes: []const u8, counts: *std.StringHashMap(usize)) !void { + if (bytes.len < @sizeOf(std.elf.Elf64_Ehdr) or !std.mem.eql(u8, bytes[0..4], "\x7fELF")) return error.NotElf; + if (bytes[std.elf.EI.CLASS] != std.elf.ELFCLASS64 or bytes[std.elf.EI.DATA] != std.elf.ELFDATA2LSB) return error.UnsupportedElf; + const eh = std.mem.bytesAsValue(std.elf.Elf64_Ehdr, bytes[0..@sizeOf(std.elf.Elf64_Ehdr)]); + const shoff: usize = @intCast(eh.e_shoff); + const shnum: usize = eh.e_shnum; + const shsize: usize = eh.e_shentsize; + if (shsize != @sizeOf(std.elf.Elf64_Shdr) or shoff + shnum * shsize > bytes.len) return error.BadSections; + const sections = std.mem.bytesAsSlice(std.elf.Elf64_Shdr, @as([]align(1) const u8, bytes[shoff..][0 .. shnum * shsize])); + for (sections) |section| { + if (section.sh_type != std.elf.SHT_SYMTAB) continue; + const strtab = sections[section.sh_link]; + const strings = bytes[@intCast(strtab.sh_offset)..][0..@intCast(strtab.sh_size)]; + const table = bytes[@intCast(section.sh_offset)..][0..@intCast(section.sh_size)]; + const syms = std.mem.bytesAsSlice(std.elf.Elf64_Sym, @as([]align(1) const u8, table)); + for (syms) |sym| { + // Functions only: a family is the code it brings. + if (sym.st_type() != std.elf.STT_FUNC or sym.st_shndx == 0) continue; + const name = std.mem.sliceTo(strings[sym.st_name..], 0); + const gop = try counts.getOrPut(name); + gop.value_ptr.* = if (gop.found_existing) gop.value_ptr.* + 1 else 1; + } + } +} + +fn readFile(arena: std.mem.Allocator, path: [:0]const u8) ![]u8 { + const c = std.c; + const fd = c.open(path, .{ .ACCMODE = .RDONLY }, @as(c.mode_t, 0)); + if (fd < 0) return error.OpenFailed; + defer _ = c.close(fd); + const end = c.lseek(fd, 0, c.SEEK.END); + if (end < 0 or c.lseek(fd, 0, c.SEEK.SET) < 0) return error.ReadFailed; + const out = try arena.alloc(u8, @intCast(end)); + var filled: usize = 0; + while (filled < out.len) { + const n = c.read(fd, out[filled..].ptr, out.len - filled); + if (n <= 0) return error.ReadFailed; + filled += @intCast(n); + } + return out; +} |
