fix: indented tables and tables with no spaces in cells

## Details

Issue: #142

This resolves 2 separate issues.

The first is for tables that are indented some amount space over. In
such cases the top & bottom full sections as well as the delimitter
would be misaligned since they did not take into account any leading
spaces and generate full lines rather than changing individual parts
which is the case for rows. To fix this add logic to get the amount of
leading space and shift these components over accordingly.

The second is for tables where the contents of a cell went all the way
to the right pipe with no spaces. This would cause the padding to be
inserted in the middle of the content rather than at the end. To fix
this adjust the column associated with padding to no longer subtract one
off. Use a priority value of 0 for the padding marks so the pipe marks
pickup the padding as well, otherwise they would end up ignoring it.

Author: MeanderingProgrammer

benches/readme_spec.lua

@@ -11,7 +11,7 @@ describe('README.md', function()
         util.less_than(util.move_down(1), 0.5)
         util.num_marks(base_marks + 2)
 
-        util.less_than(util.insert_mode(), 5)
+        util.less_than(util.insert_mode(), 20)
         util.num_marks(base_marks + 2)
     end)
 end)

doc/render-markdown.txt

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

lua/render-markdown/handler/markdown.lua

@@ -570,6 +570,7 @@ function Handler:table_delimiter(delim)
     local pipe_table = self.config.pipe_table
     local indicator = pipe_table.alignment_indicator
     local border = pipe_table.border
+
     local sections = vim.tbl_map(function(column)
         -- If column is small there's no good place to put the alignment indicator
         -- Alignment indicator must be exactly one character wide
@@ -588,11 +589,18 @@ function Handler:table_delimiter(delim)
             return left .. indicator .. right
         end
     end, delim.columns)
-    local delimiter = border[4] .. table.concat(sections, border[5]) .. border[6]
+
+    local virt_text = {}
+    local leading_spaces = str.leading_spaces(delim.info.text)
+    if leading_spaces > 0 then
+        table.insert(virt_text, { str.spaces(leading_spaces), 'Normal' })
+    end
+    table.insert(virt_text, { border[4] .. table.concat(sections, border[5]) .. border[6], pipe_table.head })
+
     self:add(true, delim.info.start_row, delim.info.start_col, {
         end_row = delim.info.end_row,
         end_col = delim.info.end_col,
-        virt_text = { { delimiter, pipe_table.head } },
+        virt_text = virt_text,
         virt_text_pos = 'overlay',
     })
 end
@@ -615,7 +623,9 @@ function Handler:table_row(delim, row)
         for i, column in ipairs(row.columns) do
             local offset = delim.columns[i].width - column.width
             if offset > 0 then
