refactor: Replace async- and job abstractions (#356)

Author: sindrets

README.md

@@ -18,7 +18,6 @@ for any git rev.
 - Git ≥ 2.31.0 (for Git support)
 - Mercurial (for Mercurial support)
 - Neovim ≥ 0.7.0
-- [plenary.nvim](https://github.com/nvim-lua/plenary.nvim)
 - [nvim-web-devicons](https://github.com/nvim-tree/nvim-web-devicons) (optional) For file icons
 
 ## Installation
@@ -27,13 +26,12 @@ Install the plugin with your package manager of choice.
 
 ```vim
 " Plug
-Plug 'nvim-lua/plenary.nvim'
-Plug 'sindrets/diffview.nvim'
+Plug "sindrets/diffview.nvim"
 ```
 
 ```lua
 -- Packer
-use { 'sindrets/diffview.nvim', requires = 'nvim-lua/plenary.nvim' }
+use "sindrets/diffview.nvim" 
 ```
 
 ## Merge Tool

lua/diffview/actions.lua

@@ -1,3 +1,4 @@
+local async = require("diffview.async")
 local lazy = require("diffview.lazy")
 
 local DiffView = lazy.access("diffview.scene.views.diff.diff_view", "DiffView") ---@type DiffView|LazyModule
@@ -19,6 +20,8 @@ local Diff4 = lazy.access("diffview.scene.layouts.diff_4", "Diff4") ---@type Dif
 local Diff4Mixed = lazy.access("diffview.scene.layouts.diff_4_mixed", "Diff4Mixed") ---@type Diff4Mixed|LazyModule
 
 local api = vim.api
+local await = async.await
+local pl = lazy.access(utils, "path") ---@type PathLib
 
 local M = setmetatable({}, {
   __index = function(_, k)
@@ -46,11 +49,11 @@ local function prepare_goto_file()
   if file then
     ---@cast file FileEntry
     -- Ensure file exists
-    if not utils.path:readable(file.absolute_path) then
+    if not pl:readable(file.absolute_path) then
       utils.err(
         string.format(
           "File does not exist on disk: '%s'",
-          utils.path:relative(file.absolute_path, ".")
+          pl:relative(file.absolute_path, ".")
         )
       )
       return
@@ -386,7 +389,7 @@ end
 
 ---@param target "ours"|"theirs"|"base"|"all"|"none"
 function M.conflict_choose_all(target)
-  return function()
+  return async.void(function()
     local view = lib.get_current_view() --[[@as DiffView ]]
 
     if (view and view:instanceof(DiffView.__get())) then
@@ -396,21 +399,15 @@ function M.conflict_choose_all(target)
         local item = view:infer_cur_file(false) ---@cast item -DirData
         if not item then return end
 
-        if item.active then
-          -- The entry is already open and the action can proceed like normal
-          resolve_all_conflicts(view, target)
-        else
-          -- The entry is not open
-          view.emitter:once("file_open_post", utils.bind(resolve_all_conflicts, view, target))
-
+        if not item.active then
           -- Open the entry
-          view:set_file(item)
+          await(view:set_file(item))
         end
-      else
-        resolve_all_conflicts(view, target)
       end
+
+      resolve_all_conflicts(view, target)
     end
-  end
+  end)
 end
 
 ---@param target "ours"|"theirs"|"base"|"all"|"none"

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

@@ -1,16 +1,17 @@
+local async = require("diffview.async")
 local lazy = require("diffview.lazy")
 
 local DiffView = lazy.access("diffview.scene.views.diff.diff_view", "DiffView") ---@type DiffView|LazyModule
 local FileEntry = lazy.access("diffview.scene.file_entry", "FileEntry") ---@type FileEntry|LazyModule
 local FilePanel = lazy.access("diffview.scene.views.diff.file_panel", "FilePanel") ---@type FilePanel|LazyModule
 local Rev = lazy.access("diffview.vcs.adapters.git.rev", "GitRev") ---@type GitRev|LazyModule
 local RevType = lazy.access("diffview.vcs.rev", "RevType") ---@type RevType|LazyModule
-local async = lazy.require("plenary.async") ---@module "plenary.async"
 local vcs_utils = lazy.require("diffview.vcs") ---@module "diffview.vcs"
-local logger = lazy.require("diffview.logger") ---@module "diffview.logger"
 local oop = lazy.require("diffview.oop") ---@module "diffview.oop"
 local utils = lazy.require("diffview.utils") ---@module "diffview.utils"
 
+local logger = DiffviewGlobal.logger
+
 local M = {}
 
 ---@class FileData
@@ -31,7 +32,7 @@ local CDiffView = oop.create_class("CDiffView", DiffView.__get())
 ---CDiffView constructor.
 ---@param opt any
 function CDiffView:init(opt)
-  logger.info("[api] Creating a new Custom DiffView.")
+  logger:info("[api] Creating a new Custom DiffView.")
   self.valid = false
 
   local err, adapter = vcs_utils.get_adapter({ top_indicators = { opt.git_root } })
@@ -90,7 +91,6 @@ end
 ---@override
 CDiffView.get_updated_files = async.wrap(function(self, callback)
   local err
-  callback = async.void(callback)
 
   repeat
     local ok, new_files = pcall(self.fetch_files, self)
@@ -113,9 +113,9 @@ CDiffView.get_updated_files = async.wrap(function(self, callback)
   until true
 
   utils.err(err, true)
-  logger.s_error(table.concat(err, "\n"))
+  logger:error(table.concat(err, "\n"))
   callback(err, nil)
-end, 2)
+end)
 
 function CDiffView:create_file_entries(files)
   local entries = {}