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

feat: implement case insensitive search (part 1)

Browse source
This commit is contained in:
CJ van den Berg 2025-11-25 15:53:12 +01:00
parent 679927f8bd
commit 86ec27893d
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

12
src/buffer/Buffer.zig
View file

@ -943,8 +943,9 @@ const Node = union(enum) {
} }
} }
pub const FindMode = enum { exact, case_folded };
pub const FindAllCallback = fn (data: *anyopaque, begin_row: usize, begin_col: usize, end_row: usize, end_col: usize) error{Stop}!void; pub const FindAllCallback = fn (data: *anyopaque, begin_row: usize, begin_col: usize, end_row: usize, end_col: usize) error{Stop}!void;
pub fn find_all_ranges(self: *const Node, pattern: []const u8, data: *anyopaque, callback: *const FindAllCallback, allocator: Allocator) error{ OutOfMemory, Stop }!void { pub fn find_all_ranges(self: *const Node, pattern: []const u8, data: *anyopaque, callback: *const FindAllCallback, mode: FindMode, allocator: Allocator) error{ OutOfMemory, Stop }!void {
const Ctx = struct { const Ctx = struct {
pattern: []const u8, pattern: []const u8,
data: *anyopaque, data: *anyopaque,
@ -954,6 +955,7 @@ const Node = union(enum) {
buf: []u8, buf: []u8,
rest: []u8 = "", rest: []u8 = "",
writer: std.Io.Writer, writer: std.Io.Writer,
mode: FindMode,
const Ctx = @This(); const Ctx = @This();
fn drain(w: *std.Io.Writer, data_: []const []const u8, splat: usize) std.Io.Writer.Error!usize { fn drain(w: *std.Io.Writer, data_: []const []const u8, splat: usize) std.Io.Writer.Error!usize {
@ -975,10 +977,17 @@ const Node = union(enum) {
fn write(ctx: *Ctx, bytes: []const u8) std.Io.Writer.Error!usize { fn write(ctx: *Ctx, bytes: []const u8) std.Io.Writer.Error!usize {
var input = bytes; var input = bytes;
while (true) { while (true) {
switch (ctx.mode) {
.exact => {
const input_consume_size = @min(ctx.buf.len - ctx.rest.len, input.len); const input_consume_size = @min(ctx.buf.len - ctx.rest.len, input.len);
@memcpy(ctx.buf[ctx.rest.len .. ctx.rest.len + input_consume_size], input[0..input_consume_size]); @memcpy(ctx.buf[ctx.rest.len .. ctx.rest.len + input_consume_size], input[0..input_consume_size]);
ctx.rest = ctx.buf[0 .. ctx.rest.len + input_consume_size]; ctx.rest = ctx.buf[0 .. ctx.rest.len + input_consume_size];
input = input[input_consume_size..]; input = input[input_consume_size..];
},
.case_folded => {
@panic("unimplemented");
},
}
if (ctx.rest.len < ctx.pattern.len) if (ctx.rest.len < ctx.pattern.len)
return bytes.len - input.len; return bytes.len - input.len;
@ -1031,6 +1040,7 @@ const Node = union(enum) {
}, },
.buffer = &.{}, .buffer = &.{},
}, },
.mode = mode,
}; };
defer allocator.free(ctx.buf); defer allocator.free(ctx.buf);
return self.store(&ctx.writer, .lf) catch |e| switch (e) { return self.store(&ctx.writer, .lf) catch |e| switch (e) {

2
src/tui/editor.zig
View file

@ -5296,7 +5296,7 @@ pub const Editor = struct {
defer self.add_match_done(); defer self.add_match_done();
var ctx: Ctx = .{ .self = self }; var ctx: Ctx = .{ .self = self };
self.init_matches_update(); self.init_matches_update();
try root.find_all_ranges(query, &ctx, Ctx.cb, self.allocator); try root.find_all_ranges(query, &ctx, Ctx.cb, .exact, self.allocator);
} }
fn find_in_buffer_async(self: *Self, query: []const u8) !void { fn find_in_buffer_async(self: *Self, query: []const u8) !void {