chore: refactor

Author: tanvirtin

lua/vgit/core/Window.lua

@@ -60,7 +60,7 @@ end
 
 function Window:get_cursor()
   local ok, cursor = pcall(vim.api.nvim_win_get_cursor, self.win_id)
-  if not ok or not cursor then return { 1, 1 } end
+  if not ok or not cursor then return { 1, 0 } end
 
   return cursor
 end

lua/vgit/core/Window_spec.lua

@@ -83,11 +83,11 @@ describe('Window:', function()
       assert.are.equal(2, #cursor)
     end)
 
-    it('should return {1, 1} if get_cursor fails', function()
+    it('should return {1, 0} if get_cursor fails', function()
       win = Window(-1) -- Invalid window
 
       local cursor = win:get_cursor()
-      eq({ 1, 1 }, cursor)
+      eq({ 1, 0 }, cursor)
     end)
   end)
 

lua/vgit/features/lenses/BlameLensView_spec.lua

@@ -128,7 +128,6 @@ describe('BlameLensView:', function()
       assert.is_nil(view._blame_info_component)
       assert.is_nil(view._diff_component)
       assert.is_false(view._destroyed)
-      assert.is_false(view._is_destroying)
     end)
   end)
 

lua/vgit/features/lenses/HunkLensView_spec.lua

@@ -72,7 +72,6 @@ describe('HunkLensView:', function()
       local view = HunkLensView()
       assert.is_nil(view.diff_component)
       assert.is_false(view._destroyed)
-      assert.is_false(view._is_destroying)
     end)
   end)
 

lua/vgit/features/screens/CommitPickerView_spec.lua

