minor edits

Author: MeanderingProgrammer

lua/render-markdown/component.lua

@@ -1,11 +1,13 @@
+local state = require('render-markdown.state')
+
 ---@class render.md.ComponentHelper
 local M = {}
 
----@param config render.md.BufferConfig
+---@param buf integer
 ---@param text string
 ---@param comparison 'exact'|'contains'
 ---@return render.md.CustomComponent?
-function M.callout(config, text, comparison)
+function M.callout(buf, text, comparison)
     ---@param callout render.md.CustomComponent
     ---@return boolean
     local function matches(callout)
@@ -17,19 +19,19 @@ function M.callout(config, text, comparison)
             error(string.format('Unhandled comparison: %s', comparison))
         end
     end
-    for _, callout in pairs(config.callout) do
+    for _, callout in pairs(state.get_config(buf).callout) do
         if matches(callout) then
             return callout
         end
     end
     return nil
 end
 
----@param config render.md.BufferConfig
+---@param buf integer
 ---@param text string
 ---@param comparison 'exact'|'starts'
 ---@return render.md.CustomComponent?
-function M.checkbox(config, text, comparison)
+function M.checkbox(buf, text, comparison)
     ---@param checkbox render.md.CustomComponent
     ---@return boolean
     local function matches(checkbox)
@@ -41,7 +43,7 @@ function M.checkbox(config, text, comparison)
             error(string.format('Unhandled comparison: %s', comparison))
         end
     end
-    for _, checkbox in pairs(config.checkbox.custom) do
+    for _, checkbox in pairs(state.get_config(buf).checkbox.custom) do
         if matches(checkbox) then
             return checkbox
         end

lua/render-markdown/handler/markdown.lua

@@ -124,10 +124,7 @@ function Handler:list_marker(info)
             return true
         end
         local paragraph = info:sibling('paragraph')
-        if paragraph == nil then
-            return false
-        end
-        return component.checkbox(self.config, paragraph.text, 'starts') ~= nil
+        return paragraph ~= nil and component.checkbox(self.buf, paragraph.text, 'starts') ~= nil
     end
     if sibling_checkbox() then
         -- Hide the list marker for checkboxes rather than replacing with a bullet point
@@ -198,7 +195,7 @@ function Handler:quote_marker(info, block_quote)
     if not quote.enabled then
         return
     end
