chore(refactor): pass context to conceal module constructor

## Details

Rather than passing `context` to individual methods in the `conceal`
module, pass it to the constructor and store it in a private field.

Remove `hidden` method wrapper in `context` and access it from `conceal`
directly where needed, provides little additional utility.

Rename method `resolve_offset` -> `to_width`.

Author: MeanderingProgrammer

CHANGELOG.md

@@ -16,6 +16,7 @@
 - `code.language_icon` option [#376](https://github.com/MeanderingProgrammer/render-markdown.nvim/issues/376)
   [8ee2701](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/8ee2701a6c4cdaef7ea0b27c13c26971ae3c9761)
   [7bf951b](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/7bf951b8ad93d47b90be290be6fc60da5788ddaa)
+- code border for different conceal settings [e724a49](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/e724a49dee315744d6f5d3c651ddd604cc7afc52)
 
 ### Bug Fixes
 

lua/render-markdown/core/conceal.lua

@@ -12,20 +12,23 @@ local Str = require('render-markdown.lib.str')
 ---@field sections render.md.conceal.Section[]
 
 ---@class render.md.Conceal
+---@field private context render.md.Context
 ---@field private buf integer
 ---@field private level integer
 ---@field private computed boolean
 ---@field private lines table<integer, render.md.conceal.Line>
 local Conceal = {}
 Conceal.__index = Conceal
 
+---@param context render.md.Context
 ---@param buf integer
----@param level integer
+---@param win integer
 ---@return render.md.Conceal
-function Conceal.new(buf, level)
+function Conceal.new(context, buf, win)
     local self = setmetatable({}, Conceal)
+    self.context = context
     self.buf = buf
-    self.level = level
+    self.level = Env.win.get(win, 'conceallevel')
     self.computed = false
     self.lines = {}
     return self
@@ -49,17 +52,24 @@ function Conceal:add(row, entry)
     if type(entry) == 'boolean' then
         line.hidden = entry
     else
-        if entry.width <= 0 then
-            return
-        end
         -- If the section is covered by an existing one don't add it
-        for _, section in ipairs(line.sections) do
-            if section.start_col <= entry.start_col and section.end_col >= entry.end_col then
-                return
-            end
+        if entry.width > 0 and not self:has(line, entry) then
+            table.insert(line.sections, entry)
+        end
+    end
+end
+
+---@private
+---@param line render.md.conceal.Line
+---@param entry render.md.conceal.Section
+---@return boolean
+function Conceal:has(line, entry)
+    for _, section in ipairs(line.sections) do
+        if section.start_col <= entry.start_col and section.end_col >= entry.end_col then
+            return true
         end
-        table.insert(line.sections, entry)
     end
+    return false
 end
 
 ---@param width integer
@@ -77,20 +87,18 @@ function Conceal:adjust(width, character)
     end
 end
 
----@param context render.md.Context
 ---@param node render.md.Node
 ---@return boolean
-function Conceal:hidden(context, node)
+function Conceal:hidden(node)
     -- conceal lines metadata require neovim >= 0.11.0 to function
-    return Env.has_11 and self:line(context, node).hidden
+    return Env.has_11 and self:line(node).hidden
 end
 
----@param context render.md.Context
 ---@param node render.md.Node
 ---@return integer
-function Conceal:get(context, node)
+function Conceal:get(node)
     local result = 0
-    for _, section in ipairs(self:line(context, node).sections) do
+    for _, section in ipairs(self:line(node).sections) do
         if node.start_col < section.end_col and node.end_col > section.start_col then
             local amount = self:adjust(section.width, section.character)
             result = result + amount
@@ -100,12 +108,11 @@ function Conceal:get(context, node)
 end
 
 ---@private
----@param context render.md.Context
 ---@param node render.md.Node
-function Conceal:line(context, node)
+function Conceal:line(node)
     if not self.computed then
-        self:compute(context)
         self.computed = true
+        self:compute()
     end
     local line = self.lines[node.start_row]
     if line == nil then
@@ -116,8 +123,7 @@ end
 
 ---Cached row level implementation of vim.treesitter.get_captures_at_pos
 ---@private
----@param context render.md.Context
-function Conceal:compute(context)
+function Conceal:compute()
     if not self:enabled() then
         return
     end
@@ -128,18 +134,17 @@ function Conceal:compute(context)
     if parser == nil then
         return
     end
-    context:parse(parser)
+    self.context:parse(parser)
     parser:for_each_tree(function(tree, language_tree)
-        self:compute_tree(context, language_tree:lang(), tree:root())
+        self:compute_tree(language_tree:lang(), tree:root())
     end)
 end
 
 ---@private
----@param context render.md.Context
 ---@param language string
 ---@param root TSNode
-function Conceal:compute_tree(context, language, root)
-    if not context:overlaps_node(root) then
+function Conceal:compute_tree(language, root)
+    if not self.context:overlaps_node(root) then
         return
     end
     if not vim.tbl_contains({ 'markdown', 'markdown_inline' }, language) then
@@ -149,7 +154,7 @@ function Conceal:compute_tree(context, language, root)
     if query == nil then
         return
     end
-    context:for_each(function(range)
+    self.context:for_each(function(range)
         for id, node, metadata in query:iter_captures(root, self.buf, range.top, range.bottom) do
             if metadata.conceal_lines ~= nil then
                 local node_range = self:node_range(id, node, metadata)

lua/render-markdown/core/context.lua

@@ -47,7 +47,7 @@ function Context.new(props, offset)
 
     self.mode = props.mode
     self.top_level_mode = props.top_level_mode
-    self.conceal = Conceal.new(self.buf, Env.win.get(self.win, 'conceallevel'))
+    self.conceal = Conceal.new(self, self.buf, self.win)
     self.last_heading = nil
 
     return self
@@ -123,22 +123,13 @@ function Context:tab_size()
     return Env.buf.get(self.buf, 'tabstop')
 end
 
----@param node? render.md.Node
----@return boolean
-function Context:hidden(node)
-    if node == nil then
-        return false
-    end
-    return self.conceal:hidden(self, node)
-end
-
 ---@param node? render.md.Node
 ---@return integer
 function Context:width(node)
     if node == nil then
         return 0
     end
-    return Str.width(node.text) + self:get_offset(node) - self.conceal:get(self, node)
+    return Str.width(node.text) + self:get_offset(node) - self.conceal:get(node)
 end
 
 ---@param row integer
@@ -172,7 +163,7 @@ end
 ---@param offset number
 ---@param width integer
 ---@return integer
-function Context:resolve_offset(offset, width)
+function Context:to_width(offset, width)
     if offset <= 0 then
         return 0
     elseif offset < 1 then

lua/render-markdown/health.lua

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

lua/render-markdown/render/code.lua

@@ -81,7 +81,7 @@ function Render:offset(offset, width, position)
     if offset <= 0 then
         return 0
     end
-    local result = self.context:resolve_offset(offset, width)
+    local result = self.context:to_width(offset, width)
     if position == 'left' and self.node.text:find('\t') ~= nil then
         local tab_size = self.context:tab_size()
         -- Rounds to the next multiple of tab_size
@@ -186,7 +186,8 @@ function Render:border(row, above, empty)
     if self.code.border == 'none' then
         return
     end
-    if self.node:child('fenced_code_block_delimiter', row) == nil then
+    local delim = self.node:child('fenced_code_block_delimiter', row)
+    if delim == nil then
         return
     end
     local width, highlight = self.data.width - self.data.col, self.code.highlight

lua/render-markdown/render/dash.lua

@@ -16,8 +16,8 @@ end
 
 function Render:render()
     local width = self.dash.width
-    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)
+    width = type(width) == 'number' and self.context:to_width(width, 0) or vim.o.columns
+    local margin = self.context:to_width(self.dash.left_margin, width)
 
     local line = self:append({}, margin)
     self:append(line, self.dash.icon:rep(width), self.dash.highlight)

lua/render-markdown/render/heading.lua

@@ -36,7 +36,7 @@ function Render:setup()
     if self.context:skip(self.heading) then
         return false
     end
-    if self.context:hidden(self.node) then
+    if self.context.conceal:hidden(self.node) then
         return false
     end
 
@@ -190,12 +190,12 @@ function Render:width(icon_width)
     else
         width = width + vim.fn.max(Iter.list.map(self.node:lines(), Str.width))
     end
-    local left_padding = self.context:resolve_offset(self.data.left_pad, width)
-    local right_padding = self.context:resolve_offset(self.data.right_pad, width)
+    local left_padding = self.context:to_width(self.data.left_pad, width)
+    local right_padding = self.context:to_width(self.data.right_pad, width)
     width = math.max(left_padding + width + right_padding, self.data.min_width)
     ---@type render.md.width.Heading
     return {
-        margin = self.context:resolve_offset(self.data.left_margin, width),
+        margin = self.context:to_width(self.data.left_margin, width),
         padding = left_padding,
         content = width,
     }

lua/render-markdown/render/paragraph.lua

@@ -22,7 +22,7 @@ end
 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)
+    local margin = self.context:to_width(self.paragraph.left_margin, width)
     local line = self:append({}, margin)
     if #line == 0 then
         return