From 78f312e1e54680f1811bb0f2f4eff3144785809e Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Tue, 26 Nov 2024 10:08:37 +0100 Subject: [PATCH 1/2] feat: add cmake support --- build.zig | 2 ++ build.zig.zon | 4 ++-- src/file_types.zig | 11 +++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/build.zig b/build.zig index 8839167..4b0c6af 100644 --- a/build.zig +++ b/build.zig @@ -17,6 +17,7 @@ pub fn build(b: *std.Build) void { const imports: []const std.Build.Module.Import = if (use_tree_sitter) &.{ .{ .name = "build_options", .module = options_mod }, .{ .name = "treez", .module = tree_sitter_dep.module("treez") }, + ts_queryfile(b, tree_sitter_dep, "queries/cmake/highlights.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-agda/queries/highlights.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-bash/queries/highlights.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-c-sharp/queries/highlights.scm"), @@ -74,6 +75,7 @@ pub fn build(b: *std.Build) void { ts_queryfile(b, tree_sitter_dep, "tree-sitter-ziggy/tree-sitter-ziggy/queries/highlights.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-ziggy/tree-sitter-ziggy-schema/queries/highlights.scm"), + ts_queryfile(b, tree_sitter_dep, "queries/cmake/injections.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-cpp/queries/injections.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-elixir/queries/injections.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-gitcommit/queries/injections.scm"), diff --git a/build.zig.zon b/build.zig.zon index 6e68ca7..9d4cc6c 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -4,8 +4,8 @@ .dependencies = .{ .@"tree-sitter" = .{ - .url = "https://github.com/neurocyte/tree-sitter/releases/download/master-dd309424e01e47c9161ecaf727608a97151a0793/source.tar.gz", - .hash = "1220f4f30f40b55a2ad5f15152d123c67a4a1b6447408cf9884bc1de26439ace197e", + .url = "https://github.com/neurocyte/tree-sitter/releases/download/master-c20cbdfcdb3b9650a873614b2c361a2a2aaeb068/source.tar.gz", + .hash = "122042464e2fd94116fe6f63e8939ddb59b5e55b53ed95945537753bee9b119a5089", }, }, .paths = .{ diff --git a/src/file_types.zig b/src/file_types.zig index bdc567a..ada91c1 100644 --- a/src/file_types.zig +++ b/src/file_types.zig @@ -38,6 +38,17 @@ pub const conf = .{ .parser = fish.parser, }; +pub const cmake = .{ + .color = 0x004078, + .icon = "", + .extensions = .{ "CMakeLists.txt", "cmake", "cmake.in" }, + .comment = "#", + .highlights = "queries/cmake/highlights.scm", + .injections = "queries/cmake/injections.scm", + .formatter = .{"cmake-format"}, + .language_server = .{"cmake-language-server"}, +}; + pub const cpp = .{ .color = 0x9c033a, .icon = "", From 017c727e1c1a129ada4fa1dbe2c1f62448d35177 Mon Sep 17 00:00:00 2001 From: GigaGrunch Date: Mon, 2 Dec 2024 19:24:23 +0100 Subject: [PATCH 2/2] feat: add odin support closes #74 --- build.zig | 2 ++ build.zig.zon | 4 ++-- src/file_types.zig | 9 +++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/build.zig b/build.zig index 4b0c6af..13d3c18 100644 --- a/build.zig +++ b/build.zig @@ -51,6 +51,7 @@ pub fn build(b: *std.Build) void { ts_queryfile(b, tree_sitter_dep, "tree-sitter-nix/queries/highlights.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-nu/queries/nu/highlights.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-ocaml/queries/highlights.scm"), + ts_queryfile(b, tree_sitter_dep, "tree-sitter-odin/queries/highlights.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-openscad/queries/highlights.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-org/queries/highlights.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-php/queries/highlights.scm"), @@ -89,6 +90,7 @@ pub fn build(b: *std.Build) void { ts_queryfile(b, tree_sitter_dep, "tree-sitter-nasm/queries/injections.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-nix/queries/injections.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-nu/queries/nu/injections.scm"), + ts_queryfile(b, tree_sitter_dep, "tree-sitter-odin/queries/injections.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-openscad/queries/injections.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-php/queries/injections.scm"), ts_queryfile(b, tree_sitter_dep, "tree-sitter-purescript/queries/injections.scm"), diff --git a/build.zig.zon b/build.zig.zon index 9d4cc6c..b08615b 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -4,8 +4,8 @@ .dependencies = .{ .@"tree-sitter" = .{ - .url = "https://github.com/neurocyte/tree-sitter/releases/download/master-c20cbdfcdb3b9650a873614b2c361a2a2aaeb068/source.tar.gz", - .hash = "122042464e2fd94116fe6f63e8939ddb59b5e55b53ed95945537753bee9b119a5089", + .url = "https://github.com/neurocyte/tree-sitter/releases/download/master-c3b0bddfbd7a12b3fe82625633019bafc0bf7959/source.tar.gz", + .hash = "1220ff3a4c4261bea6341e938626b1aa951c8e5274a59e389ef86a8e0b04744ca4f3", }, }, .paths = .{ diff --git a/src/file_types.zig b/src/file_types.zig index ada91c1..13dc274 100644 --- a/src/file_types.zig +++ b/src/file_types.zig @@ -300,6 +300,15 @@ pub const ocaml = .{ .language_server = .{ "ocamllsp", "--fallback-read-dot-merlin" }, }; +pub const odin = .{ + .extensions = .{"odin"}, + .comment = "//", + .parser = @import("file_type.zig").Parser("odin"), + .injections = "tree-sitter-odin/queries/injections.scm", + .language_server = .{ "ols" }, + .formatter = .{ "odinfmt", "-stdin" }, +}; + pub const openscad = .{ .color = 0x000000, .icon = "󰻫",