chore: add unit tests for different code block settings

Author: MeanderingProgrammer

CHANGELOG.md

@@ -10,6 +10,8 @@
   [7986be4](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/7986be47531d652e950776536987e01dd5b55b94)
 - checkbox: position [#140](https://github.com/MeanderingProgrammer/render-markdown.nvim/issues/140)
   [275f289](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/275f28943ab9ce6017f90bab56c5b5b3c651c269)
+- code: independent language padding: [#131](https://github.com/MeanderingProgrammer/render-markdown.nvim/pull/131)
+  [739d845](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/739d8458d6c5742fbcf96a5961b88670fefa1d53)
 
 ### Bug Fixes
 
@@ -25,6 +27,7 @@
 ### Collaborator Shoutouts
 
 - @P1roks
+- @Biggybi
 
 ## 6.1.0 (2024-08-11)
 

tests/code_spec.lua

@@ -2,6 +2,43 @@
 
 local util = require('tests.util')
 
+---@param row integer
+---@param col integer
+---@param win_col integer
+---@return render.md.MarkInfo
+local function hide_background(row, col, win_col)
+    ---@type render.md.MarkInfo
+    return {
+        row = { row },
+        col = { col },
+        virt_text = { { string.rep(' ', vim.opt.columns:get() * 2), 'Normal' } },
+        virt_text_pos = 'win_col',
+        virt_text_win_col = win_col,
+    }
+end
+
+---@param row integer
+---@param col integer
+---@param offset integer
+---@param left integer
+---@return render.md.MarkInfo
+local function padding(row, col, offset, left)
+    local virt_text = {}
+    if offset > 0 then
+        table.insert(virt_text, { string.rep(' ', offset), 'Normal' })
+    end
+    if left > 0 then
+        table.insert(virt_text, { string.rep(' ', left), util.hl('Code') })
+    end
+    ---@type render.md.MarkInfo
+    return {
+        row = { row },
+        col = { col },
+        virt_text = virt_text,
+        virt_text_pos = 'inline',
+    }
+end
+
 describe('code.md', function()
     it('default', function()
         util.setup('tests/data/code.md')
@@ -10,25 +47,94 @@ describe('code.md', function()
 
         vim.list_extend(expected, util.heading(row:get(), 1))
 
+        vim.list_extend(expected, {
+            util.code_row(row:increment(2), 0),
+            util.code_language(row:get(), 3, 7, 'rust'),
+        })
+        for _ = 1, 3 do
+            table.insert(expected, util.code_row(row:increment(), 0))
+        end
+        table.insert(expected, util.code_below(row:increment(), 0))
+
+        vim.list_extend(expected, {
+            util.bullet(row:increment(2), 0, 1),
+            util.code_row(row:increment(2), 2),
+            util.code_language(row:get(), 5, 8, 'lua'),
+        })
+        for _ = 1, 2 do
+            table.insert(expected, util.code_row(row:increment(), 2))
+        end
+        table.insert(expected, util.code_below(row:increment(), 2))
+
+        vim.list_extend(expected, {
+            util.bullet(row:increment(2), 0, 1),
+            util.code_row(row:increment(2), 2),
+            util.code_language(row:get(), 5, 8, 'lua'),
+        })
+        for _, col in ipairs({ 2, 0, 2 }) do
+            table.insert(expected, util.code_row(row:increment(), col))
+            if col == 0 then
+                table.insert(expected, padding(row:get(), 0, 2, 0))
+            end
+        end
+        table.insert(expected, util.code_below(row:increment(), 2))
+
+        local actual = util.get_actual_marks()
+        util.marks_are_equal(expected, actual)
+    end)
+
+    it('block padding', function()
+        util.setup('tests/data/code.md', {
+            code = { width = 'block', left_pad = 2, right_pad = 2 },
+        })
+
+        local expected, row = {}, util.row()
+
+        vim.list_extend(expected, util.heading(row:get(), 1))
+
+        vim.list_extend(expected, {
+            util.code_row(row:increment(2), 0),
+            hide_background(row:get(), 0, 34),
+            util.code_language(row:get(), 3, 7, 'rust'),
+        })
+        for _ = 1, 3 do
+            vim.list_extend(expected, {
+                util.code_row(row:increment(), 0),
+                padding(row:get(), 0, 0, 2),
+                hide_background(row:get(), 0, 34),
+            })
+        end
+        table.insert(expected, util.code_below(row:increment(), 0, 34))
+
         vim.list_extend(expected, {
             util.bullet(row:increment(2), 0, 1),
             util.code_row(row:increment(2), 2),
+            hide_background(row:get(), 2, 20),
             util.code_language(row:get(), 5, 8, 'lua'),
-            util.code_row(row:increment(), 2),
-            util.code_row(row:increment(), 2),
-            util.code_below(row:increment(), 2),
         })
+        for _ = 1, 2 do
+            vim.list_extend(expected, {
+                util.code_row(row:increment(), 2),
+                padding(row:get(), 2, 0, 2),
+                hide_background(row:get(), 2, 20),
+            })
+        end
+        table.insert(expected, util.code_below(row:increment(), 2, 20))
 
         vim.list_extend(expected, {
             util.bullet(row:increment(2), 0, 1),
             util.code_row(row:increment(2), 2),
+            hide_background(row:get(), 2, 20),
             util.code_language(row:get(), 5, 8, 'lua'),
-            util.code_row(row:increment(), 2),
-            util.code_row(row:increment(), 0),
-            util.padding(row:get(), 2),
-            util.code_row(row:increment(), 2),
-            util.code_below(row:increment(), 2),
         })
+        for _, col in ipairs({ 2, 0, 2 }) do
+            vim.list_extend(expected, {
+                util.code_row(row:increment(), col),
+                padding(row:get(), col, 2 - col, 2),
+                hide_background(row:get(), col, 20),
+            })
+        end
+        table.insert(expected, util.code_below(row:increment(), 2, 20))
 
         local actual = util.get_actual_marks()
         util.marks_are_equal(expected, actual)

tests/data/code.md

@@ -1,5 +1,11 @@
 # Heading
 
+```rust
+fn main() {
+    println!("Hello, World!");
+}
+```
+
 - Nested code
 
   ```lua

tests/util.lua

@@ -35,6 +35,7 @@ end
 ---@field conceal? string
 ---@field virt_text? { [1]: string, [2]: string|string[] }[]
 ---@field virt_text_pos? string
+---@field virt_text_win_col? integer
 ---@field virt_lines? { [1]: string, [2]: string }[][]
 ---@field virt_lines_above? boolean
 ---@field sign_text? string
@@ -138,14 +139,16 @@ end
 ---@param row integer
 ---@param start_col integer
 ---@param end_col integer
----@param name 'python'|'lua'
+---@param name 'python'|'lua'|'rust'
 ---@return render.md.MarkInfo[]
 function M.code_language(row, start_col, end_col, name)
     local icon, highlight
     if name == 'python' then
         icon, highlight = '󰌠 ', 'MiniIconsYellow'
     elseif name == 'lua' then
         icon, highlight = '󰢱 ', 'MiniIconsAzure'
+    elseif name == 'rust' then
+        icon, highlight = '󱘗 ', 'MiniIconsOrange'
     end
     ---@type render.md.MarkInfo
     local sign_mark = {
@@ -166,12 +169,14 @@ end
 
 ---@param row integer
 ---@param col integer
-function M.code_below(row, col)
+---@param width? integer
+function M.code_below(row, col, width)
+    width = (width or vim.opt.columns:get()) - col
     ---@type render.md.MarkInfo
     return {
         row = { row },
         col = { col },
-        virt_text = { { string.rep('▀', vim.opt.columns:get() - col), M.hl('_Inverse_' .. M.hl('Code')) } },
+        virt_text = { { string.rep('▀', width), M.hl('_Inverse_' .. M.hl('Code')) } },
         virt_text_pos = 'overlay',
     }
 end
@@ -214,19 +219,6 @@ function M.quote(row, format, highlight)
     }
 end
 
----@param row integer
----@param spaces integer
----@return render.md.MarkInfo
-function M.padding(row, spaces)
-    ---@type render.md.MarkInfo
-    return {
-        row = { row },
-        col = { 0 },
-        virt_text = { { string.rep(' ', spaces), 'Normal' } },
-        virt_text_pos = 'inline',
-    }
-end
-
 ---@param row integer
 ---@param col integer
 ---@param head boolean
@@ -324,6 +316,7 @@ function M.get_actual_marks()
             conceal = details.conceal,
             virt_text = details.virt_text,
             virt_text_pos = details.virt_text_pos,
+            virt_text_win_col = details.virt_text_win_col,
             virt_lines = details.virt_lines,
             virt_lines_above = details.virt_lines_above,
             sign_text = details.sign_text,