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

refactor: rename Buffer.del_chars to Buffer.delete_bytes

Browse source
This commit is contained in:
CJ van den Berg 2024-12-19 22:41:26 +01:00
parent f134fdb747
commit d3b12774c4
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/buffer/Buffer.zig
View file

@ -644,10 +644,10 @@ const Node = union(enum) {
}; };
_ = self.get_range(sel, null, &size, null, metrics) catch return error.Stop; _ = self.get_range(sel, null, &size, null, metrics) catch return error.Stop;
const pos = try self.get_line_width_to_pos(sel.begin.row, sel.begin.col, metrics); const pos = try self.get_line_width_to_pos(sel.begin.row, sel.begin.col, metrics);
return self.del_chars(sel.begin.row, pos, size, allocator, metrics) catch return error.Stop; return self.delete_bytes(sel.begin.row, pos, size, allocator, metrics) catch return error.Stop;
} }
pub fn del_chars(self: *const Node, line: usize, pos_: usize, bytes: usize, allocator: Allocator, metrics_: Metrics) !Root { pub fn delete_bytes(self: *const Node, line: usize, pos_: usize, bytes: usize, allocator: Allocator, metrics_: Metrics) !Root {
const Ctx = struct { const Ctx = struct {
allocator: Allocator, allocator: Allocator,
pos: usize, pos: usize,

16
test/tests_buffer.zig
View file

@ -192,7 +192,7 @@ test "get_byte_pos" {
try std.testing.expectEqual(97, try buffer.root.get_byte_pos(.{ .row = 11, .col = 2 }, metrics(), eol_mode)); try std.testing.expectEqual(97, try buffer.root.get_byte_pos(.{ .row = 11, .col = 2 }, metrics(), eol_mode));
} }
test "del_chars" { test "delete_bytes" {
const doc: []const u8 = const doc: []const u8 =
\\All your \\All your
\\ropes \\ropes
@ -213,12 +213,12 @@ test "del_chars" {
defer buffer.deinit(); defer buffer.deinit();
buffer.update(try buffer.load_from_string(doc, &eol_mode, &sanitized)); buffer.update(try buffer.load_from_string(doc, &eol_mode, &sanitized));
buffer.update(try buffer.root.del_chars(3, try buffer.root.line_width(3, metrics()) - 1, 1, buffer.allocator, metrics())); buffer.update(try buffer.root.delete_bytes(3, try buffer.root.line_width(3, metrics()) - 1, 1, buffer.allocator, metrics()));
const line3 = try get_line(buffer, 3); const line3 = try get_line(buffer, 3);
defer a.free(line3); defer a.free(line3);
try std.testing.expect(std.mem.eql(u8, line3, "us")); try std.testing.expect(std.mem.eql(u8, line3, "us"));
buffer.update(try buffer.root.del_chars(3, 0, 7, buffer.allocator, metrics())); buffer.update(try buffer.root.delete_bytes(3, 0, 7, buffer.allocator, metrics()));
const line3_1 = try get_line(buffer, 3); const line3_1 = try get_line(buffer, 3);
defer a.free(line3_1); defer a.free(line3_1);
try std.testing.expect(std.mem.eql(u8, line3_1, "your")); try std.testing.expect(std.mem.eql(u8, line3_1, "your"));
@ -227,7 +227,7 @@ test "del_chars" {
buffer.update(try buffer.root.rebalance(buffer.allocator, buffer.allocator)); buffer.update(try buffer.root.rebalance(buffer.allocator, buffer.allocator));
try std.testing.expect(buffer.root.is_balanced()); try std.testing.expect(buffer.root.is_balanced());
buffer.update(try buffer.root.del_chars(0, try buffer.root.line_width(0, metrics()) - 1, 2, buffer.allocator, metrics())); buffer.update(try buffer.root.delete_bytes(0, try buffer.root.line_width(0, metrics()) - 1, 2, buffer.allocator, metrics()));
const line0 = try get_line(buffer, 0); const line0 = try get_line(buffer, 0);
defer a.free(line0); defer a.free(line0);
try std.testing.expect(std.mem.eql(u8, line0, "All youropes")); try std.testing.expect(std.mem.eql(u8, line0, "All youropes"));
@ -239,7 +239,7 @@ fn check_line(buffer: *const Buffer, line_no: usize, expect: []const u8) !void {
try std.testing.expect(std.mem.eql(u8, line, expect)); try std.testing.expect(std.mem.eql(u8, line, expect));
} }
test "del_chars2" { test "delete_bytes2" {
const doc: []const u8 = const doc: []const u8 =
\\All your \\All your
\\ropes \\ropes
@ -260,14 +260,14 @@ test "del_chars2" {
defer buffer.deinit(); defer buffer.deinit();
buffer.update(try buffer.load_from_string(doc, &eol_mode, &sanitized)); buffer.update(try buffer.load_from_string(doc, &eol_mode, &sanitized));
buffer.update(try buffer.root.del_chars(2, try buffer.root.line_width(2, metrics()) - 3, 6, buffer.allocator, metrics())); buffer.update(try buffer.root.delete_bytes(2, try buffer.root.line_width(2, metrics()) - 3, 6, buffer.allocator, metrics()));
try check_line(buffer, 2, "are belong!"); try check_line(buffer, 2, "are belong!");
try check_line(buffer, 3, "All your"); try check_line(buffer, 3, "All your");
try check_line(buffer, 4, "ropes"); try check_line(buffer, 4, "ropes");
} }
test "del_chars_with_tab_issue83" { test "delete_bytes_with_tab_issue83" {
const doc: []const u8 = const doc: []const u8 =
\\All your \\All your
\\ropes \\ropes
@ -296,7 +296,7 @@ test "del_chars_with_tab_issue83" {
line4.len + 1; line4.len + 1;
}; };
buffer.update(try buffer.root.del_chars(2, 0, len, buffer.allocator, metrics())); buffer.update(try buffer.root.delete_bytes(2, 0, len, buffer.allocator, metrics()));
const result: []const u8 = try buffer.store_to_string(a, eol_mode); const result: []const u8 = try buffer.store_to_string(a, eol_mode);
defer a.free(result); defer a.free(result);