chore(refactor): add general append method for line, replaces pad

## Details

Add a helper method for creating more complex virtual text lines.

Assumes `padding` if highlight is not provided, adds string of
repeated spaces if number is provided, skips empty sections.

Use throughout where helpful.

Author: MeanderingProgrammer

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Features
 
+- in-process lsp for engine agnostic completions [b56fa1b](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/b56fa1bc7b513f16a1c361b81438f4944b420a32)
 - customize heading properties based on text [#320](https://github.com/MeanderingProgrammer/render-markdown.nvim/issues/320)
   [5c2440d](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/5c2440d932a4ba96840e5ce5a7bd40f0624bdaa2)
 - allow html tags to be replaced with icons [#336](https://github.com/MeanderingProgrammer/render-markdown.nvim/issues/336)
@@ -40,6 +41,7 @@
 - @dsully
 - @mcDevnagh
 - @filippo-biondi
+- @Saecki (for in-process lsp inspiration)
 
 ## 8.0.0 (2025-02-06)
 

doc/render-markdown.txt

@@ -1,4 +1,4 @@
-*render-markdown.txt*           For 0.10.0          Last change: 2025 March 04
+*render-markdown.txt*           For 0.10.0          Last change: 2025 March 07
 
 ==============================================================================
 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.20'
+M.version = '8.0.21'
 
 function M.check()
     M.start('version')

lua/render-markdown/render/base.lua

@@ -92,11 +92,11 @@ function Base:indent_line(virtual, level)
         local indent = self.config.indent
         local icon_width = Str.width(indent.icon)
         if icon_width == 0 then
-            table.insert(line, self:pad(indent.per_level * level))
+            self:append(line, indent.per_level * level)
         else
             for _ = 1, level do
-                table.insert(line, { indent.icon, indent.highlight })
-                table.insert(line, self:pad(indent.per_level - icon_width))
+                self:append(line, indent.icon, indent.highlight)
+                self:append(line, indent.per_level - icon_width)
             end
         end
     end
@@ -133,11 +133,22 @@ function Base:indent_level(level)
 end
 
 ---@protected
----@param width integer
+---@param line render.md.Line
+---@param value string|integer
 ---@param highlight? string|string[]
----@return render.md.Text
-function Base:pad(width, highlight)
-    return { Str.pad(width), highlight or self.config.padding.highlight }
+---@return render.md.Line
+function Base:append(line, value, highlight)
+    highlight = highlight or self.config.padding.highlight
+    if type(value) == 'string' then
+        if #value > 0 then
+            table.insert(line, { value, highlight })
+        end
+    else
+        if value > 0 then
+            table.insert(line, { Str.pad(value), highlight })
+        end
+    end
+    return line
 end
 
 return Base

lua/render-markdown/render/code.lua

@@ -12,6 +12,7 @@ local colors = require('render-markdown.colors')
 ---@field margin integer
 ---@field language_padding integer
 ---@field padding integer
+---@field width integer
 ---@field max_width integer
 ---@field empty_rows integer[]
 ---@field indent integer
@@ -62,6 +63,7 @@ function Render:setup()
         margin = self:offset(self.code.left_margin, max_width, 'left'),
         language_padding = language_padding,
         padding = left_padding,
+        width = self.code.width == 'block' and max_width or vim.o.columns,
         max_width = max_width,
         empty_rows = empty_rows,
         indent = self:indent_size(),
@@ -97,7 +99,7 @@ function Render:render()
 
     local icon = self:language()
     local start_row, end_row = self.node.start_row, self.node.end_row - 1
-    self:border(start_row, self.code.above, not icon and self:hidden(self.data.code_node))
+    self:border(start_row, self.code.above, not icon and self:concealed(self.data.code_node))
     self:border(end_row, self.code.below, true)
     if background then
         self:background(start_row + 1, end_row - 1)
@@ -135,7 +137,7 @@ function Render:language()
     end
 
     if self.code.position == 'left' then
-        if self.code.language_name and self:hidden(node) then
+        if self.code.language_name and self:concealed(node) then
             -- 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.
@@ -173,9 +175,9 @@ function Render:border(row, border, context_hidden)
         return
     end
     local delim_node = self.node:child('fenced_code_block_delimiter', row)
-    if self.code.border == 'thin' and context_hidden and self:hidden(delim_node) then
-        local width = self.code.width == 'block' and self.data.max_width or vim.o.columns
-        local line = { { border:rep(width - self.data.col), colors.bg_to_fg(self.code.highlight) } }
+    if self.code.border == 'thin' and context_hidden and self:concealed(delim_node) then
+        local width = self.data.width - self.data.col
+        local line = { { border:rep(width), colors.bg_to_fg(self.code.highlight) } }
         self.marks:add('code_border', row, self.data.col, {
             virt_text = line,
             virt_text_pos = 'overlay',
@@ -188,7 +190,7 @@ end
 ---@private
 ---@param node? render.md.Node
 ---@return boolean
-function Render:hidden(node)
+function Render:concealed(node)
     -- TODO(0.11): handle conceal_lines
     -- - Use self.context:hidden(node) to determine if a node is hidden
     -- - Default highlights remove the fenced code block delimiter lines along with
@@ -214,7 +216,7 @@ function Render:background(start_row, end_row)
     local win_col, padding = 0, {}
     if self.code.width == 'block' then
         win_col = self.data.margin + self.data.max_width + self.data.indent
-        table.insert(padding, self:pad(vim.o.columns * 2))
+        self:append(padding, vim.o.columns * 2)
     end
     for row = start_row, end_row do
         self.marks:add('code_background', row, self.data.col, {
@@ -244,26 +246,22 @@ function Render:left_pad(background)
     -- Use lowest priority (0) to include all other marks in padding when code block is at edge
     -- Use medium priority (1000) to include border marks while likely avoiding other plugin
     local priority = self.data.col == 0 and 0 or 1000
-    local fill_text = self:pad(self.data.col)
-    local margin_text = self:pad(margin)
-    local padding_text = self:pad(padding, background and self.code.highlight or nil)
+    local highlight = background and self.code.highlight or nil
 
-    local start_row, end_row = self.node.start_row, (self.node.end_row - 1)
+    local start_row, end_row = self.node.start_row, self.node.end_row - 1
     for row = start_row, end_row do
-        local virt_text = {}
-        if self.data.col > 0 and vim.tbl_contains(self.data.empty_rows, row) then
-            table.insert(virt_text, fill_text)
-        end
-        if margin > 0 then
-            table.insert(virt_text, margin_text)
+        local line = {}
+        if vim.tbl_contains(self.data.empty_rows, row) then
+            self:append(line, self.data.col)
         end
-        if padding > 0 and row > start_row and row < end_row then
-            table.insert(virt_text, padding_text)
+        self:append(line, margin)
+        if row > start_row and row < end_row then
+            self:append(line, padding, highlight)
         end
-        if #virt_text > 0 then
+        if #line > 0 then
             self.marks:add(false, row, self.data.col, {
                 priority = priority,
-                virt_text = virt_text,
+                virt_text = line,
                 virt_text_pos = 'inline',
             })
         end

lua/render-markdown/render/code_inline.lua

@@ -29,11 +29,11 @@ end
 ---@param row integer
 ---@param col integer
 function Render:side_padding(highlight, row, col)
-    local padding = self.code.inline_pad
-    if padding > 0 then
+    local line = self:append({}, self.code.inline_pad, highlight)
+    if #line > 0 then
         self.marks:add(true, row, col, {
             priority = 0,
-            virt_text = { self:pad(padding, highlight) },
+            virt_text = { line },
             virt_text_pos = 'inline',
         })
     end

lua/render-markdown/render/dash.lua

@@ -19,20 +19,17 @@ function Render:render()
     width = type(width) == 'number' and self.context:resolve_offset(width, 0) or vim.o.columns
     local margin = self.context:resolve_offset(self.dash.left_margin, width)
 
-    local virt_text = {}
-    if margin > 0 then
-        table.insert(virt_text, self:pad(margin))
-    end
-    table.insert(virt_text, { self.dash.icon:rep(width), self.dash.highlight })
+    local line = self:append({}, margin)
+    self:append(line, self.dash.icon:rep(width), self.dash.highlight)
 
     local start_row, end_row = self.node.start_row, self.node.end_row - 1
     self.marks:add('dash', start_row, 0, {
-        virt_text = virt_text,
+        virt_text = line,
         virt_text_pos = 'overlay',
     })
     if end_row > start_row then
         self.marks:add('dash', end_row, 0, {
-            virt_text = virt_text,
+            virt_text = line,
             virt_text_pos = 'overlay',
         })
     end

lua/render-markdown/render/heading.lua

@@ -213,7 +213,7 @@ function Render:background(width)
     local win_col, padding = 0, {}
     if self.data.width == 'block' then
         win_col = width.margin + width.content + self:indent_size(self.data.level)
-        table.insert(padding, self:pad(vim.o.columns * 2))
+        self:append(padding, vim.o.columns * 2)
     end
     for row = self.node.start_row, self.node.end_row - 1 do
         self.marks:add('head_background', row, 0, {
@@ -247,12 +247,10 @@ function Render:border(width, position, icon, row)
     local prefix = self.heading.border_prefix and self.data.level or 0
     local total_width = self.data.width == 'block' and width.content or vim.o.columns
 
-    local line = {
-        self:pad(width.margin),
-        { icon:rep(width.padding), background },
-        { icon:rep(prefix), foreground },
-        { icon:rep(total_width - width.padding - prefix), background },
-    }
+    local line = self:append({}, width.margin)
+    self:append(line, icon:rep(width.padding), background)
+    self:append(line, icon:rep(prefix), foreground)
+    self:append(line, icon:rep(total_width - width.padding - prefix), background)
 
     local virtual = self.heading.border_virtual
     local target_line = self.node:line(position, 1)
@@ -275,20 +273,15 @@ end
 ---@private
 ---@param width render.md.width.Heading
 function Render:left_pad(width)
-    local virt_text = {}
-    if width.margin > 0 then
-        table.insert(virt_text, self:pad(width.margin))
-    end
-    if width.padding > 0 then
-        table.insert(virt_text, self:pad(width.padding, self.data.background))
-    end
-    if #virt_text == 0 then
+    local line = self:append({}, width.margin)
+    self:append(line, width.padding, self.data.background)
+    if #line == 0 then
         return
     end
     for row = self.node.start_row, self.node.end_row - 1 do
         self.marks:add(false, row, 0, {
             priority = 0,
-            virt_text = virt_text,
+            virt_text = line,
             virt_text_pos = 'inline',
         })
     end

lua/render-markdown/render/list_item.lua

@@ -183,10 +183,11 @@ end
 ---@param col integer
 ---@param amount integer
 function Render:side_padding(row, col, amount)
-    if amount > 0 then
+    local line = self:append({}, amount)
+    if #line > 0 then
         self.marks:add(false, row, col, {
             priority = 0,
-            virt_text = { self:pad(amount) },
+            virt_text = { line },
             virt_text_pos = 'inline',
         })
     end

lua/render-markdown/render/paragraph.lua

@@ -23,15 +23,14 @@ function Render:render()
     local width = vim.fn.max(Iter.list.map(self.node:lines(), Str.width))
     width = math.max(width, self.paragraph.min_width)
     local margin = self.context:resolve_offset(self.paragraph.left_margin, width)
-    if margin <= 0 then
+    local line = self:append({}, margin)
+    if #line == 0 then
         return
     end
-
-    local virt_text = { self:pad(margin) }
     for row = self.node.start_row, self.node.end_row - 1 do
         self.marks:add(false, row, 0, {
             priority = 0,
-            virt_text = virt_text,
+            virt_text = line,
             virt_text_pos = 'inline',
         })
     end

lua/render-markdown/render/shortcut.lua

@@ -81,8 +81,9 @@ function Render:checkbox(checkbox)
 
     local inline = self.config.checkbox.position == 'inline'
     local icon, highlight = checkbox.rendered, checkbox.highlight
+    local text = inline and icon or Str.pad_to(self.node.text, icon) .. icon
     local added = self.marks:add_over('check_icon', self.node, {
-        virt_text = { { inline and icon or Str.pad_to(self.node.text, icon) .. icon, highlight } },
+        virt_text = { { text, highlight } },
         virt_text_pos = 'inline',
         conceal = '',
     })

lua/render-markdown/render/table.lua

@@ -311,7 +311,7 @@ function Render:shift(column, side, amount)
     if amount > 0 then
         self.marks:add(true, column.row, col, {
             priority = 0,
-            virt_text = { { Str.pad(amount), self.table.filler } },
+            virt_text = self:append({}, amount, self.table.filler),
             virt_text_pos = 'inline',
         })
     elseif amount < 0 then
@@ -375,9 +375,11 @@ function Render:full()
     ---@param above boolean
     ---@param chars { [1]: string, [2]: string, [3]: string }
     local function table_border(node, above, chars)
-        local line = spaces > 0 and { self:pad(spaces) } or {}
+        local text = chars[1] .. table.concat(sections, chars[2]) .. chars[3]
         local highlight = above and self.table.head or self.table.row
-        table.insert(line, { chars[1] .. table.concat(sections, chars[2]) .. chars[3], highlight })
+
+        local line = self:append({}, spaces)
+        self:append(line, text, highlight)
         self.marks:add(false, node.start_row, node.start_col, {
             virt_lines = { vim.list_extend(self:indent_line(true), line) },
             virt_lines_above = above,

tests/indent_spec.lua

@@ -7,19 +7,14 @@ local util = require('tests.util')
 ---@param position 'above'|'below'
 ---@return render.md.MarkInfo
 local function border(row, level, position)
-    local foreground = util.hl(string.format('H%d', level))
     local background = util.hl_bg_to_fg(string.format('H%dBg', level))
     local icon = position == 'above' and '▄' or '▀'
-    local line = {
-        { '', 'Normal' },
-        { '', background },
-        { '', foreground },
-        { icon:rep(vim.o.columns), background },
-    }
     local virtual = row == 0 and position == 'above'
+    local line = {}
     if virtual then
-        table.insert(line, 1, { '  ', 'Normal' })
+        table.insert(line, { '  ', 'Normal' })
     end
+    table.insert(line, { icon:rep(vim.o.columns), background })
     ---@type render.md.MarkInfo
     return {
         row = { row },