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

fix: remove obsolete and broken syntax.refresh function

Browse source
This commit is contained in:
CJ van den Berg 2024-10-30 17:53:05 +01:00
parent d60ad49f84
commit da85c40603
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/syntax/src/syntax.zig
View file

@ -74,12 +74,6 @@ pub fn edit(self: *Self, ed: Edit) void {
if (self.tree) |tree| tree.edit(&ed); if (self.tree) |tree| tree.edit(&ed);
} }
pub fn refresh(self: *Self, content: []const u8) !void {
const old_tree = self.tree;
defer if (old_tree) |tree| tree.destroy();
self.tree = try self.parser.parseString(old_tree, content);
}
pub fn refresh_from_buffer(self: *Self, buffer: anytype, metrics: anytype) !void { pub fn refresh_from_buffer(self: *Self, buffer: anytype, metrics: anytype) !void {
const old_tree = self.tree; const old_tree = self.tree;
defer if (old_tree) |tree| tree.destroy(); defer if (old_tree) |tree| tree.destroy();

14
src/tui/editor.zig
View file

@ -3072,13 +3072,15 @@ pub const Editor = struct {
self.syntax_refresh_full = true; self.syntax_refresh_full = true;
if (self.syntax_last_rendered_root == null) if (self.syntax_last_rendered_root == null)
self.syntax_refresh_full = true; self.syntax_refresh_full = true;
var content = std.ArrayList(u8).init(self.allocator); var content_ = std.ArrayList(u8).init(self.allocator);
defer content.deinit(); defer content_.deinit();
{ {
const frame = tracy.initZone(@src(), .{ .name = "editor store syntax" }); const frame = tracy.initZone(@src(), .{ .name = "editor store syntax" });
defer frame.deinit(); defer frame.deinit();
try root.store(content.writer(), eol_mode); try root.store(content_.writer(), eol_mode);
} }
const content = try content_.toOwnedSliceSentinel(0);
defer self.allocator.free(content);
if (self.syntax_refresh_full) { if (self.syntax_refresh_full) {
{ {
const frame = tracy.initZone(@src(), .{ .name = "editor reset syntax" }); const frame = tracy.initZone(@src(), .{ .name = "editor reset syntax" });
@ -3088,7 +3090,7 @@ pub const Editor = struct {
{ {
const frame = tracy.initZone(@src(), .{ .name = "editor refresh_full syntax" }); const frame = tracy.initZone(@src(), .{ .name = "editor refresh_full syntax" });
defer frame.deinit(); defer frame.deinit();
try syn.refresh_full(content.items); try syn.refresh_full(content);
} }
kind = .full; kind = .full;
self.syntax_last_rendered_root = root; self.syntax_last_rendered_root = root;
@ -3107,7 +3109,7 @@ pub const Editor = struct {
const frame = tracy.initZone(@src(), .{ .name = "editor diff syntax" }); const frame = tracy.initZone(@src(), .{ .name = "editor diff syntax" });
defer frame.deinit(); defer frame.deinit();
const diff = @import("diff"); const diff = @import("diff");
const edits = try diff.diff(self.allocator, content.items, old_content.items); const edits = try diff.diff(self.allocator, content, old_content.items);
defer self.allocator.free(edits); defer self.allocator.free(edits);
for (edits) |edit| for (edits) |edit|
syntax_process_edit(syn, edit); syntax_process_edit(syn, edit);
@ -3116,7 +3118,7 @@ pub const Editor = struct {
{ {
const frame = tracy.initZone(@src(), .{ .name = "editor refresh syntax" }); const frame = tracy.initZone(@src(), .{ .name = "editor refresh syntax" });
defer frame.deinit(); defer frame.deinit();
try syn.refresh(content.items); try syn.refresh_from_string(content);
} }
self.syntax_last_rendered_root = root; self.syntax_last_rendered_root = root;
kind = .incremental; kind = .incremental;