Add Zig support

build.rs

@@ -189,6 +189,11 @@ fn main() {
             src_dir: "vendor/tree-sitter-typescript-src/typescript/src",
             extra_files: vec!["scanner.c"],
         },
+        TreeSitterParser {
+            name: "tree-sitter-zig",
+            src_dir: "vendor/tree-sitter-zig-src",
+            extra_files: vec![],
+        },
     ];
 
     // Only rerun if relevant files in the vendor/ directory change.

sample_files/zig_after.zig

@@ -0,0 +1,6 @@
+const std = @import("std");
+
+pub fn main() void {
+    std.debug.print("Hello, {s}!", .{"user"});
+    std.debug.print("Hello, again!", .{});
+}

sample_files/zig_before.zig

@@ -0,0 +1,5 @@
+const std = @import("std");
+
+pub fn main() void {
+    std.debug.print("Hello, {s}!", .{"world"});
+}

src/guess_language.rs

@@ -46,6 +46,7 @@ pub enum Language {
     Scala,
     Tsx,
     TypeScript,
+    Zig,
 }
 
 use Language::*;
@@ -109,6 +110,7 @@ fn from_emacs_mode_header(src: &str) -> Option<Language> {
             "sh" => Some(Bash),
             "tuareg" => Some(OCaml),
             "typescript" => Some(TypeScript),
+            "zig" => Some(Zig),
             _ => None,
         };
         if lang.is_some() {
@@ -208,6 +210,7 @@ fn from_extension(extension: &OsStr, src: &str) -> Option<Language> {
         "scala" | "sbt" | "sc" => Some(Scala),
         "ts" => Some(TypeScript),
         "tsx" => Some(Tsx),
+        "zig" => Some(Zig),
         _ => None,
     }
 }

src/tree_sitter_parser.rs

@@ -70,6 +70,7 @@ extern "C" {
     fn tree_sitter_scala() -> ts::Language;
     fn tree_sitter_tsx() -> ts::Language;
     fn tree_sitter_typescript() -> ts::Language;
+    fn tree_sitter_zig() -> ts::Language;
 }
 
 // TODO: begin/end and object/end.
@@ -535,6 +536,24 @@ pub fn from_language(language: guess::Language) -> TreeSitterConfig {
                 .unwrap(),
             }
         }
+        Zig => {
+            let language = unsafe { tree_sitter_zig() };
+            TreeSitterConfig {
+                name: "Zig",
+                language,
+                atom_nodes: (vec!["STRINGLITERALSINGLE"])
+                    .into_iter()
+                    .collect(),
+                delimiter_tokens: (vec![("{", "}"), ("[", "]"), ("(", ")")])
+                    .into_iter()
+                    .collect(),
+                highlight_query: ts::Query::new(
+                    language,
+                    include_str!("../vendor/highlights/zig.scm"),
+                )
+                .unwrap(),
+            }
+        }
     }
 }
 

vendor/highlights/zig.scm

@@ -0,0 +1 @@
+../tree-sitter-zig/queries/highlights.scm

vendor/tree-sitter-zig-src

@@ -0,0 +1 @@
+tree-sitter-zig/src