Merge branch 'zig-0.14'

Also, move emacs lisp file extension from scheme.

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");
@@ -101,11 +102,13 @@ pub fn build(b: *std.Build) void {
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-ziggy/tree-sitter-ziggy/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-ziggy/tree-sitter-ziggy-schema/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/verilog/highlights.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/commonlisp/highlights.scm");
 
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "queries/cmake/injections.scm");
     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");
@@ -131,6 +134,7 @@ pub fn build(b: *std.Build) void {
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-vim/queries/vim/injections.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-zig/queries/injections.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/verilog/injections.scm");
+    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "nvim-treesitter/queries/commonlisp/injections.scm");
 
     const syntax_mod = b.addModule("syntax", .{
         .root_source_file = b.path("src/syntax.zig"),

build.zig.zon

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

src/file_types.zig

@@ -71,6 +71,16 @@ pub const cpp = .{
     .injections = "tree-sitter-cpp/queries/injections.scm",
 };
 
+pub const csproj = .{
+    .description = "C# Project",
+    .color = 0x68217a,
+    .icon = "󰌛",
+    .extensions = .{"csproj"},
+    .comment = "<!--",
+    .highlights = "tree-sitter-xml/queries/xml/highlights.scm",
+    .parser = xml.parser,
+};
+
 pub const css = .{
     .description = "CSS",
     .color = 0x3d8fc6,
@@ -118,6 +128,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 +250,16 @@ pub const kdl = .{
     .comment = "//",
 };
 
+pub const commonlisp = .{
+    .description = "Lisp",
+    .color = 0xFFFFFF,
+    .icon = "",
+    .extensions = .{ "lisp", "ls", "el" },
+    .comment = ";",
+    .highlights = "nvim-treesitter/queries/commonlisp/highlights.scm",
+    .injections = "nvim-treesitter/queries/commonlisp/injections.scm",
+};
+
 pub const lua = .{
     .description = "Lua",
     .color = 0x02027d,
@@ -339,7 +367,6 @@ pub const odin = .{
     .description = "Odin",
     .extensions = .{"odin"},
     .comment = "//",
-    .parser = @import("file_type.zig").Parser("odin"),
     .injections = "tree-sitter-odin/queries/injections.scm",
 };
 
@@ -376,6 +403,15 @@ pub const powershell = .{
     .comment = "#",
 };
 
+pub const props = .{
+    .description = "MSBuild Properties",
+    .icon = "",
+    .extensions = .{"Directory.Build.props"},
+    .comment = "<!--",
+    .highlights = "tree-sitter-xml/queries/xml/highlights.scm",
+    .parser = xml.parser,
+};
+
 pub const proto = .{
     .description = "protobuf (proto)",
     .extensions = .{"proto"},
@@ -433,7 +469,7 @@ pub const rust = .{
 
 pub const scheme = .{
     .description = "Scheme",
-    .extensions = .{ "scm", "ss", "el" },
+    .extensions = .{ "scm", "ss" },
     .comment = ";",
 };
 
@@ -515,6 +551,7 @@ pub const xml = .{
     .comment = "<!--",
     .highlights = "tree-sitter-xml/queries/xml/highlights.scm",
     .first_line_matches = FirstLineMatch{ .prefix = "<?xml " },
+    .parser = @import("file_type.zig").Parser("xml"),
 };
 
 pub const yaml = .{