chore(refactor): use add_start helper for adding mark to the start of another node

Author: MeanderingProgrammer

doc/render-markdown.txt

@@ -1,4 +1,4 @@
-*render-markdown.txt*         For 0.10.0         Last change: 2025 February 19
+*render-markdown.txt*         For 0.10.0         Last change: 2025 February 20
 
 ==============================================================================
 Table of Contents                          *render-markdown-table-of-contents*

lua/render-markdown/health.lua

@@ -5,7 +5,7 @@ local state = require('render-markdown.state')
 local M = {}
 
 ---@private
-M.version = '8.0.5'
+M.version = '8.0.6'
 
 function M.check()
     M.start('version')

lua/render-markdown/lib/list.lua

@@ -29,6 +29,14 @@ function Marks:get()
     return self.marks
 end
 
+---@param element boolean|render.md.Element
+---@param node render.md.Node
+---@param opts vim.api.keyset.set_extmark
+---@return boolean
+function Marks:add_start(element, node, opts)
+    return self:add(element, node.start_row, node.start_col, opts)
+end
+
 ---@param element boolean|render.md.Element
 ---@param node render.md.Node
 ---@param opts vim.api.keyset.set_extmark

lua/render-markdown/render/base.lua

@@ -38,7 +38,7 @@ function Base:sign(text, highlight)
     if highlight ~= nil then
         sign_highlight = colors.combine(highlight, sign_highlight)
     end
-    self.marks:add('sign', self.node.start_row, self.node.start_col, {
+    self.marks:add_start('sign', self.node, {
         sign_text = text,
         sign_hl_group = sign_highlight,
     })
@@ -55,9 +55,7 @@ function Base:checkbox_scope(paragraph, highlight)
     if paragraph == nil then
         return
     end
-    self.marks:add_over('check_scope', paragraph, {
-        hl_group = highlight,
-    })
+    self.marks:add_over('check_scope', paragraph, { hl_group = highlight })
 end
 
 ---@protected

lua/render-markdown/render/code.lua

@@ -135,13 +135,13 @@ function Render:language()
 
     if self.code.position == 'left' then
         if self.code.language_name and self:hidden(node) then
-            -- Code blocks will pick up varying amounts of leading white space depending on the
-            -- context they are in. This gets lumped into the delimiter node and as a result,
-            -- after concealing, the extmark will be left shifted. Logic below accounts for this.
+            -- Code blocks pick up varying amounts of leading white space depending
+            -- on the context they are in. This is lumped into the delimiter node and
+            -- as a result, after concealing, the extmark would be shifted.
             local padding = Str.spaces('start', self.node.text) + self.data.language_padding
             icon_text = Str.pad(padding) .. icon_text .. node.text
         end
-        return self.marks:add('code_language', node.start_row, node.start_col, {
+        return self.marks:add_start('code_language', node, {
             virt_text = { { icon_text, highlight } },
             virt_text_pos = 'inline',
         })

lua/render-markdown/render/code_inline.lua

@@ -18,18 +18,18 @@ function Render:setup()
 end
 
 function Render:render()
-    self.marks:add_over('code_background', self.node, {
-        hl_group = self.code.highlight_inline,
-    })
-    self:side_padding(self.node.start_row, self.node.start_col)
-    self:side_padding(self.node.end_row, self.node.end_col)
+    local highlight = self.code.highlight_inline
+    self.marks:add_over('code_background', self.node, { hl_group = highlight })
+    self:side_padding(highlight, self.node.start_row, self.node.start_col)
+    self:side_padding(highlight, self.node.end_row, self.node.end_col)
 end
 
 ---@private
+---@param highlight string
 ---@param row integer
 ---@param col integer
-function Render:side_padding(row, col)
-    local padding, highlight = self.code.inline_pad, self.code.highlight_inline
+function Render:side_padding(highlight, row, col)
+    local padding = self.code.inline_pad
     if padding > 0 then
         self.marks:add(true, row, col, {
             priority = 0,

lua/render-markdown/render/heading.lua

@@ -123,9 +123,7 @@ function Render:icon()
             return width
         end
         if self.heading.position == 'right' then
-            self.marks:add_over(true, marker, {
-                conceal = '',
-            }, { 0, 0, 0, 1 })
+            self.marks:add_over(true, marker, { conceal = '' }, { 0, 0, 0, 1 })
             self.marks:add_over('head_icon', marker, {
                 priority = 1000,
                 virt_text = { { icon, highlight } },
@@ -320,9 +318,7 @@ end
 
 ---@private
 function Render:conceal_underline()
-    self.marks:add_over(true, self.data.marker, {
-        conceal = '',
-    })
+    self.marks:add_over(true, self.data.marker, { conceal = '' })
 end
 
 return Render

lua/render-markdown/render/html_comment.lua

@@ -15,9 +15,7 @@ function Render:setup()
 end
 
 function Render:render()
-    self.marks:add_over(true, self.node, {
-        conceal = '',
-    })
+    self.marks:add_over(true, self.node, { conceal = '' })
     if self.comment.text ~= nil then
         self.marks:add_over(true, self.node, {
             virt_text = { { self.comment.text, self.comment.highlight } },

lua/render-markdown/render/html_tag.lua

@@ -22,7 +22,7 @@ end
 function Render:render()
     self:hide('start_tag')
     self:hide('end_tag')
-    self.marks:add(false, self.node.start_row, self.node.start_col, {
+    self.marks:add_start(false, self.node, {
         virt_text = { { self.tag.icon, self.tag.highlight } },
         virt_text_pos = 'inline',
     })
@@ -33,9 +33,7 @@ end
 function Render:hide(child)
     local node = self.node:child(child)
     if node ~= nil then
-        self.marks:add_over(true, node, {
-            conceal = '',
-        })
+        self.marks:add_over(true, node, { conceal = '' })
     end
 end
 

lua/render-markdown/render/link.lua

@@ -45,9 +45,7 @@ function Render:render()
     })
     if self.data.autolink then
         self:hide_bracket(self.node.start_col)
-        self.marks:add_over('link', self.node, {
-            hl_group = self.data.highlight,
-        })
+        self.marks:add_over('link', self.node, { hl_group = self.data.highlight })
         self:hide_bracket(self.node.end_col - 1)
     end
 end