refactor: Simpler layout conversion. Window symbol consistency.

Author: sindrets

doc/diffview.txt

@@ -332,13 +332,10 @@ view.x.layout                                   *diffview-config-view.x.layout*
                 you prefer to edit conflict markers manually without the
                 visual noise from diffs.
 
-                Window symbols:
-                  • A: LOCAL
-
                 ┌──────────────┐
                 │              │
                 │              │
-                │      A       │
+                │      B       │
                 │              │
                 │              │
                 └──────────────┘

lua/diffview/api/views/diff/diff_view.lua

@@ -142,21 +142,25 @@ function CDiffView:create_file_entries(files)
           oldpath = file_data.oldpath,
           status = "U",
           kind = "conflicting",
-          rev_ours = Rev(RevType.STAGE, 2),
-          rev_main = Rev(RevType.LOCAL),
-          rev_theirs = Rev(RevType.STAGE, 3),
-          rev_base = Rev(RevType.STAGE, 1),
+          revs = {
+            a = Rev(RevType.STAGE, 2),
+            b = Rev(RevType.LOCAL),
+            c = Rev(RevType.STAGE, 3),
+            d = Rev(RevType.STAGE, 1),
+          },
         }))
       else
-        table.insert(entries[v.kind], FileEntry.for_d2(CDiffView.get_default_diff2(), {
+        table.insert(entries[v.kind], FileEntry.with_layout(CDiffView.get_default_layout(), {
           adapter = self.adapter,
           path = file_data.path,
           oldpath = file_data.oldpath,
           status = file_data.status,
           stats = file_data.stats,
           kind = v.kind,
-          rev_a = v.left,
-          rev_b = v.right,
+          revs = {
+            a = v.left,
+            b = v.right,
+          },
           get_data = self.get_file_data,
           --FIXME: left_null, right_null
         }))

lua/diffview/debounce.lua

@@ -58,13 +58,11 @@ function M.debounce_trailing(ms, rush_first, fn)
   local debounced_fn, args
 
   debounced_fn = wrap(timer, function(...)
-    if lock then
-      args = utils.tbl_pack(...)
-    else
+    if not lock and rush_first and args == nil then
       lock = true
-      if rush_first then
-        fn(...)
-      end
+      fn(...)
+    else
+      args = utils.tbl_pack(...)
     end
 
     timer:start(ms, 0, function()