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

Merge flow-syntax commit 'bc0745bc4b9735e416ce1ba930af9ee99b4856e6'

Browse source
This commit is contained in:
CJ van den Berg 2025-03-19 15:26:57 +01:00
commit d5d7a9bb80
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/syntax/src/QueryCache.zig
View file

@ -13,8 +13,8 @@ const Query = treez.Query;
allocator: std.mem.Allocator, allocator: std.mem.Allocator,
mutex: ?std.Thread.Mutex, mutex: ?std.Thread.Mutex,
highlights: std.StringHashMapUnmanaged(CacheEntry) = .{}, highlights: std.StringHashMapUnmanaged(*CacheEntry) = .{},
injections: std.StringHashMapUnmanaged(CacheEntry) = .{}, injections: std.StringHashMapUnmanaged(*CacheEntry) = .{},
ref_count: usize = 1, ref_count: usize = 1,
const CacheEntry = struct { const CacheEntry = struct {
@ -95,21 +95,26 @@ fn get_cache_entry(self: *Self, file_type: *const FileType, comptime query_type:
.injections => &self.injections, .injections => &self.injections,
}; };
return if (hash.getPtr(file_type.name)) |entry| entry else blk: { return if (hash.get(file_type.name)) |entry| entry else blk: {
const entry_ = try hash.getOrPut(self.allocator, try self.allocator.dupe(u8, file_type.name)); const entry_ = try hash.getOrPut(self.allocator, try self.allocator.dupe(u8, file_type.name));
entry_.value_ptr.* = .{
const q = try self.allocator.create(CacheEntry);
q.* = .{
.query = null, .query = null,
.mutex = if (self.mutex) |_| .{} else null, .mutex = if (self.mutex) |_| .{} else null,
.file_type = file_type, .file_type = file_type,
.query_type = query_type, .query_type = query_type,
}; };
break :blk entry_.value_ptr; entry_.value_ptr.* = q;
break :blk q;
}; };
} }
fn get_cached_query(_: *Self, entry: *CacheEntry) QueryParseError!?*Query { fn get_cached_query(_: *Self, entry: *CacheEntry) QueryParseError!?*Query {
if (entry.mutex) |*mtx| mtx.lock(); if (entry.mutex) |*mtx| mtx.lock();
defer if (entry.mutex) |*mtx| mtx.unlock(); defer if (entry.mutex) |*mtx| mtx.unlock();
return if (entry.query) |query| query else blk: { return if (entry.query) |query| query else blk: {
const lang = entry.file_type.lang_fn() orelse std.debug.panic("tree-sitter parser function failed for language: {s}", .{entry.file_type.name}); const lang = entry.file_type.lang_fn() orelse std.debug.panic("tree-sitter parser function failed for language: {s}", .{entry.file_type.name});
entry.query = try Query.create(lang, switch (entry.query_type) { entry.query = try Query.create(lang, switch (entry.query_type) {