fix: wiki links nested in tables

Author: MeanderingProgrammer

Diff for: doc/render-markdown.txt

@@ -1,4 +1,4 @@
-*render-markdown.txt*          For 0.10.0          Last change: 2024 August 11
+*render-markdown.txt*          For 0.10.0          Last change: 2024 August 12
 
 ==============================================================================
 Table of Contents                          *render-markdown-table-of-contents*

Diff for: lua/render-markdown/context.lua

@@ -7,7 +7,7 @@ local util = require('render-markdown.util')
 ---@field private top integer
 ---@field private bottom integer
 ---@field private conceal? table<integer, [integer, integer][]>
----@field private links table<integer, [integer, integer, string][]>
+---@field private links table<integer, [integer, integer, integer][]>
 local Context = {}
 Context.__index = Context
 
@@ -30,22 +30,22 @@ function Context.new(buf, win, offset)
 end
 
 ---@param info render.md.NodeInfo
----@param icon string
-function Context:add_link(info, icon)
+---@param amount integer
+function Context:add_offset(info, amount)
     local row = info.start_row
     if self.links[row] == nil then
         self.links[row] = {}
     end
-    table.insert(self.links[row], { info.start_col, info.end_col, icon })
+    table.insert(self.links[row], { info.start_col, info.end_col, amount })
 end
 
 ---@param info render.md.NodeInfo
 ---@return integer
-function Context:link_width(info)
+function Context:get_offset(info)
     local result = 0
-    for _, icon_range in ipairs(self.links[info.start_row] or {}) do
-        if info.start_col < icon_range[2] and info.end_col > icon_range[1] then
-            result = result + str.width(icon_range[3])
+    for _, offset_range in ipairs(self.links[info.start_row] or {}) do
+        if info.start_col < offset_range[2] and info.end_col > offset_range[1] then
+            result = result + offset_range[3]
         end
     end
     return result

Diff for: lua/render-markdown/handler/markdown.lua

@@ -178,7 +178,7 @@ function Handler:heading_width(info, heading_width, icon_width)
         local width = heading.left_pad + icon_width + heading.right_pad
         local content = info:sibling('inline')
         if content ~= nil then
-            width = width + str.width(content.text) + self.context:link_width(content) - self.context:concealed(content)
+            width = width + str.width(content.text) + self.context:get_offset(content) - self.context:concealed(content)
         end
         return math.max(width, heading.min_width)
     else

Diff for: lua/render-markdown/handler/markdown_inline.lua

@@ -146,13 +146,17 @@ function Handler:wiki_link(info)
     local text = info.text:sub(2, -2)
     local parts = str.split(text, '|')
     local icon, highlight = self:dest_virt_text(parts[1])
-    self:add(info.start_row, info.start_col - 1, {
+    local link_text = icon .. parts[#parts]
+    local added = self:add(info.start_row, info.start_col - 1, {
         end_row = info.end_row,
         end_col = info.end_col + 1,
-        virt_text = { { icon .. parts[#parts], highlight } },
+        virt_text = { { link_text, highlight } },
         virt_text_pos = 'inline',
         conceal = '',
     })
+    if added then
+        self.context:add_offset(info, str.width(link_text) - str.width(info.text))
+    end
 end
 
 ---@private
@@ -169,7 +173,7 @@ function Handler:link(info)
         virt_text_pos = 'inline',
     })
     if added then
-        self.context:add_link(info, icon)
+        self.context:add_offset(info, str.width(icon))
     end
 end
 

Diff for: lua/render-markdown/health.lua

@@ -5,7 +5,7 @@ local M = {}
 
 ---@private
 ---@type string
-M.version = '6.1.2'
+M.version = '6.1.3'
 
 function M.check()
     vim.health.start('render-markdown.nvim [version]')

Diff for: lua/render-markdown/parser/pipe_table.lua

@@ -145,7 +145,7 @@ function M.parse_row(context, info, num_columns)
         -- Account for double width glyphs by replacing cell spacing with text width
         width = width - (cell.end_col - cell.start_col) + str.width(cell.text)
         -- Remove concealed and add inlined text
-        width = width - context:concealed(cell) + context:link_width(cell)
+        width = width - context:concealed(cell) + context:get_offset(cell)
         if width < 0 then
             return nil
         end