fix: rerender images below the current one after adding extmark

3rd · Jul 3, 2023 · 093ef13 · 093ef13
1 parent 3dbb7f4
commit 093ef13
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/lua/image/image.lua b/lua/image/image.lua
@@ -63,7 +63,7 @@ local from_file = function(path, options, state)
     if geometry then instance.geometry = vim.tbl_deep_extend("force", instance.geometry, geometry) end
 
     -- utils.debug(("\n\n---------------- %s ----------------"):format(instance.id))
-    local ok = renderer.render(instance, state)
+    local was_rendered = renderer.render(instance, state)
     -- utils.debug("render result", instance.id, ok)
 
     -- virtual padding
@@ -74,7 +74,7 @@ local from_file = function(path, options, state)
 
       local previous_extmark = buf_extmark_map[instance.buffer .. ":" .. row]
 
-      if not ok and previous_extmark then
+      if not was_rendered and previous_extmark then
         state.backend.clear(instance.id, true)
         vim.api.nvim_buf_del_extmark(instance.buffer, state.extmarks_namespace, previous_extmark.id)
         buf_extmark_map[instance.buffer .. ":" .. row] = nil
@@ -86,7 +86,7 @@ local from_file = function(path, options, state)
         vim.api.nvim_buf_del_extmark(instance.buffer, state.extmarks_namespace, previous_extmark.id)
       end
 
-      if ok then
+      if was_rendered then
         local text = string.rep(" ", width)
         local filler = {}
         for _ = 0, height - 1 do
@@ -97,6 +97,11 @@ local from_file = function(path, options, state)
           virt_lines = filler,
         })
         buf_extmark_map[instance.buffer .. ":" .. row] = { id = numerical_id, height = height }
+
+        -- rerender any images that are below this one
+        for _, image in pairs(state.images) do
+          if image.buffer == instance.buffer and image.geometry.y > instance.geometry.y then image.render() end
+        end
       end
     end
   end

diff --git a/lua/image/init.lua b/lua/image/init.lua
@@ -60,6 +60,7 @@ api.setup = function(options)
   -- setup namespaces
   state.extmarks_namespace = vim.api.nvim_create_namespace("image.nvim")
 
+  -- handle folds / scroll extra
   ---@type table<number, { topline: number, botline: number, bufnr: number, height: number; folded_lines: number }>
   local window_history = {}
   vim.api.nvim_set_decoration_provider(state.extmarks_namespace, {
@@ -158,7 +159,7 @@ api.setup = function(options)
     end,
   })
 
-  -- rerender on scroll/fold
+  -- rerender on scroll
   vim.api.nvim_create_autocmd("WinScrolled", {
     group = group,
     callback = function(au)