-                self:add(true, column.info.start_row, column.info.end_col - 1, {
+                -- Use low priority to include pipe marks in padding
+                self:add(true, column.info.start_row, column.info.end_col, {
+                    priority = 0,
                     virt_text = { { str.spaces(offset), pipe_table.filler } },
                     virt_text_pos = 'inline',
                 })
@@ -669,28 +679,37 @@ function Handler:table_full(parsed_table)
         end
     end
 
+    ---@param row render.md.parsed.table.Row
+    ---@return integer
+    local function get_spaces(row)
+        return math.max(str.leading_spaces(row.info.text), row.info.start_col)
+    end
+
     local delim = parsed_table.delim
     local first = parsed_table.rows[1]
     local last = parsed_table.rows[#parsed_table.rows]
     if not width_equal(first, delim) or not width_equal(last, delim) then
         return
     end
 
+    local spaces = get_spaces(first)
+    if spaces ~= get_spaces(last) then
+        return
+    end
+
     local sections = vim.tbl_map(function(column)
         return border[11]:rep(column.width)
     end, delim.columns)
 
-    local line_above = {
-        { border[1] .. table.concat(sections, border[2]) .. border[3], pipe_table.head },
-    }
+    local line_above = spaces > 0 and { { str.spaces(spaces), 'Normal' } } or {}
+    table.insert(line_above, { border[1] .. table.concat(sections, border[2]) .. border[3], pipe_table.head })
     self:add(false, first.info.start_row, first.info.start_col, {
         virt_lines_above = true,
         virt_lines = { self:indent_virt_line(parsed_table.info, line_above) },
     })
 
-    local line_below = {
-        { border[7] .. table.concat(sections, border[8]) .. border[9], pipe_table.row },
-    }
+    local line_below = spaces > 0 and { { str.spaces(spaces), 'Normal' } } or {}
+    table.insert(line_below, { border[7] .. table.concat(sections, border[8]) .. border[9], pipe_table.row })
     self:add(false, last.info.start_row, last.info.start_col, {
         virt_lines_above = false,
         virt_lines = { self:indent_virt_line(parsed_table.info, line_below) },

lua/render-markdown/health.lua

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

tests/list_table_spec.lua

@@ -55,21 +55,21 @@ describe('list_table.md', function()
             util.table_pipe(row:increment(2), 0, true),
             util.table_border(row:get(), 'above', { 8, 15, 7, 6 }),
             util.inline_code(row:get(), 2, 8),
-            util.table_padding(row:get(), 8, 2),
             util.table_pipe(row:get(), 9, true),
-            util.table_padding(row:get(), 24, 2),
+            util.table_padding(row:get(), 9, 2),
             util.table_pipe(row:get(), 25, true),
+            util.table_padding(row:get(), 25, 2),
             util.table_pipe(row:get(), 33, true),
             util.table_pipe(row:get(), 40, true),
         })
         table.insert(expected, delimiter(row:increment(), { { 1, 7 }, { 7, 1, 7 }, { 6, 1 }, { 6 } }))
         vim.list_extend(expected, {
             util.table_pipe(row:increment(), 0, false),
             util.inline_code(row:get(), 2, 8),
-            util.table_padding(row:get(), 8, 2),
             util.table_pipe(row:get(), 9, false),
-            util.table_padding(row:get(), 24, 4),
+            util.table_padding(row:get(), 9, 2),
             util.table_pipe(row:get(), 25, false),
+            util.table_padding(row:get(), 25, 4),
             util.table_pipe(row:get(), 33, false),
             util.table_pipe(row:get(), 40, false),
         })
@@ -78,8 +78,8 @@ describe('list_table.md', function()
             util.table_border(row:get(), 'below', { 8, 15, 7, 6 }),
             util.table_pipe(row:get(), 9, false),
             util.link(row:get(), 11, 24, 'link'),
-            util.table_padding(row:get(), 24, 7),
             util.table_pipe(row:get(), 25, false),
+            util.table_padding(row:get(), 25, 7),
             util.table_pipe(row:get(), 33, false),
             util.table_pipe(row:get(), 40, false),
         })

tests/table_spec.lua

@@ -14,17 +14,17 @@ describe('table.md', function()
             util.table_border(row:get(), 'above', { 11, 24 }),
             util.table_pipe(row:get(), 12, true),
             util.inline_code(row:get(), 14, 25),
-            util.table_padding(row:get(), 36, 2),
             util.table_pipe(row:get(), 37, true),
+            util.table_padding(row:get(), 37, 2),
             util.table_border(row:increment(), 'delimiter', { 11, 24 }),
             util.table_pipe(row:increment(), 0, false),
             util.table_border(row:get(), 'below', { 11, 24 }),
             util.inline_code(row:get(), 2, 12),
-            util.table_padding(row:get(), 12, 2),
             util.table_pipe(row:get(), 13, false),
+            util.table_padding(row:get(), 13, 2),
             util.link(row:get(), 15, 38, 'web'),
-            util.table_padding(row:get(), 38, 16),
             util.table_pipe(row:get(), 39, false),
+            util.table_padding(row:get(), 39, 16),
         })
 
         vim.list_extend(expected, {