neurocyte/flow-syntax
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: memory leak with injections query

Browse source 
backported to zig-0.15 branch
This commit is contained in:
Ryan Mehri 2026-04-11 12:55:38 -04:00 • committed by CJ van den Berg
parent 5a32cf3ffb
commit 5bc4bcba15
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/QueryCache.zig
View file

@ -171,7 +171,7 @@ fn ReturnType(comptime query_type: QueryType) type {
pub fn get(self: *Self, file_type: FileType, comptime query_type: QueryType) Error!ReturnType(query_type) { pub fn get(self: *Self, file_type: FileType, comptime query_type: QueryType) Error!ReturnType(query_type) {
const query = try self.get_cached_query(try self.get_cache_entry(file_type, query_type)); const query = try self.get_cached_query(try self.get_cache_entry(file_type, query_type));
self.add_ref_locked(); if (query != null) self.add_ref_locked();
return switch (@typeInfo(ReturnType(query_type))) { return switch (@typeInfo(ReturnType(query_type))) {
.optional => |_| query, .optional => |_| query,
else => query.?, else => query.?,

20
src/syntax.zig
View file

@ -49,7 +49,7 @@ pub fn create(file_type: FileType, allocator: std.mem.Allocator, query_cache: *Q
const query = try query_cache.get(file_type, .highlights); const query = try query_cache.get(file_type, .highlights);
errdefer query_cache.release(query, .highlights); errdefer query_cache.release(query, .highlights);
const errors_query = try query_cache.get(file_type, .errors); const errors_query = try query_cache.get(file_type, .errors);
errdefer query_cache.release(errors_query, .highlights); errdefer query_cache.release(errors_query, .errors);
const injections = try query_cache.get(file_type, .injections); const injections = try query_cache.get(file_type, .injections);
errdefer if (injections) |injections_| query_cache.release(injections_, .injections); errdefer if (injections) |injections_| query_cache.release(injections_, .injections);
const self = try allocator.create(Self); const self = try allocator.create(Self);
@ -85,7 +85,7 @@ pub fn destroy(self: *Self) void {
if (self.content) |c| self.allocator.free(c); if (self.content) |c| self.allocator.free(c);
if (self.tree) |tree| tree.destroy(); if (self.tree) |tree| tree.destroy();
self.query_cache.release(self.query, .highlights); self.query_cache.release(self.query, .highlights);
self.query_cache.release(self.errors_query, .highlights); self.query_cache.release(self.errors_query, .errors);
if (self.injections) |injections| self.query_cache.release(injections, .injections); if (self.injections) |injections| self.query_cache.release(injections, .injections);
self.parser.destroy(); self.parser.destroy();
self.allocator.destroy(self); self.allocator.destroy(self);
@ -484,9 +484,19 @@ pub fn count_error_nodes(self: *const Self) usize {
} }
test "simple build and link test" { test "simple build and link test" {
const gpa = std.testing.allocator;
const zig_file_type = @import("file_type.zig").get_by_name_static("zig") orelse return error.TestFailed; const zig_file_type = @import("file_type.zig").get_by_name_static("zig") orelse return error.TestFailed;
const query_cache = try QueryCache.create(std.testing.allocator, .{}); const query_cache = try QueryCache.create(gpa, .{});
defer query_cache.deinit(); defer query_cache.deinit();
const syntax = try create(zig_file_type, std.testing.allocator, query_cache); const syntax = try create(zig_file_type, gpa, query_cache);
syntax.destroy(); defer syntax.destroy();
const content = try std.fs.cwd().readFileAlloc(gpa, "src/syntax.zig", std.math.maxInt(usize));
defer gpa.free(content);
try syntax.refresh_full(content);
try syntax.render({}, struct {
fn cb(_: void, _: Range, _: []const u8, _: u32, _: usize, _: *const Node) error{Stop}!void {}
}.cb, null);
} }