Merge branch 'master' into zig-0.14

src/file_type.zig

@@ -125,6 +125,8 @@ fn load_file_types(comptime Namespace: type) []const FileType {
                     .highlights = if (build_options.use_tree_sitter)
                         if (@hasField(@TypeOf(args), "highlights"))
                             @embedFile(args.highlights)
+                        else if (@hasField(@TypeOf(args), "highlights_list"))
+                            @embedFile(args.highlights_list[0]) ++ "\n" ++ @embedFile(args.highlights_list[1])
                         else
                             @embedFile("tree-sitter-" ++ lang ++ "/queries/highlights.scm")
                     else

src/file_types.zig

@@ -43,6 +43,10 @@ pub const cpp = .{
     .icon = "",
     .extensions = .{ "cc", "cpp", "cxx", "hpp", "hxx", "h", "ipp", "ixx" },
     .comment = "//",
+    .highlights_list = .{
+        "tree-sitter-c/queries/highlights.scm",
+        "tree-sitter-cpp/queries/highlights.scm",
+    },
     .injections = "tree-sitter-cpp/queries/injections.scm",
     .formatter = .{"clang-format"},
     .language_server = .{"clangd"},
@@ -243,6 +247,16 @@ pub const nix = .{
     .injections = "tree-sitter-nix/queries/injections.scm",
 };
 
+pub const nu = .{
+    .color = 0x3AA675,
+    .icon = ">",
+    .extensions = .{ "nu", "nushell" },
+    .comment = "#",
+    .language_server = .{"nu", "--lsp"},
+    .highlights = "tree-sitter-nu/queries/nu/highlights.scm",
+    .injections = "tree-sitter-nu/queries/nu/injections.scm",
+};
+
 pub const ocaml = .{
     .color = 0xF18803,
     .icon = "",
@@ -348,6 +362,15 @@ pub const typst = .{
     .injections = "tree-sitter-typst/queries/typst/injections.scm",
 };
 
+pub const vim = .{
+    .color = 0x007f00,
+    .icon = "",
+    .extensions = .{"vim"},
+    .comment = "\"",
+    .highlights = "tree-sitter-vim/queries/vim/highlights.scm",
+    .injections = "tree-sitter-vim/queries/vim/injections.scm",
+};
+
 pub const xml = .{
     .icon = "󰗀",
     .extensions = .{"xml"},