fix: avoid desync of tree-sitter syntax

This commit is contained in:
CJ van den Berg 2024-05-09 00:35:31 +02:00
parent 6ece4c14b5
commit 9ff63fbed5

View file

@ -1427,6 +1427,7 @@ pub const Editor = struct {
} }
fn nudge_delete(self: *Self, nudge: Selection, exclude: *const CurSel, size: usize) void { fn nudge_delete(self: *Self, nudge: Selection, exclude: *const CurSel, size: usize) void {
_ = size;
for (self.cursels.items, 0..) |*cursel_, i| if (cursel_.*) |*cursel| for (self.cursels.items, 0..) |*cursel_, i| if (cursel_.*) |*cursel|
if (cursel != exclude) if (cursel != exclude)
if (!cursel.nudge_delete(nudge)) { if (!cursel.nudge_delete(nudge)) {
@ -1436,19 +1437,7 @@ pub const Editor = struct {
if (!match.nudge_delete(nudge)) { if (!match.nudge_delete(nudge)) {
self.matches.items[i] = null; self.matches.items[i] = null;
}; };
if (self.syntax) |syn| { self.reset_syntax();
const root = self.buf_root() catch return;
var start_byte: usize = 0;
_ = root.get_range(.{ .begin = .{}, .end = nudge.begin }, null, &start_byte, null) catch return;
syn.edit(.{
.start_byte = @intCast(start_byte),
.old_end_byte = @intCast(start_byte + size),
.new_end_byte = @intCast(start_byte),
.start_point = .{ .row = @intCast(nudge.begin.row), .column = @intCast(nudge.begin.col) },
.old_end_point = .{ .row = @intCast(nudge.end.row), .column = @intCast(nudge.end.col) },
.new_end_point = .{ .row = @intCast(nudge.begin.row), .column = @intCast(nudge.begin.col) },
});
}
} }
fn delete_selection(self: *Self, root: Buffer.Root, cursel: *CurSel, a: Allocator) error{Stop}!Buffer.Root { fn delete_selection(self: *Self, root: Buffer.Root, cursel: *CurSel, a: Allocator) error{Stop}!Buffer.Root {