-    local callout = component.callout(self.config, block_quote.text, 'contains')
+    local callout = component.callout(self.buf, block_quote.text, 'contains')
     local highlight = callout ~= nil and callout.highlight or quote.highlight
     self.marks:add(true, info.start_row, info.start_col, {
         end_row = info.end_row,

lua/render-markdown/handler/markdown_inline.lua

@@ -61,13 +61,13 @@ end
 ---@private
 ---@param info render.md.NodeInfo
 function Handler:shortcut(info)
-    local callout = component.callout(self.config, info.text, 'exact')
+    local callout = component.callout(self.buf, info.text, 'exact')
     if callout ~= nil then
         self:callout(info, callout)
         return
     end
 
-    local checkbox = component.checkbox(self.config, info.text, 'exact')
+    local checkbox = component.checkbox(self.buf, info.text, 'exact')
     if checkbox ~= nil then
         self:checkbox(info, checkbox)
         return

lua/render-markdown/render/code.lua

@@ -76,8 +76,7 @@ end
 ---@param widths integer[]
 ---@return integer, integer
 function Parser.get_width(config, context, widths)
-    local code_width = vim.fn.max(widths)
-    local longest_line = config.left_pad + code_width + config.right_pad
+    local longest_line = config.left_pad + vim.fn.max(widths) + config.right_pad
     local width = math.max(longest_line, config.min_width)
     if config.width == 'block' then
         return width, width
@@ -113,13 +112,14 @@ function Render:render(info)
     if not self.config.enabled or self.config.style == 'none' then
         return
     end
+
     local code = Parser.parse(self.config, self.context, info)
     if code == nil then
         return
     end
 
-    local add_background = vim.tbl_contains({ 'normal', 'full' }, self.config.style)
-    add_background = add_background and not vim.tbl_contains(self.config.disable_background, code.language)
+    local disabled_language = vim.tbl_contains(self.config.disable_background, code.language)
+    local add_background = vim.tbl_contains({ 'normal', 'full' }, self.config.style) and not disabled_language
 
     local icon_added = self:language(code, add_background)
     if add_background then

lua/render-markdown/render/table.lua

@@ -3,6 +3,15 @@ local logger = require('render-markdown.logger')
 local str = require('render-markdown.str')
 local util = require('render-markdown.render.util')
 
+---@class render.md.table.Column
+---@field info render.md.NodeInfo
+---@field width integer
+
+---@class render.md.table.Row
+---@field info render.md.NodeInfo
+---@field pipes render.md.NodeInfo[]
+---@field columns render.md.table.Column[]
+
 ---@alias render.md.table.Alignment 'left'|'right'|'center'|'default'
 
 ---@class render.md.table.DelimColumn
@@ -13,15 +22,6 @@ local util = require('render-markdown.render.util')
 ---@field info render.md.NodeInfo
 ---@field columns render.md.table.DelimColumn[]
 
----@class render.md.table.Column
----@field info render.md.NodeInfo
----@field width integer
-
----@class render.md.table.Row
----@field info render.md.NodeInfo
----@field pipes render.md.NodeInfo[]
----@field columns render.md.table.Column[]
-
 ---@class render.md.table.Table
 ---@field info render.md.NodeInfo
 ---@field delim render.md.table.DelimRow
@@ -47,7 +47,7 @@ function Parser.parse(context, info)
         if row.type == 'pipe_table_delimiter_row' then
             delim = Parser.delim(row)
         elseif context:contains_info(row) then
-            if row.type == 'pipe_table_header' or row.type == 'pipe_table_row' then
+            if vim.tbl_contains({ 'pipe_table_header', 'pipe_table_row' }, row.type) then
                 table.insert(table_rows, row)
             else
                 logger.unhandled_type('markdown', 'row', row.type)
@@ -73,8 +73,7 @@ function Parser.parse(context, info)
     -- Store the max width information in the delimiter
     for _, row in ipairs(rows) do
         for i, column in ipairs(row.columns) do
-            local delim_column = delim.columns[i]
-            delim_column.width = math.max(delim_column.width, column.width)
+            delim.columns[i].width = math.max(delim.columns[i].width, column.width)
         end
     end
 
@@ -90,17 +89,12 @@ function Parser.delim(info)
     if row_data == nil then
         return nil
     end
-
-    local pipes = row_data.pipes
-    local cells = row_data.cells
-
-    ---@type render.md.table.DelimColumn[]
+    local pipes, cells = row_data.pipes, row_data.cells
     local columns = {}
     for i = 1, #cells do
-        local cell = cells[i]
-        local width = pipes[i + 1].start_col - pipes[i].end_col
+        local cell, width = cells[i], pipes[i + 1].start_col - pipes[i].end_col
         if width < 0 then
-            return {}
+            return nil
         end
         ---@type render.md.table.DelimColumn
         local column = { width = width, alignment = Parser.alignment(cell) }
@@ -137,18 +131,13 @@ function Parser.row(context, info, num_columns)
     if row_data == nil then
         return nil
     end
-
-    local pipes = row_data.pipes
-    local cells = row_data.cells
+    local pipes, cells = row_data.pipes, row_data.cells
     if #cells ~= num_columns then
         return nil
     end
-
-    ---@type render.md.table.Column[]
     local columns = {}
     for i = 1, #cells do
-        local cell = cells[i]
-        local width = pipes[i + 1].start_col - pipes[i].end_col
+        local cell, width = cells[i], pipes[i + 1].start_col - pipes[i].end_col
         -- Account for double width glyphs by replacing cell spacing with text width
         width = width - (cell.end_col - cell.start_col) + str.width(cell.text)
         -- Remove concealed and add inlined text
@@ -160,7 +149,6 @@ function Parser.row(context, info, num_columns)
         local column = { info = cell, width = width }
         table.insert(columns, column)
     end
-
     ---@type render.md.table.Row
     return { info = info, pipes = pipes, columns = columns }
 end
@@ -170,10 +158,7 @@ end
 ---@param cell_type string
 ---@return { pipes: render.md.NodeInfo[], cells: render.md.NodeInfo[] }?
 function Parser.row_data(info, cell_type)
-    ---@type render.md.NodeInfo[]
-    local pipes = {}
-    ---@type render.md.NodeInfo[]
-    local cells = {}
+    local pipes, cells = {}, {}
     info:for_each_child(function(cell)
         if cell.type == '|' then
             table.insert(pipes, cell)
@@ -218,6 +203,7 @@ function Render:render(info)
     if not self.config.enabled or self.config.style == 'none' then
         return
     end
+
     local tbl = Parser.parse(self.context, info)
     if tbl == nil then
         return
@@ -350,9 +336,7 @@ function Render:full(tbl)
         return math.max(str.leading_spaces(row.info.text), row.info.start_col)
     end
 
-    local delim = tbl.delim
-    local first = tbl.rows[1]
-    local last = tbl.rows[#tbl.rows]
+    local delim, first, last = tbl.delim, tbl.rows[1], tbl.rows[#tbl.rows]
     if not width_equal(first, delim) or not width_equal(last, delim) then
         return
     end

lua/render-markdown/state.lua

@@ -65,7 +65,7 @@ end
 
 ---@param buf integer
 ---@return render.md.BufferConfig
-M.get_config = function(buf)
+function M.get_config(buf)
     local config = configs[buf]
     if config == nil then
         config = M.default_buffer_config()