chore: update unit testing, use vim.iter in tests, gate repeat blankline marks on version

Author: MeanderingProgrammer

CHANGELOG.md

@@ -5,6 +5,15 @@
 ### Features
 
 - handle imperfectly spaced tables using max width [166a254](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/166a254aaf5b4333fe015a29a66ad99c276538ea)
+- anti-conceal margin [abc02f3](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/abc02f35cd6cb28e9b8eb37c88fc863a546367bf)
+- log error when mark is skipped [#132](https://github.com/MeanderingProgrammer/render-markdown.nvim/issues/132)
+  [7986be4](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/7986be47531d652e950776536987e01dd5b55b94)
+
+### Bug Fixes
+
+- wiki links nested in tables [72688ba](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/72688baea4ef0ed605033bf654b54d801b6a5f01)
+- code block background when indented in lists [#133](https://github.com/MeanderingProgrammer/render-markdown.nvim/issues/133)
+  [4c823b1](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/4c823b1df151dbf1ed3ddaacac517be606b1e145)
 
 ## 6.1.0 (2024-08-11)
 

doc/todo.md

@@ -1,5 +1,3 @@
 # TODOs
 
-- See if there is a stable way to align table cells according to delimiter
-  alignment info.
 - Potentially change LuaRocks icon dependency to [mini.icons](https://luarocks.org/modules/neorocks/mini.icons)

lua/render-markdown/handler/markdown.lua

@@ -115,6 +115,7 @@ function Handler:heading(info)
             virt_text_win_col = width,
         })
     end
+
     if heading.border then
         self:heading_border(info, level, foreground, colors.inverse(background), width)
     end
@@ -239,13 +240,8 @@ function Handler:dash(info)
         return
     end
 
-    local width
-    if dash.width == 'full' then
-        width = self.context:get_width()
-    else
-        ---@type integer
-        width = dash.width
-    end
+    local width = dash.width
+    width = type(width) == 'number' and width or self.context:get_width()
 
     self:add(true, info.start_row, 0, {
         virt_text = { { dash.icon:rep(width), dash.highlight } },
@@ -377,12 +373,7 @@ function Handler:code_left_pad(code_block, add_background)
         return
     end
     local padding = str.pad(code.left_pad)
-    local highlight
-    if add_background then
-        highlight = code.highlight
-    else
-        highlight = 'Normal'
-    end
+    local highlight = add_background and code.highlight or 'Normal'
     for row = code_block.start_row, code_block.end_row - 1 do
         -- Uses a low priority so other marks are loaded first and included in padding
         self:add(false, row, code_block.col, {
@@ -479,11 +470,8 @@ function Handler:quote_marker(info, block_quote)
     if not quote.enabled then
         return
     end
-    local highlight = quote.highlight
     local callout = component.callout(self.config, block_quote.text, 'contains')
-    if callout ~= nil then
-        highlight = callout.highlight
-    end
+    local highlight = callout ~= nil and callout.highlight or quote.highlight
     self:add(true, info.start_row, info.start_col, {
         end_row = info.end_row,
         end_col = info.end_col,

lua/render-markdown/health.lua

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

lua/render-markdown/list.lua

@@ -22,6 +22,10 @@ function M.add_mark(marks, conceal, start_row, start_col, opts)
         logger.error('inline marks require neovim >= 0.10.0', mark)
         return false
     end
+    if opts.virt_text_repeat_linebreak ~= nil and not util.has_10 then
+        logger.error('repeat linebreak marks require neovim >= 0.10.0', mark)
+        return false
+    end
     logger.debug('mark', mark)
     table.insert(marks, mark)
     return true

lua/render-markdown/parser/code_block.lua

@@ -26,10 +26,7 @@ function M.parse(config, context, info)
         return nil
     end
     local code_info = info:child('info_string', info.start_row)
-    local language_info = nil
-    if code_info ~= nil then
-        language_info = code_info:child('language', info.start_row)
-    end
+    local language_info = code_info ~= nil and code_info:child('language', info.start_row) or nil
     local longest_line, width = M.get_width(config, context, info)
     ---@type render.md.parsed.CodeBlock
     return {

tests/ad_hoc_spec.lua

@@ -23,7 +23,9 @@ describe('ad_hoc.md', function()
         util.setup('tests/data/ad_hoc.md')
 
         local expected = {}
+
         vim.list_extend(expected, util.heading(0, 1))
+
         vim.list_extend(expected, {
             wiki_link(4, 0, 13, 'Basic One'),
             wiki_link(6, 0, 23, 'With Alias'),

tests/box_dash_quote_spec.lua

@@ -8,15 +8,6 @@ local util = require('tests.util')
 ---@param custom boolean
 ---@return render.md.MarkInfo[]
 local function checkbox(row, icon, highlight, custom)
-    local virt_text_pos
-    local conceal
-    if custom then
-        virt_text_pos = 'inline'
-        conceal = ''
-    else
-        virt_text_pos = 'overlay'
-        conceal = nil
-    end
     ---@type render.md.MarkInfo
     local conceal_mark = {
         row = { row, row },
@@ -28,37 +19,38 @@ local function checkbox(row, icon, highlight, custom)
         row = { row, row },
         col = { 2, 5 },
         virt_text = { { icon, util.hl(highlight) } },
-        virt_text_pos = virt_text_pos,
-        conceal = conceal,
+        virt_text_pos = custom and 'inline' or 'overlay',
+        conceal = custom and '' or nil,
     }
     return { conceal_mark, checkbox_mark }
 end
 
+---@param row integer
+---@return render.md.MarkInfo
+local function dash(row)
+    ---@type render.md.MarkInfo
+    return {
+        row = { row },
+        col = { 0 },
+        virt_text = { { string.rep('─', vim.opt.columns:get()), util.hl('Dash') } },
+        virt_text_pos = 'overlay',
+    }
+end
+
 describe('box_dash_quote.md', function()
     it('default', function()
         util.setup('demo/box_dash_quote.md')
 
         local expected = {}
 
-        -- Heading
         vim.list_extend(expected, util.heading(0, 1))
 
-        -- Checkboxes
         vim.list_extend(expected, checkbox(2, ' 󰄱 ', 'Unchecked', false))
         vim.list_extend(expected, checkbox(3, ' 󰱒 ', 'Checked', false))
         vim.list_extend(expected, checkbox(4, ' 󰥔 ', 'Todo', true))
 
-        -- Line break
-        vim.list_extend(expected, {
-            {
-                row = { 6 },
-                col = { 0 },
-                virt_text = { { string.rep('─', vim.opt.columns:get()), util.hl('Dash') } },
-                virt_text_pos = 'overlay',
-            },
-        })
+        table.insert(expected, dash(6))
 
-        -- Quote lines
         vim.list_extend(expected, {
             util.quote(8, '  %s ', 'Quote'),
             util.quote(9, '  %s ', 'Quote'),

tests/callout_spec.lua

@@ -33,55 +33,53 @@ describe('callout.md', function()
         local expected = {}
 
         local note_start = 0
-        vim.list_extend(expected, util.heading(note_start, 1))
         vim.list_extend(expected, {
-            util.quote(note_start + 2, '%s ', info), -- Quote start
-            callout(note_start + 2, 2, 9, '󰋽 Note', info), -- Callout text
-            util.quote(note_start + 3, '%s', info), -- Quote continued
+            util.heading(note_start, 1),
+            util.quote(note_start + 2, '%s ', info),
+            callout(note_start + 2, 2, 9, '󰋽 Note', info),
+            util.quote(note_start + 3, '%s', info),
             util.quote(note_start + 4, '%s ', info),
             util.quote(note_start + 5, '%s', info),
             util.quote(note_start + 6, '%s ', info),
         })
 
         local tip_start = 8
-        vim.list_extend(expected, util.heading(tip_start, 1))
         vim.list_extend(expected, {
-            util.quote(tip_start + 2, '%s ', ok), -- Quote start
-            callout(tip_start + 2, 2, 8, '󰌶 Tip', ok), -- Callout text
-            util.quote(tip_start + 3, '%s', ok), -- Quote continued
+            util.heading(tip_start, 1),
+            util.quote(tip_start + 2, '%s ', ok),
+            callout(tip_start + 2, 2, 8, '󰌶 Tip', ok),
+            util.quote(tip_start + 3, '%s', ok),
             util.quote(tip_start + 4, '%s ', ok),
-            util.code_block_row(tip_start + 4, 2),
-        })
-        vim.list_extend(expected, util.code_language(tip_start + 4, 5, 8, 'lua'))
-        vim.list_extend(expected, {
+            util.code_row(tip_start + 4, 2),
+            util.code_language(tip_start + 4, 5, 8, 'lua'),
             util.quote(tip_start + 5, '%s ', ok),
-            util.code_block_row(tip_start + 5, 2),
+            util.code_row(tip_start + 5, 2),
             util.quote(tip_start + 6, '%s ', ok),
             util.code_below(tip_start + 6, 2),
         })
 
         local important_start = 16
-        vim.list_extend(expected, util.heading(important_start, 1))
         vim.list_extend(expected, {
-            util.quote(important_start + 2, '%s ', hint), -- Quote start
-            callout(important_start + 2, 2, 14, '󰅾 Important', hint), -- Callout text
-            util.quote(important_start + 3, '%s ', hint), -- Quote continued
+            util.heading(important_start, 1),
+            util.quote(important_start + 2, '%s ', hint),
+            callout(important_start + 2, 2, 14, '󰅾 Important', hint),
+            util.quote(important_start + 3, '%s ', hint),
         })
 
         local warning_start = 21
-        vim.list_extend(expected, util.heading(warning_start, 1))
         vim.list_extend(expected, {
-            util.quote(warning_start + 2, '%s ', warn), -- Quote start
-            callout(warning_start + 2, 2, 12, '󰀪 Custom Title', warn, ''), -- Callout text
-            util.quote(warning_start + 3, '%s ', warn), -- Quote continued
+            util.heading(warning_start, 1),
+            util.quote(warning_start + 2, '%s ', warn),
+            callout(warning_start + 2, 2, 12, '󰀪 Custom Title', warn, ''),
+            util.quote(warning_start + 3, '%s ', warn),
         })
 
         local caution_start = 26
-        vim.list_extend(expected, util.heading(caution_start, 1))
         vim.list_extend(expected, {
-            util.quote(caution_start + 2, '%s ', error), -- Quote start
-            callout(caution_start + 2, 2, 12, '󰳦 Caution', error), -- Callout text
-            util.quote(caution_start + 3, '%s ', error), -- Quote continued
+            util.heading(caution_start, 1),
+            util.quote(caution_start + 2, '%s ', error),
+            callout(caution_start + 2, 2, 12, '󰳦 Caution', error),
+            util.quote(caution_start + 3, '%s ', error),
         })
 
         vim.list_extend(expected, util.heading(31, 1))

tests/code_spec.lua

@@ -0,0 +1,37 @@
+---@module 'luassert'
+
+local util = require('tests.util')
+
+describe('code.md', function()
+    it('default', function()
+        util.setup('tests/data/code.md')
+
+        local expected = {}
+
+        vim.list_extend(expected, util.heading(0, 1))
+
+        vim.list_extend(expected, {
+            util.bullet(2, 0, 1),
+            util.code_row(4, 2),
+            util.code_language(4, 5, 8, 'lua'),
+            util.code_row(5, 2),
+            util.code_row(6, 2),
+            util.code_below(7, 2),
+        })
+
+        vim.list_extend(expected, {
+            util.bullet(9, 0, 1),
+            util.code_row(11, 2),
+            util.code_language(11, 5, 8, 'lua'),
+            util.code_row(12, 2),
+            -- TODO: look into fixing indented code with blank lines
+            --       probably need to fill with inline extmark
+            util.code_row(13, 0),
+            util.code_row(14, 2),
+            util.code_below(15, 2),
+        })
+
+        local actual = util.get_actual_marks()
+        util.marks_are_equal(expected, actual)
+    end)
+end)