From 1a2a76c90066676e25bd1e318b46ffa574f76bac Mon Sep 17 00:00:00 2001
From: CJ van den Berg <cj@vdbonline.com>
Date: Thu, 11 Sep 2025 09:41:10 +0200
Subject: [PATCH 1/6] 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 <cj@vdbonline.com>
Date: Thu, 11 Sep 2025 09:41:51 +0200
Subject: [PATCH 2/6] 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",
 };
 

From a661b63a58c0acc55a83b8c7a76080626a4d4b55 Mon Sep 17 00:00:00 2001
From: CJ van den Berg <cj@vdbonline.com>
Date: Thu, 11 Sep 2025 10:25:02 +0200
Subject: [PATCH 3/6] feat: add csproj file type

---
 src/file_types.zig | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/file_types.zig b/src/file_types.zig
index acc240d..2d0df99 100644
--- a/src/file_types.zig
+++ b/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,
@@ -533,6 +543,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 = .{

From 821f5d03cdd09bbe41c9e23cd7cb06945567c46d Mon Sep 17 00:00:00 2001
From: CJ van den Berg <cj@vdbonline.com>
Date: Thu, 11 Sep 2025 10:25:20 +0200
Subject: [PATCH 4/6] feat: add msbuild props file type

---
 src/file_types.zig | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/file_types.zig b/src/file_types.zig
index 2d0df99..7bd5fa9 100644
--- a/src/file_types.zig
+++ b/src/file_types.zig
@@ -403,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"},

From 69ea05c1d56c348f3a1dfae85a8da5541b7ee2ea Mon Sep 17 00:00:00 2001
From: CJ van den Berg <cj@vdbonline.com>
Date: Thu, 11 Sep 2025 10:25:40 +0200
Subject: [PATCH 5/6] refactor: zig fmt

---
 src/file_types.zig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/file_types.zig b/src/file_types.zig
index 7bd5fa9..c9c2f7c 100644
--- a/src/file_types.zig
+++ b/src/file_types.zig
@@ -128,7 +128,7 @@ pub const fish = .{
     .highlights = "tree-sitter-fish/queries/highlights.scm",
 };
 
-pub const @"fsharp" = .{
+pub const fsharp = .{
     .description = "F#",
     .color = 0x378bba,
     .icon = "",
@@ -254,7 +254,7 @@ pub const commonlisp = .{
     .description = "Lisp",
     .color = 0xFFFFFF,
     .icon = "",
-    .extensions = .{"lisp", "ls", "el"},
+    .extensions = .{ "lisp", "ls", "el" },
     .comment = ";",
     .highlights = "tree-sitter-scheme/queries/highlights.scm",
     .parser = scheme.parser,

From c9b46b6b664c36b95e89517e7076265a99840f97 Mon Sep 17 00:00:00 2001
From: CJ van den Berg <cj@vdbonline.com>
Date: Thu, 11 Sep 2025 10:36:05 +0200
Subject: [PATCH 6/6] feat: use commonlisp tree-sitter parser

---
 build.zig          | 2 ++
 build.zig.zon      | 4 ++--
 src/file_types.zig | 5 ++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.zig b/build.zig
index aca3e86..de865d1 100644
--- a/build.zig
+++ b/build.zig
@@ -102,6 +102,7 @@ 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");
@@ -133,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"),
diff --git a/build.zig.zon b/build.zig.zon
index a53abd7..ba748bd 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-f9fb7a84a1d7e1aeaa88b95ce2306c2e24e7b1b9/source.tar.gz",
-            .hash = "N-V-__8AAAbAVCqbNHeQBE-3LU1IcULUOEWAZaLueuct59Z9",
+            .url = "https://github.com/neurocyte/tree-sitter/releases/download/zig-0.14-442fdce63897329a7cf2f533508c6879e0e1c094/source.tar.gz",
+            .hash = "N-V-__8AAEzbrirOSwR2m8orFR06xmMmuA_m7wSxLi29ntV3",
         },
         .cbor = .{
             .url = "https://github.com/neurocyte/cbor/archive/1fccb83c70cd84e1dff57cc53f7db8fb99909a94.tar.gz",
diff --git a/src/file_types.zig b/src/file_types.zig
index c9c2f7c..8bf077b 100644
--- a/src/file_types.zig
+++ b/src/file_types.zig
@@ -256,8 +256,8 @@ pub const commonlisp = .{
     .icon = "",
     .extensions = .{ "lisp", "ls", "el" },
     .comment = ";",
-    .highlights = "tree-sitter-scheme/queries/highlights.scm",
-    .parser = scheme.parser,
+    .highlights = "nvim-treesitter/queries/commonlisp/highlights.scm",
+    .injections = "nvim-treesitter/queries/commonlisp/injections.scm",
 };
 
 pub const lua = .{
@@ -471,7 +471,6 @@ pub const scheme = .{
     .description = "Scheme",
     .extensions = .{ "scm", "ss" },
     .comment = ";",
-    .parser = @import("file_type.zig").Parser("scheme"),
 };
 
 pub const sql = .{