@@ -472,7 +472,7 @@ describe('CommitPickerView:', function()
       view:create(make_data())
 
       view._destroyed = false
-      view._is_destroying = false
+
       view:destroy()
       assert.is_true(view._destroyed)
 
@@ -487,7 +487,7 @@ describe('CommitPickerView:', function()
       view:create(make_data())
 
       view._destroyed = false
-      view._is_destroying = false
+
       view:destroy()
       assert.is_true(view._destroyed)
     end)

lua/vgit/features/screens/ProjectDiffView_spec.lua

@@ -477,7 +477,6 @@ describe('ProjectDiffView:', function()
       view._component_group = { unmount = function() end }
       view._context = { restore_window_options = function() end }
       view._destroyed = false
-      view._is_destroying = false
 
       view:destroy()
       view:destroy() -- second call should not error
@@ -489,7 +488,6 @@ describe('ProjectDiffView:', function()
       view._component_group = { unmount = function() end }
       view._context = { restore_window_options = function() end }
       view._destroyed = false
-      view._is_destroying = false
 
       assert.is_false(view._destroyed)
       view:destroy()
@@ -501,7 +499,6 @@ describe('ProjectDiffView:', function()
       view._component_group = { unmount = function() end }
       view._context = { restore_window_options = function() end }
       view._destroyed = false
-      view._is_destroying = false
 
       local gen_before = view._update_gen
       view:destroy()
@@ -523,7 +520,6 @@ describe('ProjectDiffView:', function()
       view._component_group = { unmount = function() end }
       view._context = { restore_window_options = function() end }
       view._destroyed = false
-      view._is_destroying = false
 
       view:destroy()
       eq(1, cleanup1_calls)

lua/vgit/features/screens/StatusDiffView_spec.lua

@@ -1882,10 +1882,6 @@ describe('StatusDiffView:', function()
       it('should initialize destroyed as false', function()
         assert.is_false(view._destroyed)
       end)
-
-      it('should initialize is_destroying as false', function()
-        assert.is_false(view._is_destroying)
-      end)
     end)
 
     describe('destroy', function()

lua/vgit/ui/Component.lua

@@ -163,6 +163,12 @@ local function CreateComponent(config)
         self._element:unmount()
         self._element = nil
       end
+      if config.viewport then
+        self._renderer_attached = false
+        self._viewport_dirty = true
+        self._last_top = nil
+        self._last_bot = nil
+      end
       self._mounted = false
     end
   elseif has_elements then
@@ -179,11 +185,10 @@ local function CreateComponent(config)
     function Class:unmount()
       if not self._mounted then return end
       if config.on_unmount then config.on_unmount(self) end
-      if self.children then
-        for _, child in pairs(self.children) do
-          if child.unmount then child:unmount() end
-        end
+      for _, child in pairs(self.children) do
+        if child.unmount then child:unmount() end
       end
+      self.children = {}
       self._mounted = false
     end
   end

lua/vgit/ui/DiffViewportComponent.lua

@@ -7,6 +7,7 @@ local create_component_element = require('vgit.ui.create_component_element')
 local element_delegation = require('vgit.ui.element_delegation')
 local define_single_element_methods = element_delegation.define_single_element_methods
 local define_getters_with_fallbacks = element_delegation.define_getters_with_fallbacks
+local clean_nil_values = require('vgit.ui.Component').clean_nil_values
 
 local DiffViewportComponent = ViewportComponent:extend()
 
@@ -55,8 +56,7 @@ function DiffViewportComponent:set_props(updates, callback)
   local prev_props = utils.object.clone(self.props)
   self.props = utils.object.extend(self.props, updates)
 
-  local Component = require('vgit.ui.Component')
-  Component.clean_nil_values(self.props)
+  clean_nil_values(self.props)
 
   if self._mounted then self:on_props(prev_props) end
 
@@ -103,7 +103,7 @@ define_single_element_methods(DiffViewportComponent, {
 -- (viewport rendering runs hot and cannot nil-check every frame)
 define_getters_with_fallbacks(DiffViewportComponent, {
   get_lnum = 1,
-  get_cursor = { 1, 1 },
+  get_cursor = { 1, 0 },
   get_line_count = 0,
   get_width = 0,
   get_height = 0,

lua/vgit/ui/Extmark.lua

@@ -53,11 +53,12 @@ function Extmark:highlight_pattern(opts)
       local extmark_opts = {
         end_col = to,
         hl_group = hl,
+        priority = priority,
       }
-      if priority then extmark_opts.priority = priority end
       local ok, value = pcall(vim.api.nvim_buf_set_extmark, self.bufnr, self.ns_id, row, from - 1, extmark_opts)
       if not ok then return false, value end
-      j = from
+      j = to
+      if to < from then break end
       result[#result + 1] = value
     end
   else
@@ -71,11 +72,12 @@ function Extmark:highlight_pattern(opts)
         local extmark_opts = {
           end_col = to,
           hl_group = hl,
+          priority = priority,
         }
-        if priority then extmark_opts.priority = priority end
         local ok, value = pcall(vim.api.nvim_buf_set_extmark, self.bufnr, self.ns_id, i - 1, from - 1, extmark_opts)
         if not ok then return false, value end
-        j = from
+        j = to
+        if to < from then break end
         result[#result + 1] = value
       end
     end
@@ -101,13 +103,11 @@ function Extmark:highlight_range(opts)
   local col_range = opts.col_range
   local priority = opts.priority
 
-  local extmark_opts = {
+  return pcall(vim.api.nvim_buf_set_extmark, self.bufnr, self.ns_id, row, col_range.from, {
     end_col = col_range.to,
     hl_group = hl,
-  }
-  if priority then extmark_opts.priority = priority end
-
-  return pcall(vim.api.nvim_buf_set_extmark, self.bufnr, self.ns_id, row, col_range.from, extmark_opts)
+    priority = priority,
+  })
 end
 
 function Extmark:highlight(opts)
@@ -160,6 +160,7 @@ function Extmark:sign(opts)
 
   local id = self:derive_id(row)
   local sign_definition = get_sign_definition(name)
+  if not sign_definition then return false, 'unknown sign: ' .. tostring(name) end
   local sign_text = sign_definition.text
 
   return pcall(vim.api.nvim_buf_set_extmark, self.bufnr, self.ns_id, row, 0, {