From 53dee5322a0e9f48ded54f85396b386ba60d2945 Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Tue, 9 Sep 2025 20:44:35 +0200 Subject: [PATCH 1/4] feat: add F# language support --- build.zig | 2 ++ build.zig.zon | 4 ++-- src/file_types.zig | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/build.zig b/build.zig index 2b3a149..aca3e86 100644 --- a/build.zig +++ b/build.zig @@ -50,6 +50,7 @@ pub fn build(b: *std.Build) void { ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-gleam/queries/highlights.scm"); ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-go/queries/highlights.scm"); ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-fish/queries/highlights.scm"); + ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-fsharp/queries/highlights.scm"); ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-haskell/queries/highlights.scm"); ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-hare/queries/highlights.scm"); ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-html/queries/highlights.scm"); @@ -106,6 +107,7 @@ pub fn build(b: *std.Build) void { ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-astro/queries/injections.scm"); ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-cpp/queries/injections.scm"); ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-elixir/queries/injections.scm"); + ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-fsharp/queries/injections.scm"); ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-gitcommit/queries/injections.scm"); ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-hare/queries/injections.scm"); ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-html/queries/injections.scm"); diff --git a/build.zig.zon b/build.zig.zon index 70ca5d8..71bc6fd 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -6,8 +6,8 @@ .dependencies = .{ .tree_sitter = .{ - .url = "https://github.com/neurocyte/tree-sitter/releases/download/master-1c3ad59bd98ee430b166054030dac4c46d641e39/source.tar.gz", - .hash = "N-V-__8AANMzUiemOR2eNnrtlMmAGHFqij6VYtDUiaFfn6Dw", + .url = "https://github.com/neurocyte/tree-sitter/releases/download/zig-0.14-2e108df55cd679c2be7c7ddd10d026de09410aae/source.tar.gz", + .hash = "N-V-__8AABDAVCpKTGy7DPBiCqufqZcalDYKZA2urB6Ewnmb", }, .cbor = .{ .url = "https://github.com/neurocyte/cbor/archive/1fccb83c70cd84e1dff57cc53f7db8fb99909a94.tar.gz", diff --git a/src/file_types.zig b/src/file_types.zig index 1495758..eeb9d07 100644 --- a/src/file_types.zig +++ b/src/file_types.zig @@ -118,6 +118,14 @@ pub const fish = .{ .highlights = "tree-sitter-fish/queries/highlights.scm", }; +pub const @"fsharp" = .{ + .description = "F#", + .color = 0x378bba, + .icon = "", + .extensions = .{"fs"}, + .comment = "//", +}; + pub const @"git-rebase" = .{ .description = "Git (rebase)", .color = 0xf34f29, From ba7fc816227ad4f1bb36fbb332d53d28affc64fe Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Tue, 9 Sep 2025 22:29:12 +0200 Subject: [PATCH 2/4] fix: update tree-sitter to fix fsharp typo --- build.zig.zon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.zig.zon b/build.zig.zon index 71bc6fd..a53abd7 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -6,8 +6,8 @@ .dependencies = .{ .tree_sitter = .{ - .url = "https://github.com/neurocyte/tree-sitter/releases/download/zig-0.14-2e108df55cd679c2be7c7ddd10d026de09410aae/source.tar.gz", - .hash = "N-V-__8AABDAVCpKTGy7DPBiCqufqZcalDYKZA2urB6Ewnmb", + .url = "https://github.com/neurocyte/tree-sitter/releases/download/zig-0.14-f9fb7a84a1d7e1aeaa88b95ce2306c2e24e7b1b9/source.tar.gz", + .hash = "N-V-__8AAAbAVCqbNHeQBE-3LU1IcULUOEWAZaLueuct59Z9", }, .cbor = .{ .url = "https://github.com/neurocyte/cbor/archive/1fccb83c70cd84e1dff57cc53f7db8fb99909a94.tar.gz", From 1a2a76c90066676e25bd1e318b46ffa574f76bac Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Thu, 11 Sep 2025 09:41:10 +0200 Subject: [PATCH 3/4] feat: add common lisp file type (with scheme parser for now) Also, move emacs lisp file extension from scheme. --- src/file_types.zig | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/file_types.zig b/src/file_types.zig index eeb9d07..70c6595 100644 --- a/src/file_types.zig +++ b/src/file_types.zig @@ -240,6 +240,16 @@ pub const kdl = .{ .comment = "//", }; +pub const commonlisp = .{ + .description = "Lisp", + .color = 0xFFFFFF, + .icon = "", + .extensions = .{"lisp", "ls", "el"}, + .comment = ";", + .highlights = "tree-sitter-scheme/queries/highlights.scm", + .parser = scheme.parser, +}; + pub const lua = .{ .description = "Lua", .color = 0x02027d, @@ -441,8 +451,9 @@ pub const rust = .{ pub const scheme = .{ .description = "Scheme", - .extensions = .{ "scm", "ss", "el" }, + .extensions = .{ "scm", "ss" }, .comment = ";", + .parser = @import("file_type.zig").Parser("scheme"), }; pub const sql = .{ From de925265a1dfabe64b96ef922a1c1b13ab55324e Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Thu, 11 Sep 2025 09:41:51 +0200 Subject: [PATCH 4/4] refactor: remove unused odin parser declaration --- src/file_types.zig | 1 - 1 file changed, 1 deletion(-) diff --git a/src/file_types.zig b/src/file_types.zig index 70c6595..acc240d 100644 --- a/src/file_types.zig +++ b/src/file_types.zig @@ -357,7 +357,6 @@ pub const odin = .{ .description = "Odin", .extensions = .{"odin"}, .comment = "//", - .parser = @import("file_type.zig").Parser("odin"), .injections = "tree-sitter-odin/queries/injections.scm", };