chore: more refactor

Author: tanvirtin

lua/vgit/cli/commands/show.lua

@@ -3,6 +3,7 @@ local lazy = require('vgit.core.lazy')
 local event = lazy('vgit.core.event')
 local console = lazy('vgit.core.console')
 local GitTree = lazy('vgit.git.GitTree')
+local GitCommit = lazy('vgit.git.GitCommit')
 local repository = lazy('vgit.git.repository')
 local scene_setting = lazy('vgit.settings.scene')
 local display_service = lazy('vgit.ui.display_service')
@@ -74,9 +75,8 @@ show_command.execute = event.async(function(args)
   local layout_type = scene_setting:get('diff_preference') or 'unified'
 
   -- Get parent hash for diff comparison
-  local EMPTY_TREE = '4b825dc642cb6eb9a060e54bf8d69288fbee4904'
   local parent_hash = commit.parent_hash or ''
-  local from_ref = parent_hash ~= '' and parent_hash or EMPTY_TREE
+  local from_ref = parent_hash ~= '' and parent_hash or GitCommit.EMPTY_TREE_HASH
   local to_ref = commit.commit_hash or commit.hash
 
   -- Build entries for ProjectDiffView (parallel)

lua/vgit/core/Buffer.lua

@@ -24,12 +24,6 @@ function Buffer:constructor(bufnr)
   }
 end
 
-function Buffer:set_state(state)
-  for key, value in pairs(state) do
-    self.state[key] = value
-  end
-end
-
 function Buffer:call(callback)
   vim.api.nvim_buf_call(self.bufnr, callback)
   return self
@@ -97,19 +91,25 @@ function Buffer:place_extmark_highlight(opts)
 end
 
 function Buffer:clear_extmark_texts()
-  if not self:is_valid() then return end
-  return self._text_extmark:clear()
+  if not self:is_valid() then return self end
+  self._text_extmark:clear()
+  return self
 end
 
 function Buffer:clear_extmark_lnums()
-  return self._lnum_extmark:clear()
+  if not self:is_valid() then return self end
+  self._lnum_extmark:clear()
+  return self
 end
 
 function Buffer:clear_extmark_signs()
-  return self._sign_extmark:clear()
+  if not self:is_valid() then return self end
+  self._sign_extmark:clear()
+  return self
 end
 
 function Buffer:clear_extmark_highlights(from, to)
+  if not self:is_valid() then return self end
   self._highlight_extmark:clear(from, to)
   return self
 end
@@ -156,7 +156,7 @@ end
 
 function Buffer:delete(opts)
   opts = opts or {}
-  vim.tbl_extend('keep', opts, { force = true })
+  opts = vim.tbl_extend('keep', opts, { force = true })
   vim.api.nvim_buf_delete(self.bufnr, opts)
 
   return self
@@ -207,7 +207,7 @@ function Buffer:assign_options(options)
 
   for key, value in pairs(options) do
     if key == 'modifiable' then self._modifiable = value end
-    vim.api.nvim_set_option_value(key, value, { buf = bufnr })
+    pcall(vim.api.nvim_set_option_value, key, value, { buf = bufnr })
   end
 
   return self

lua/vgit/core/Buffer_spec.lua

