Merge branch 'zig-0.14'

This commit is contained in:
CJ van den Berg 2025-09-11 10:43:34 +02:00
commit 6404532851
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
3 changed files with 28 additions and 7 deletions

View file

@ -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"),

View file

@ -6,8 +6,8 @@
.dependencies = .{
.tree_sitter = .{
.url = "https://github.com/neurocyte/tree-sitter/releases/download/master-5ec28d8d8c8a4e4bbaa4b3c753c69d0e0cafd4d8/source.tar.gz",
.hash = "tree_sitter-0.22.4-150-g7e3f5726-z0LhyCs9UicQB0_GjKHjOTW0HnpOhh2Jk9Pfay_35Ogz",
.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",

View file

@ -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,7 +128,7 @@ pub const fish = .{
.highlights = "tree-sitter-fish/queries/highlights.scm",
};
pub const @"fsharp" = .{
pub const fsharp = .{
.description = "F#",
.color = 0x378bba,
.icon = "",
@ -244,10 +254,10 @@ 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,
.highlights = "nvim-treesitter/queries/commonlisp/highlights.scm",
.injections = "nvim-treesitter/queries/commonlisp/injections.scm",
};
pub const lua = .{
@ -393,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"},
@ -452,7 +471,6 @@ pub const scheme = .{
.description = "Scheme",
.extensions = .{ "scm", "ss" },
.comment = ";",
.parser = @import("file_type.zig").Parser("scheme"),
};
pub const sql = .{
@ -533,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 = .{