chore: move find pattern ranges logic to node class

## Details

Finding the range of string patterns relative to a node really belongs
in the node class since it depends on the node's position along with its
text. Remove the old usage of `Str.find_all` + helper. Will make using
patterns in more places easier if we choose to do so.

Minor style change, inline `@type` annotations rather than having them
be on separate lines in a few contexts.

Update changelog.

Author: MeanderingProgrammer

CHANGELOG.md

@@ -11,6 +11,9 @@
   [c283dec](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/c283dec1ea94947499c36bb17443e15d6acf5cda)
 - wrap `nvim_buf_set_extmark` in pcall use notify_once if it errors [#382](https://github.com/MeanderingProgrammer/render-markdown.nvim/issues/382)
   [1e2e9a3](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/1e2e9a386fbe41b869d3d0e000e19db72284585b)
+- ignore option, checked before attaching [05e6a6d](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/05e6a6d119f90b99829ecb7eb85428a226c0c05f)
+- on.initial option, called before adding marks for the first time [#396](https://github.com/MeanderingProgrammer/render-markdown.nvim/issues/396)
+  [91d40c2](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/91d40c2f37a4373ec29a47fcf3ce656408d302dc)
 
 ## 8.2.0 (2025-03-31)
 

lua/render-markdown/handler/latex.lua

@@ -37,8 +37,7 @@ function M.parse(ctx)
         cache[node.text] = raw_expression
     end
 
-    ---@type string[]
-    local expressions = {}
+    local expressions = {} ---@type string[]
     for _ = 1, latex.top_pad do
         expressions[#expressions + 1] = ''
     end

lua/render-markdown/health.lua

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

lua/render-markdown/integ/coq.lua

@@ -29,8 +29,7 @@ end
 ---@param map table<integer, table>
 ---@return integer
 function M.new_uid(map)
-    ---@type integer|nil
-    local key = nil
+    local key = nil ---@type integer?
     while true do
         if not key or map[key] then
             key = math.floor(math.random() * 10000)

lua/render-markdown/lib/node.lua

@@ -204,4 +204,40 @@ function Node:widths()
     return Iter.list.map(lines, Str.width)
 end
 
+---@param pattern string
+---@return Range4[]
+function Node:find(pattern)
+    local result = {} ---@type Range4[]
+    local index = 1 ---@type integer?
+    while index ~= nil do
+        local start_index, end_index = self.text:find(pattern, index)
+        if start_index == nil or end_index == nil then
+            index = nil
+        else
+            index = end_index + 1
+            -- start : 1-based inclusive -> 0-based inclusive = -1 offset
+            -- end   : 1-based inclusive -> 0-based exclusive =  0 offset
+            local start_row, start_col = self:position(start_index, -1)
+            local end_row, end_col = self:position(end_index, 0)
+            result[#result + 1] = { start_row, start_col, end_row, end_col }
+        end
+    end
+    return result
+end
+
+---@private
+---@param index integer
+---@param offset integer
+---@return integer, integer
+function Node:position(index, offset)
+    local lines = Str.split(self.text:sub(1, index), '\n')
+    -- start row includes first line
+    local row = self.start_row + #lines - 1
+    local col = #lines[#lines] + offset
+    if row == self.start_row then
+        col = col + self.start_col
+    end
+    return row, col
+end
+
 return Node

lua/render-markdown/lib/str.lua

@@ -48,23 +48,4 @@ function M.pad(n)
     return string.rep(' ', n)
 end
 
----@param s string
----@param pattern string
----@return Range2[]
-function M.find_all(s, pattern)
-    local result = {}
-    ---@type integer?
-    local index = 1
-    while index ~= nil do
-        local start_index, end_index = s:find(pattern, index)
-        if start_index == nil or end_index == nil then
-            index = nil
-        else
-            result[#result + 1] = { start_index, end_index }
-            index = end_index + 1
-        end
-    end
-    return result
-end
-
 return M

lua/render-markdown/render/inline_highlight.lua

@@ -1,5 +1,4 @@
 local Base = require('render-markdown.render.base')
-local Str = require('render-markdown.lib.str')
 
 ---@class render.md.render.InlineHighlight: render.md.Renderer
 ---@field private info render.md.inline.highlight.Config
@@ -16,36 +15,20 @@ function Render:setup()
 end
 
 function Render:render()
-    for _, range in ipairs(Str.find_all(self.node.text, '==[^=]+==')) do
-        local start_row, start_col = self:row_col(range[1], 1)
-        local end_row, end_col = self:row_col(range[2], 0)
+    for _, range in ipairs(self.node:find('==[^=]+==')) do
         -- Hide first 2 equal signs
-        self:hide_equals(start_row, start_col)
+        self:hide_equals(range[1], range[2])
         -- Highlight contents
-        self.marks:add(false, start_row, start_col, {
-            end_row = end_row,
-            end_col = end_col,
+        self.marks:add(false, range[1], range[2], {
+            end_row = range[3],
+            end_col = range[4],
             hl_group = self.info.highlight,
         })
         -- Hide last 2 equal signs
-        self:hide_equals(end_row, end_col - 2)
+        self:hide_equals(range[3], range[4] - 2)
     end
 end
 
----@private
----@param index integer
----@param offset integer
----@return integer, integer
-function Render:row_col(index, offset)
-    local lines = Str.split(self.node.text:sub(1, index), '\n')
-    local row = self.node.start_row + #lines - 1
-    local col = #lines[#lines] - offset
-    if row == self.node.start_row then
-        col = col + self.node.start_col
-    end
-    return row, col
-end
-
 ---@private
 ---@param row integer
 ---@param col integer

lua/render-markdown/render/table.lua

@@ -58,10 +58,8 @@ function Render:setup()
         return false
     end
 
-    ---@type render.md.table.DelimRow?
-    local delim = nil
-    ---@type render.md.Node[]
-    local table_rows = {}
+    local delim = nil ---@type render.md.table.DelimRow?
+    local table_rows = {} ---@type render.md.Node[]
     self.node:for_each_child(function(row)
         if row.type == 'pipe_table_delimiter_row' then
             delim = self:parse_delim(row)
@@ -84,8 +82,7 @@ function Render:setup()
         return false
     end
 
-    ---@type render.md.table.Row[]
-    local rows = {}
+    local rows = {} ---@type render.md.table.Row[]
     table.sort(table_rows)
     for _, table_row in ipairs(table_rows) do
         local row = self:parse_row(table_row, #delim.columns)
@@ -131,8 +128,7 @@ function Render:parse_delim(row)
     if pipes == nil or cells == nil then
         return nil
     end
-    ---@type render.md.table.DelimColumn[]
-    local columns = {}
+    local columns = {} ---@type render.md.table.DelimColumn[]
     for i, cell in ipairs(cells) do
         local width = pipes[i + 1].start_col - pipes[i].end_col
         if width < 0 then
@@ -178,8 +174,7 @@ function Render:parse_row(row, num_columns)
     if pipes == nil or cells == nil or #cells ~= num_columns then
         return nil
     end
-    ---@type render.md.table.Column[]
-    local columns = {}
+    local columns = {} ---@type render.md.table.Column[]
     for i, cell in ipairs(cells) do
         local start_col, end_col = pipes[i].end_col, pipes[i + 1].start_col
         -- Account for double width glyphs by replacing cell range with its width

tests/helpers/marks.lua

@@ -26,8 +26,7 @@ function Marks:add(start_row, end_row, start_col, end_col, opts)
     local mark = opts
     mark.row = { start_row, end_row }
     mark.col = { start_col, end_col }
-    ---@diagnostic disable-next-line: assign-type-mismatch
-    self.marks[#self.marks + 1] = opts
+    self.marks[#self.marks + 1] = mark
 end
 
 return Marks

tests/util.lua

@@ -399,8 +399,7 @@ function M.actual_marks()
     local marks = vim.api.nvim_buf_get_extmarks(0, ui.ns, 0, -1, {
         details = true,
     })
-    ---@type render.md.test.MarkDetails[]
-    local actual = {}
+    local actual = {} ---@type render.md.test.MarkDetails[]
     for _, mark in ipairs(marks) do
         local _, row, col, details = unpack(mark)
         local info = require('tests.helpers.details').new(row, col, details)