@@ -104,7 +104,7 @@ describe('Buffer:', function()
   describe('get_name', function()
     it('should return buffer name', function()
       vim.api.nvim_buf_set_name(bufnr, 'test')
-      assert.equals(buffer:get_name(), string.format('%s/test', vim.loop.cwd()))
+      assert.equals(buffer:get_name(), string.format('%s/test', vim.uv.cwd()))
     end)
   end)
 
@@ -116,7 +116,7 @@ describe('Buffer:', function()
 
     it('should return relative name for named buffer', function()
       local named_buf = Buffer(vim.api.nvim_create_buf(false, true))
-      vim.api.nvim_buf_set_name(named_buf.bufnr, vim.loop.cwd() .. '/lua/vgit/init.lua')
+      vim.api.nvim_buf_set_name(named_buf.bufnr, vim.uv.cwd() .. '/lua/vgit/init.lua')
       assert.are.equal('lua/vgit/init.lua', named_buf:get_relative_name())
     end)
   end)

lua/vgit/core/Color.lua

@@ -25,8 +25,8 @@ function Color:_load()
   if self.hex then return self.hex end
 
   local spec = self.spec
-  local attribute = spec.attribute == 'fg' and 'foreground' or 'background'
-  local ok, hl = pcall(highlight.get_hl_by_name, spec.name, true)
+  local attribute = spec.attribute
+  local ok, hl = pcall(highlight.get_hl_by_name, spec.name)
 
   if ok and hl and hl[attribute] then self.hex = '#' .. bit.tohex(hl[attribute], 6) end
 

lua/vgit/core/Config.lua

@@ -46,7 +46,7 @@ function Config:assign(config)
         self.data[key] = value
       end
     else
-      console.debug.warning(string.format('Unknown config key "%s" will be ignored', key))
+      console.debug.warn(string.format('Unknown config key "%s" will be ignored', key))
     end
   end
 

lua/vgit/core/File.lua

@@ -1,4 +1,6 @@
-local Object = require('vgit.core.Object')
+local lazy = require('vgit.core.lazy')
+
+local Object = lazy('vgit.core.Object')
 
 local File = Object:extend()
 

lua/vgit/core/Spawn.lua

@@ -93,8 +93,8 @@ function Spawn:flush(buffer, cb)
 end
 
 function Spawn:start()
-  local stdout = vim.loop.new_pipe(false)
-  local stderr = vim.loop.new_pipe(false)
+  local stdout = vim.uv.new_pipe(false)
+  local stderr = vim.uv.new_pipe(false)
 
   local on_stdout = function(_, chunk)
     self:process_chunk(chunk, self.stdout_buffer, self.spec.on_stdout)
@@ -104,25 +104,35 @@ function Spawn:start()
     self:process_chunk(chunk, self.stderr_buffer, self.spec.on_stderr)
   end
 
+  local handle
+
   local on_exit = event.async(function(code, signal)
     stdout:read_stop()
     stderr:read_stop()
     stdout:close()
     stderr:close()
+    if handle and not handle:is_closing() then handle:close() end
 
     self:flush(self.stdout_buffer, self.spec.on_stdout)
     self:flush(self.stderr_buffer, self.spec.on_stderr)
 
     if self.spec.on_exit then self.spec.on_exit(code, signal) end
   end)
 
-  vim.loop.spawn(self.spec.command, {
+  handle = vim.uv.spawn(self.spec.command, {
     args = self.spec.args,
     stdio = { nil, stdout, stderr },
     cwd = self.spec.cwd,
     env = self.spec.env,
   }, on_exit)
 
+  if not handle then
+    stdout:close()
+    stderr:close()
+    if self.spec.on_exit then self.spec.on_exit(1) end
+    return self
+  end
+
   stdout:read_start(on_stdout)
   stderr:read_start(on_stderr)
 

lua/vgit/core/Window.lua

@@ -48,8 +48,9 @@ function Window:open(buffer, opts)
   local mode = opts.mode or 'floating'
   local focus = opts.focus
 
-  if opts.mode ~= nil then opts.mode = nil end
-  if opts.focus ~= nil then opts.focus = nil end
+  opts = vim.tbl_extend('force', opts, {})
+  opts.mode = nil
+  opts.focus = nil
 
   if mode == 'screen' or mode == 'split' then return Window.open_screen(buffer, opts) end
 
@@ -119,7 +120,8 @@ function Window:set_width(width)
 end
 
 function Window:set_config(config)
-  if config.focus ~= nil then config.focus = nil end
+  config = vim.tbl_extend('force', config, {})
+  config.focus = nil
   vim.api.nvim_win_set_config(self.win_id, config)
   return self
 end
@@ -130,7 +132,7 @@ end
 
 function Window:assign_options(options)
   for key, value in pairs(options) do
-    vim.api.nvim_set_option_value(key, value, { win = self.win_id })
+    pcall(vim.api.nvim_set_option_value, key, value, { win = self.win_id })
   end
   return self
 end

lua/vgit/core/async.lua

@@ -3,7 +3,10 @@ local co = coroutine
 local async = {}
 
 local function is_callable(fn)
-  return type(fn) == 'function' or (type(fn) == 'table' and type(getmetatable(fn).__call) == 'function')
+  if type(fn) == 'function' then return true end
+  if type(fn) ~= 'table' then return false end
+  local mt = getmetatable(fn)
+  return mt ~= nil and type(mt.__call) == 'function'
 end
 
 local function rotate(nargs, ...)

lua/vgit/core/console/LogFormatter.lua

@@ -70,7 +70,7 @@ function LogFormatter:add_indentation(line)
 end
 
 function LogFormatter:format(log_type, fn_source, fn_name)
-  if self._is_formatted then return end
+  if self._is_formatted then return self end
 
   self._is_formatted = true