chore: @ async + use vim.uv

Author: benlubas

lua/neorg/modules/core/integrations/image/module.lua

@@ -43,20 +43,24 @@ module.public = {
     ---@param images any[]
     render = function(images)
         for _, limage in pairs(images) do
-            limage.image:clear()
-            limage.image:render()
+            if limage.image then
+                limage.image:clear()
+                limage.image:render()
+            end
         end
     end,
     clear = function(images)
         for _, limage in pairs(images) do
-            limage.image:clear()
+            if limage.image then
+                limage.image:clear()
+            end
         end
     end,
     clear_at_cursor = function(images, row)
         local cleared = {}
         for id, limage in pairs(images) do
             local image = limage.image
-            if image.geometry.y == row then
+            if image and image.geometry.y == row then
                 image:clear()
                 table.insert(cleared, id)
             end

lua/neorg/modules/core/latex/renderer/module.lua

@@ -154,7 +154,19 @@ module.private.clear_extmark = function(key)
 end
 
 module.public = {
+    ---@async
     async_latex_renderer = function()
+        --- current location key -> old key
+        ---@type table<string, string>
+        local latest_image_locations = {}
+        for key, limage in pairs(module.private.latex_images) do
+            local extm =
+                vim.api.nvim_buf_get_extmark_by_id(0, module.private.extmark_ns, module.private.extmark_ids[key], {})
+            local pos_key = module.private.get_key(extm)
+            latest_image_locations[pos_key] = key
+        end
+
+        P(latest_image_locations)
         ---node range to image handle
         -- module.private.ranges = {}
         ---@type table<string, MathRange>
@@ -196,14 +208,28 @@ module.public = {
                     end
                 end
 
-                local img = module.private.image_api.new_image(
-                    nio.api.nvim_get_current_buf(),
-                    png_location,
-                    module.required["core.integrations.treesitter"].get_node_range(node),
-                    nio.api.nvim_get_current_win(),
-                    module.config.public.scale,
-                    not module.config.public.conceal
-                )
+                local img = nil
+                local next_key = latest_image_locations[key]
+                if latest_image_locations[key] then
+                    local old_limage = module.private.latex_images[next_key]
+                    print("in here")
+                    img = old_limage.image
+                    module.private.latex_images[next_key].image = nil
+                    module.private.extmark_ids[next_key] = module.private.extmark_ids[key]
+                else
+                    img = module.private.image_api.new_image(
+                        nio.api.nvim_get_current_buf(),
+                        png_location,
+                        module.required["core.integrations.treesitter"].get_node_range(node),
+                        nio.api.nvim_get_current_win(),
+                        module.config.public.scale,
+                        not module.config.public.conceal
+                    )
+                end
+                if not img then
+                    print("nil image")
+                    print(key)
+                end
                 next_images[key] = { image = img, range = range, snippet = latex_snippet }
             end
         )
@@ -221,7 +247,7 @@ module.public = {
             -- existing images in the same position, if it's a different snippet, clear it, b/c it's
             -- no longer accurate
             local existing_img = module.private.latex_images[key]
-            if existing_img and existing_img.snippet ~= limage.snippet then
+            if existing_img and existing_img.image and existing_img.snippet ~= limage.snippet then
                 module.private.image_api.clear({ [key] = existing_img })
                 module.private.clear_extmark(key)
             end
@@ -230,6 +256,7 @@ module.public = {
     end,
 
     ---Writes a latex snippet to a file and wraps it with latex headers to it will render nicely
+    ---@async
     ---@param snippet string latex snippet (if it's math it should include the surrounding $$)
     ---@return string temp file path
     async_create_latex_document = function(snippet)
@@ -253,6 +280,7 @@ module.public = {
     end,
 
     ---Returns a filepath where the rendered image sits
+    ---@async
     ---@param snippet string the full latex snippet to convert to an image
     ---@return string | nil
     async_generate_image = function(snippet)
@@ -324,23 +352,25 @@ module.public = {
                 table.insert(module.private.cleared_at_cursor, key)
                 goto continue
             end
-            if not image.is_rendered then
-                module.private.image_api.render({ limage })
-            end
+            if image then
+                if not image.is_rendered then
+                    module.private.image_api.render({ limage })
+                end
 
-            if conceal_on then
-                if not module.private.extmark_ids[key] then
-                    module.private.clear_extmark(key)
-                    local id = vim.api.nvim_buf_set_extmark(0, module.private.extmark_ns, range[1], range[2], {
-                        end_col = range[4],
-                        conceal = "",
-                        virt_text = { { (" "):rep(image.rendered_geometry.width or image.geometry.width) } },
-                        virt_text_pos = "inline",
-                        strict = false, -- this might be a problem... I'm not sure, it could also be fine.
-                        invalidate = true,
-                        undo_restore = false,
-                    })
-                    module.private.extmark_ids[key] = id
+                if conceal_on then
+                    if not module.private.extmark_ids[key] then
+                        module.private.clear_extmark(key)
+                        local id = vim.api.nvim_buf_set_extmark(0, module.private.extmark_ns, range[1], range[2], {
+                            end_col = range[4],
+                            conceal = "",
+                            virt_text = { { (" "):rep(image.rendered_geometry.width or image.geometry.width) } },
+                            virt_text_pos = "inline",
+                            strict = false, -- this might be a problem... I'm not sure, it could also be fine.
+                            invalidate = true,
+                            undo_restore = false,
+                        })
+                        module.private.extmark_ids[key] = id
+                    end
                 end
             end
             ::continue::
@@ -361,7 +391,7 @@ local function render_latex()
     end
 
     if not render_timer then
-        render_timer = vim.loop.new_timer()
+        render_timer = vim.uv.new_timer()
     end
 
     render_timer:start(module.config.public.debounce_ms, 0, function()