build.zig

@@ -74,11 +74,9 @@ pub fn build(b: *std.Build) void {
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-openscad/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-org/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-php/queries/highlights.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-proto/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-python/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-purescript/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-regex/queries/highlights.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-rpmspec/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-ruby/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-rust/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-ssh-config/queries/highlights.scm");
@@ -90,7 +88,6 @@ pub fn build(b: *std.Build) void {
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-toml/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-typescript/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-typst/queries/typst/highlights.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-uxntal/queries/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-vim/queries/vim/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-xml/queries/dtd/highlights.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-xml/queries/xml/highlights.scm");
@@ -124,7 +121,6 @@ pub fn build(b: *std.Build) void {
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-superhtml/tree-sitter-superhtml/queries/injections.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-swift/queries/injections.scm");
     ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-typst/queries/typst/injections.scm");
-    ts_queryfile(b, tree_sitter_dep, ts_bin_query_gen, "tree-sitter-uxntal/queries/injections.scm");
     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");

build.zig.zon

@@ -2,12 +2,12 @@
     .name = .flow_syntax,
     .version = "0.1.0",
     .fingerprint = 0x3ba2584ea1cec85f,
-    .minimum_zig_version = "0.14.1",
+    .minimum_zig_version = "0.14.0-dev.3451+d8d2aa9af",
 
     .dependencies = .{
         .tree_sitter = .{
-            .url = "https://github.com/neurocyte/tree-sitter/releases/download/master-db95c4c19db807fa9acd6853dbd5fb7011906b7d/source.tar.gz",
+            .url = "https://github.com/neurocyte/tree-sitter/releases/download/master-86dd4d2536f2748c5b4ea0e1e70678039a569aac/source.tar.gz",
-            .hash = "N-V-__8AAHgNBifXb56e2xqWSBTJj5bN4jAtfyP3T9GYr8Oc",
+            .hash = "N-V-__8AACablCbp-6lsRoKDEp6Xd2dHLe4AsW81blkSQxzs",
         },
         .cbor = .{
             .url = "https://github.com/neurocyte/cbor/archive/1fccb83c70cd84e1dff57cc53f7db8fb99909a94.tar.gz",

src/QueryCache.zig

@@ -16,7 +16,6 @@ allocator: std.mem.Allocator,
 mutex: ?std.Thread.Mutex,
 highlights: std.StringHashMapUnmanaged(*CacheEntry) = .{},
 injections: std.StringHashMapUnmanaged(*CacheEntry) = .{},
-errors: std.StringHashMapUnmanaged(*CacheEntry) = .{},
 ref_count: usize = 1,
 
 const CacheEntry = struct {
@@ -39,7 +38,6 @@ const CacheEntry = struct {
 
 pub const QueryType = enum {
     highlights,
-    errors,
     injections,
 };
 
@@ -85,20 +83,21 @@ fn release_ref_unlocked_and_maybe_destroy(self: *Self) void {
         if (self.ref_count > 0) return;
     }
 
-    release_cache_entry_hash_map(self.allocator, &self.highlights);
+    var iter_highlights = self.highlights.iterator();
-    release_cache_entry_hash_map(self.allocator, &self.errors);
+    while (iter_highlights.next()) |p| {
-    release_cache_entry_hash_map(self.allocator, &self.injections);
+        self.allocator.free(p.key_ptr.*);
-    self.allocator.destroy(self);
+        p.value_ptr.*.destroy(self.allocator);
-}
+        self.allocator.destroy(p.value_ptr.*);
-
-fn release_cache_entry_hash_map(allocator: std.mem.Allocator, hash_map: *std.StringHashMapUnmanaged(*CacheEntry)) void {
-    var iter = hash_map.iterator();
-    while (iter.next()) |p| {
-        allocator.free(p.key_ptr.*);
-        p.value_ptr.*.destroy(allocator);
-        allocator.destroy(p.value_ptr.*);
     }
-    hash_map.deinit(allocator);
+    var iter_injections = self.injections.iterator();
+    while (iter_injections.next()) |p| {
+        self.allocator.free(p.key_ptr.*);
+        p.value_ptr.*.destroy(self.allocator);
+        self.allocator.destroy(p.value_ptr.*);
+    }
+    self.highlights.deinit(self.allocator);
+    self.injections.deinit(self.allocator);
+    self.allocator.destroy(self);
 }
 
 fn get_cache_entry(self: *Self, file_type: *const FileType, comptime query_type: QueryType) CacheError!*CacheEntry {
@@ -107,7 +106,6 @@ fn get_cache_entry(self: *Self, file_type: *const FileType, comptime query_type:
 
     const hash = switch (query_type) {
         .highlights => &self.highlights,
-        .errors => &self.errors,
         .injections => &self.injections,
     };
 
@@ -137,7 +135,6 @@ fn get_cached_query(self: *Self, entry: *CacheEntry) Error!?*Query {
         const queries = FileType.queries.get(entry.file_type.name) orelse return null;
         const query_bin = switch (entry.query_type) {
             .highlights => queries.highlights_bin,
-            .errors => queries.errors_bin,
             .injections => queries.injections_bin orelse return null,
         };
         const query, const arena = try deserialize_query(query_bin, lang, self.allocator);
@@ -154,14 +151,12 @@ fn pre_load_internal(self: *Self, file_type: *const FileType, comptime query_typ
 pub fn pre_load(self: *Self, lang_name: []const u8) Error!void {
     const file_type = FileType.get_by_name(lang_name) orelse return;
     _ = try self.pre_load_internal(file_type, .highlights);
-    _ = try self.pre_load_internal(file_type, .errors);
     _ = try self.pre_load_internal(file_type, .injections);
 }
 
 fn ReturnType(comptime query_type: QueryType) type {
     return switch (query_type) {
         .highlights => *Query,
-        .errors => *Query,
         .injections => ?*Query,
     };
 }

src/file_type.zig

@@ -138,7 +138,6 @@ fn load_file_types(comptime Namespace: type) []const FileType {
 
 pub const FileTypeQueries = struct {
     highlights_bin: []const u8,
-    errors_bin: []const u8,
     injections_bin: ?[]const u8,
 };
 
@@ -146,7 +145,7 @@ pub const queries = std.static_string_map.StaticStringMap(FileTypeQueries).initC
 
 fn load_queries() []const struct { []const u8, FileTypeQueries } {
     if (!build_options.use_tree_sitter) return &.{};
-    @setEvalBranchQuota(32000);
+    @setEvalBranchQuota(16000);
     const queries_cb = @embedFile("syntax_bin_queries");
     var iter: []const u8 = queries_cb;
     var len = cbor.decodeMapHeader(&iter) catch |e| {
@@ -164,10 +163,6 @@ fn load_queries() []const struct { []const u8, FileTypeQueries } {
                 var iter_: []const u8 = iter;
                 break :blk get_query_value_bin(&iter_, "highlights") orelse @compileError("missing highlights for " ++ lang);
             },
-            .errors_bin = blk: {
-                var iter_: []const u8 = iter;
-                break :blk get_query_value_bin(&iter_, "errors") orelse @compileError("missing errors query for " ++ lang);
-            },
             .injections_bin = blk: {
                 var iter_: []const u8 = iter;
                 break :blk get_query_value_bin(&iter_, "injections");

src/file_types.zig

@@ -395,12 +395,6 @@ pub const php = .{
     .language_server = .{ "intelephense", "--stdio" },
 };
 
-pub const proto = .{
-    .description = "protobuf (proto)",
-    .extensions = .{"proto"},
-    .comment = "//",
-};
-
 pub const purescript = .{
     .description = "PureScript",
     .color = 0x14161a,
@@ -426,14 +420,6 @@ pub const regex = .{
     .comment = "#",
 };
 
-pub const rpmspec = .{
-    .description = "RPM spec",
-    .color = 0xff0000,
-    .icon = "󱄛",
-    .extensions = .{"spec"},
-    .comment = "#",
-};
-
 pub const ruby = .{
     .description = "Ruby",
     .color = 0xd91404,
@@ -521,12 +507,6 @@ pub const typst = .{
     .injections = "tree-sitter-typst/queries/typst/injections.scm",
 };
 
-pub const uxntal = .{
-    .description = "Uxntal",
-    .extensions = .{"tal"},
-    .comment = "(",
-};
-
 pub const vim = .{
     .description = "Vimscript",
     .color = 0x007f00,

src/syntax.zig

@@ -24,13 +24,11 @@ lang: *const Language,
 file_type: *const FileType,
 parser: *Parser,
 query: *Query,
-errors_query: *Query,
 injections: ?*Query,
 tree: ?*treez.Tree = null,
 
 pub fn create(file_type: *const FileType, allocator: std.mem.Allocator, query_cache: *QueryCache) !*Self {
     const query = try query_cache.get(file_type, .highlights);
-    const errors_query = try query_cache.get(file_type, .errors);
     const injections = try query_cache.get(file_type, .injections);
     const self = try allocator.create(Self);
     self.* = .{
@@ -39,7 +37,6 @@ pub fn create(file_type: *const FileType, allocator: std.mem.Allocator, query_ca
         .file_type = file_type,
         .parser = try Parser.create(),
         .query = query,
-        .errors_query = errors_query,
         .injections = injections,
     };
     errdefer self.destroy(query_cache);
@@ -197,15 +194,3 @@ pub fn node_at_point_range(self: *const Self, range: Range) error{Stop}!treez.No
     const root_node = tree.getRootNode();
     return treez.Node.externs.ts_node_descendant_for_point_range(root_node, range.start_point, range.end_point);
 }
-
-pub fn count_error_nodes(self: *const Self) usize {
-    const cursor = Query.Cursor.create() catch return std.math.maxInt(usize);
-    defer cursor.destroy();
-    const tree = self.tree orelse return 0;
-    cursor.execute(self.errors_query, tree.getRootNode());
-    var error_count: usize = 0;
-    while (cursor.nextMatch()) |match| for (match.captures()) |_| {
-        error_count += 1;
-    };
-    return error_count;
-}

src/ts_bin_query_gen.zig

@@ -4,8 +4,6 @@ const treez = @import("treez");
 
 pub const tss = @import("ts_serializer.zig");
 
-const verbose = false;
-
 pub fn main() anyerror!void {
     const allocator = std.heap.c_allocator;
     const args = try std.process.argsAlloc(allocator);
@@ -35,7 +33,7 @@ pub fn main() anyerror!void {
         const lang = file_type.lang_fn() orelse std.debug.panic("tree-sitter parser function failed for language: {s}", .{file_type.name});
 
         try cbor.writeValue(writer, file_type.name);
-        try cbor.writeMapHeader(writer, if (file_type.injections) |_| 3 else 2);
+        try cbor.writeMapHeader(writer, if (file_type.injections) |_| 2 else 1);
 
         const highlights_in = try treez.Query.create(lang, file_type.highlights);
         const ts_highlights_in: *tss.TSQuery = @alignCast(@ptrCast(highlights_in));
@@ -45,19 +43,7 @@ pub fn main() anyerror!void {
 
         try cbor.writeValue(writer, "highlights");
         try cbor.writeValue(writer, highlights_cb);
-        if (verbose)
+        // std.log.info("file_type {s} highlights {d} bytes", .{ file_type.name, highlights_cb.len });
-            std.log.info("file_type {s} highlights {d} bytes", .{ file_type.name, highlights_cb.len });
-
-        const errors_in = try treez.Query.create(lang, "(ERROR) @error");
-        const ts_errors_in: *tss.TSQuery = @alignCast(@ptrCast(errors_in));
-
-        const errors_cb = try tss.toCbor(ts_errors_in, allocator);
-        defer allocator.free(errors_cb);
-
-        try cbor.writeValue(writer, "errors");
-        try cbor.writeValue(writer, errors_cb);
-        if (verbose)
-            std.log.info("file_type {s} errors {d} bytes", .{ file_type.name, errors_cb.len });
 
         if (file_type.injections) |injections| {
             const injections_in = try treez.Query.create(lang, injections);
@@ -68,14 +54,12 @@ pub fn main() anyerror!void {
 
             try cbor.writeValue(writer, "injections");
             try cbor.writeValue(writer, injections_cb);
-            if (verbose)
+            // std.log.info("file_type {s} injections {d} bytes", .{ file_type.name, injections_cb.len });
-                std.log.info("file_type {s} injections {d} bytes", .{ file_type.name, injections_cb.len });
         }
     }
 
     try output_file.writeAll(output.items);
-    if (verbose)
+    // std.log.info("file_types total {d} bytes", .{output.items.len});
-        std.log.info("file_types total {d} bytes", .{output.items.len});
 }
 
 fn fatal(comptime format: []const u8, args: anytype) noreturn {