chore(refactor): get config in mark list, configure context update

## Details

In list of marks fetch config from state module directly rather than
having it passed as a parameter. Add a parameter of whether to update
context, which we should do in all handlers except for the main markdown
handler. This avoids adding offset and conceal values that we can't
practically use.

Minor other changes:

- Use assert calls from luassert directly when needed
- Inline require ui to get namespace in test utils

Author: MeanderingProgrammer

benches/util.lua

@@ -1,9 +1,5 @@
 ---@module 'luassert'
 
-local ui = require('render-markdown.core.ui')
-local eq = assert.are.same
-local truthy = assert.truthy
-
 ---@class render.md.bench.Util
 local M = {}
 
@@ -53,13 +49,14 @@ end
 ---@param actual number
 ---@param max number
 function M.less_than(actual, max)
-    truthy(actual < max, string.format('expected %f < %f', actual, max))
+    assert.truthy(actual < max, string.format('expected %f < %f', actual, max))
 end
 
 ---@param expected integer
 function M.num_marks(expected)
-    local marks = vim.api.nvim_buf_get_extmarks(0, ui.namespace, 0, -1, {})
-    eq(expected, #marks)
+    local namespace = require('render-markdown.core.ui').namespace
+    local marks = vim.api.nvim_buf_get_extmarks(0, namespace, 0, -1, {})
+    assert.are.same(expected, #marks)
 end
 
 return M

doc/render-markdown.txt

@@ -1,4 +1,4 @@
-*render-markdown.txt*         For 0.10.0         Last change: 2024 November 20
+*render-markdown.txt*         For 0.10.0         Last change: 2024 November 22
 
 ==============================================================================
 Table of Contents                          *render-markdown-table-of-contents*

lua/render-markdown/handler/latex.lua

@@ -52,7 +52,7 @@ function M.parse(root, buf)
         return { { expression, latex.highlight } }
     end)
 
-    local marks = List.new_marks(buf, nil)
+    local marks = List.new_marks(buf, true)
     marks:add_over(false, node, {
         virt_lines = latex_lines,
         virt_lines_above = true,

lua/render-markdown/handler/markdown.lua

@@ -18,7 +18,7 @@ function Handler.new(buf)
     local self = setmetatable({}, Handler)
     self.config = state.get(buf)
     self.context = Context.get(buf)
-    self.marks = List.new_marks(buf, self.config.anti_conceal.ignore)
+    self.marks = List.new_marks(buf, false)
     self.query = treesitter.parse(
         'markdown',
         [[

lua/render-markdown/handler/markdown_inline.lua

@@ -18,7 +18,7 @@ function Handler.new(buf)
     local self = setmetatable({}, Handler)
     self.config = state.get(buf)
     self.context = Context.get(buf)
-    self.marks = List.new_marks(buf, self.config.anti_conceal.ignore)
+    self.marks = List.new_marks(buf, true)
     self.query = treesitter.parse(
         'markdown_inline',
         [[

lua/render-markdown/health.lua

@@ -4,7 +4,7 @@ local state = require('render-markdown.state')
 local M = {}
 
 ---@private
-M.version = '7.5.9'
+M.version = '7.5.10'
 
 function M.check()
     M.start('version')

lua/render-markdown/lib/list.lua

@@ -1,22 +1,25 @@
 local Context = require('render-markdown.core.context')
 local Str = require('render-markdown.lib.str')
 local log = require('render-markdown.core.log')
+local state = require('render-markdown.state')
 local util = require('render-markdown.core.util')
 
 ---@class render.md.Marks
 ---@field private context render.md.Context
 ---@field private ignore render.md.config.conceal.Ignore
+---@field private update boolean
 ---@field private marks render.md.Mark[]
 local Marks = {}
 Marks.__index = Marks
 
 ---@param buf integer
----@param ignore? render.md.config.conceal.Ignore
+---@param update boolean
 ---@return render.md.Marks
-function Marks.new(buf, ignore)
+function Marks.new(buf, update)
     local self = setmetatable({}, Marks)
     self.context = Context.get(buf)
-    self.ignore = ignore or {}
+    self.ignore = state.get(buf).anti_conceal.ignore
+    self.update = update
     self.marks = {}
     return self
 end
@@ -58,7 +61,9 @@ function Marks:add(element, start_row, start_col, opts)
         return false
     end
     log.add('debug', 'mark', mark)
-    self:update_context(mark)
+    if self.update then
+        self:update_context(mark)
+    end
     table.insert(self.marks, mark)
     return true
 end

lua/render-markdown/state.lua

@@ -25,7 +25,8 @@ end
 ---@param default_config render.md.Config
 ---@param user_config render.md.UserConfig
 function M.setup(default_config, user_config)
-    local config = vim.tbl_deep_extend('force', default_config, presets.get(user_config), user_config)
+    local preset_config = presets.get(user_config)
+    local config = vim.tbl_deep_extend('force', default_config, preset_config, user_config)
     -- Override settings that require neovim >= 0.10.0 and have compatible alternatives
     if not util.has_10 then
         config.code.position = 'right'

tests/latex_spec.lua

@@ -2,8 +2,6 @@
 
 local stub = require('luassert.stub')
 local util = require('tests.util')
-local eq = assert.are.same
-local truthy = assert.truthy
 
 ---@param start_row integer
 ---@param end_row integer
@@ -29,13 +27,13 @@ end
 ---@param responses table<string, string>
 local function set_responses(converter, responses)
     stub.new(vim.fn, 'executable', function(expr)
-        eq(converter, expr)
+        assert.are.same(converter, expr)
         return 1
     end)
     stub.new(vim.fn, 'system', function(cmd, input)
-        eq(converter, cmd)
+        assert.are.same(converter, cmd)
         local result = responses[input]
-        truthy(result, 'No output for: ' .. input)
+        assert.truthy(result, 'No output for: ' .. input)
         return result
     end)
 end

tests/state_spec.lua

@@ -1,7 +1,6 @@
 ---@module 'luassert'
 
 local state = require('render-markdown.state')
-local eq = assert.are.same
 
 ---@param opts? render.md.UserConfig
 ---@return string[]
@@ -12,14 +11,14 @@ end
 
 describe('state', function()
     it('valid', function()
-        eq(0, #validate())
+        assert.are.same(0, #validate())
         vim.bo.buftype = ''
-        eq(true, state.get(0).sign.enabled)
+        assert.are.same(true, state.get(0).sign.enabled)
         state.invalidate_cache()
         vim.bo.buftype = 'nofile'
-        eq(false, state.get(0).sign.enabled)
+        assert.are.same(false, state.get(0).sign.enabled)
 
-        eq(0, #validate({
+        assert.are.same(0, #validate({
             callout = {
                 note = { raw = 'value' },
                 new = { raw = 'value', rendered = 'value', highlight = 'value' },
@@ -49,7 +48,7 @@ describe('state', function()
     end)
 
     it('extra', function()
-        eq(
+        assert.are.same(
             {
                 'render-markdown.additional: is not a valid key',
                 'render-markdown.anti_conceal.ignore.additional: is not a valid key',
@@ -72,7 +71,7 @@ describe('state', function()
 
     it('type', function()
         ---@diagnostic disable: assign-type-mismatch
-        eq(
+        assert.are.same(
             {
                 'render-markdown.anti_conceal.ignore.sign: expected string list or type boolean or nil, got string',
                 'render-markdown.callout.a.highlight: expected type string, got nil',
@@ -118,7 +117,7 @@ describe('state', function()
             })
         )
 
-        eq(
+        assert.are.same(
             {
                 'render-markdown.checkbox: expected type table, got string',
                 'render-markdown.render_modes: expected string list or type boolean, got table, info: [1] is number',