Merge branch 'zig-0.14'

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");

build.zig.zon

@@ -6,8 +6,8 @@
 
     .dependencies = .{
         .tree_sitter = .{
-            .url = "https://github.com/neurocyte/tree-sitter/releases/download/master-f1f032d24f621e2ee4deab1c424d3bf9fb809f6e/source.tar.gz",
+            .url = "https://github.com/neurocyte/tree-sitter/releases/download/master-5ec28d8d8c8a4e4bbaa4b3c753c69d0e0cafd4d8/source.tar.gz",
-            .hash = "tree_sitter-0.22.4-150-g7e3f5726-z0LhyN88UicDHlr22vQnOZ3DW9NWN1gOhDwLuCRXvrh2",
+            .hash = "tree_sitter-0.22.4-150-g7e3f5726-z0LhyCs9UicQB0_GjKHjOTW0HnpOhh2Jk9Pfay_35Ogz",
         },
         .cbor = .{
             .url = "git+https://github.com/neurocyte/cbor?ref=master#0708420594f5af0a8289e6e1bae0ae03f011731f",

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,
@@ -232,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,
@@ -339,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",
 };
 
@@ -433,8 +450,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 = .{