upupdate diffz and lsp-kit dependency

Author: Techatrix

build.zig.zon

@@ -23,12 +23,12 @@
             .hash = "known_folders-0.0.0-Fy-PJqHJAAB43zDJmOdlr3nViu69IFI9pNFt7hkHjKk4",
         },
         .diffz = .{
-            .url = "https://github.com/ziglibs/diffz/archive/669e6ed7470100bfd9d2aa9f6f96b93c45996179.tar.gz",
-            .hash = "diffz-0.0.1-G2tlISLPAQDzXkUIRWWUfdgIsIb1dAyVwRPXMt5kRpui",
+            .url = "https://github.com/ziglibs/diffz/archive/aa11caef328a3f20f2493f8fd676a1dfa7819246.tar.gz",
+            .hash = "diffz-0.0.1-G2tlIYrNAQAQx3cuIp7EVs0xvxbv9DCPf4YuHmvubsrZ",
         },
         .lsp_kit = .{
-            .url = "https://github.com/zigtools/lsp-kit/archive/922e9c2fc00741b167a19277d737b8eb890f0253.tar.gz",
-            .hash = "lsp_kit-0.1.0-bi_PL94yDABlKrIbUTtVALYWLeFt6XAzHS6R12Tp83_Z",
+            .url = "https://github.com/zigtools/lsp-kit/archive/7b03f0b6801babffe76608cf3db59793902a21d6.tar.gz",
+            .hash = "lsp_kit-0.1.0-bi_PLw8zDABvCWe2rD4Aqb9gx0sRXBKO0a7M0vg3AbR3",
         },
         .tracy = .{
             .url = "https://github.com/wolfpld/tracy/archive/refs/tags/v0.13.1.tar.gz",

deps.nix

@@ -4,10 +4,10 @@
 
 linkFarm "zig-packages" [
   {
-    name = "diffz-0.0.1-G2tlISLPAQDzXkUIRWWUfdgIsIb1dAyVwRPXMt5kRpui";
+    name = "diffz-0.0.1-G2tlIYrNAQAQx3cuIp7EVs0xvxbv9DCPf4YuHmvubsrZ";
     path = fetchzip {
-      url = "https://github.com/ziglibs/diffz/archive/669e6ed7470100bfd9d2aa9f6f96b93c45996179.tar.gz";
-      hash = "sha256-tEMWxY7jhp5OGJHejfGCkXuMtpbnp6hFetms8Zk3PYs=";
+      url = "https://github.com/ziglibs/diffz/archive/aa11caef328a3f20f2493f8fd676a1dfa7819246.tar.gz";
+      hash = "sha256-bdL+xLnYVzYS6T3zsw7xfLKTUCUFI0pIpQaOxV6oTis=";
     };
   }
   {
@@ -18,10 +18,10 @@ linkFarm "zig-packages" [
     };
   }
   {
-    name = "lsp_kit-0.1.0-bi_PL94yDABlKrIbUTtVALYWLeFt6XAzHS6R12Tp83_Z";
+    name = "lsp_kit-0.1.0-bi_PLw8zDABvCWe2rD4Aqb9gx0sRXBKO0a7M0vg3AbR3";
     path = fetchzip {
-      url = "https://github.com/zigtools/lsp-kit/archive/922e9c2fc00741b167a19277d737b8eb890f0253.tar.gz";
-      hash = "sha256-bDPbYY59HvgHtaHPfTTCqjMEx8tDJoyyld9lkONUHVY=";
+      url = "https://github.com/zigtools/lsp-kit/archive/7b03f0b6801babffe76608cf3db59793902a21d6.tar.gz";
+      hash = "sha256-CjWrp8fERKS5VldRvYtDFk1g4heIkX4YrpLw/eC12Q4=";
     };
   }
 ]

src/diff.zig

@@ -6,11 +6,8 @@ const offsets = @import("offsets.zig");
 const tracy = @import("tracy");
 const DiffMatchPatch = @import("diffz");
 
-const dmp: DiffMatchPatch = .{
-    .diff_timeout = .fromMilliseconds(250),
-};
-
 pub fn edits(
+    io: std.Io,
     allocator: std.mem.Allocator,
     before: []const u8,
     after: []const u8,
@@ -19,7 +16,13 @@ pub fn edits(
     const tracy_zone = tracy.trace(@src());
     defer tracy_zone.end();
 
-    var diffs = try dmp.diff(allocator, before, after, true);
+    const dmp: DiffMatchPatch = .initDefault(io, allocator);
+    var diffs = try dmp.diff(
+        before,
+        after,
+        true,
+        .{ .duration = .{ .clock = .awake, .raw = .fromMilliseconds(250) } },
+    );
     defer DiffMatchPatch.deinitDiffList(allocator, &diffs);
 
     var edit_count: usize = 0;

tests/utility/diff.zig

@@ -8,14 +8,16 @@ fn gen(alloc: std.mem.Allocator, rand: std.Random) ![]const u8 {
 }
 
 test "diff - random" {
-    const allocator = std.testing.allocator;
     var rand: std.Random.DefaultPrng = .init(std.testing.random_seed);
-    try testDiff(allocator, rand.random(), .@"utf-8");
-    try testDiff(allocator, rand.random(), .@"utf-16");
-    try testDiff(allocator, rand.random(), .@"utf-32");
+    try testDiff(rand.random(), .@"utf-8");
+    try testDiff(rand.random(), .@"utf-16");
+    try testDiff(rand.random(), .@"utf-32");
 }
 
-fn testDiff(allocator: std.mem.Allocator, rand: std.Random, encoding: zls.offsets.Encoding) !void {
+fn testDiff(rand: std.Random, encoding: zls.offsets.Encoding) !void {
+    const io = std.testing.io;
+    const allocator = std.testing.allocator;
+
     var buffer: [256]u8 = undefined;
     rand.bytes(&buffer);
     for (&buffer) |*c| c.* = '0' + c.* % 32;
@@ -24,7 +26,7 @@ fn testDiff(allocator: std.mem.Allocator, rand: std.Random, encoding: zls.offset
     const before = buffer[0..split_index];
     const after = buffer[split_index..];
 
-    var edits = try zls.diff.edits(allocator, before, after, encoding);
+    var edits = try zls.diff.edits(io, allocator, before, after, encoding);
     defer {
         for (edits.items) |edit| allocator.free(edit.newText);
         edits.deinit(allocator);