chore(refactor): replace remaining usage of Range2

## Details

Replaces remaining use of the Range2 class with internal Range class.

Remove overlap method from Extmark and call it directly on Range
instance.

Remove method for checking overlap with NodeInfo and use method for
overlap with TSNode in all places. Make clear the distinction between
contains and overlaps via names and use them consistently.

Author: MeanderingProgrammer

CHANGELOG.md

@@ -19,6 +19,8 @@
   & border virtual option [#183](https://github.com/MeanderingProgrammer/render-markdown.nvim/issues/183)
   [aad1a12](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/aad1a1220dc9da5757e3af3befbc7fc3869dd334)
 - config command to debug configurations [a9643f4](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/a9643f4377f39f4abf943fbc73be69f33f5f2f1d)
+- same buffer in multiple windows [#184](https://github.com/MeanderingProgrammer/render-markdown.nvim/issues/184)
+  [767707e](https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/767707e928389996e8860f03552cf962afb0bfb2)
 
 ### Bug Fixes
 

lua/render-markdown/config.lua

@@ -1,3 +1,5 @@
+local Range = require('render-markdown.core.range')
+
 ---@class render.md.component.Config
 ---@field callout table<string, render.md.CustomComponent>
 ---@field checkbox table<string, render.md.CustomComponent>
@@ -42,7 +44,7 @@ end
 
 ---@param mode string
 ---@param row? integer
----@return Range2?
+---@return render.md.Range?
 function Config:hidden(mode, row)
     -- Anti-conceal is not enabled -> hide nothing
     -- Row is not known means buffer is not active -> hide nothing
@@ -51,9 +53,9 @@ function Config:hidden(mode, row)
     end
     if vim.tbl_contains({ 'v', 'V', '\22' }, mode) then
         local start = vim.fn.getpos('v')[2] - 1
-        return { math.min(row, start), math.max(row, start) }
+        return Range.new(math.min(row, start), math.max(row, start))
     else
-        return { row - self.anti_conceal.above, row + self.anti_conceal.below }
+        return Range.new(row - self.anti_conceal.above, row + self.anti_conceal.below)
     end
 end
 

lua/render-markdown/core/context.lua

@@ -140,18 +140,17 @@ end
 function Context:contains_window(win)
     local window_range = Context.compute_range(self.buf, win, 0)
     for _, range in ipairs(self.ranges) do
-        if range:contains(window_range) then
+        if range:contains(window_range.top, window_range.bottom) then
             return true
         end
     end
     return false
 end
 
----@private
----@param top integer
----@param bottom integer
+---@param node TSNode
 ---@return boolean
-function Context:overlap(top, bottom)
+function Context:overlaps_node(node)
+    local top, _, bottom, _ = node:range()
     for _, range in ipairs(self.ranges) do
         if range:overlaps(top, bottom) then
             return true
@@ -160,19 +159,6 @@ function Context:overlap(top, bottom)
     return false
 end
 
----@param node TSNode
----@return boolean
-function Context:contains_node(node)
-    local top, _, bottom, _ = node:range()
-    return self:overlap(top, bottom)
-end
-
----@param info render.md.NodeInfo
----@return boolean
-function Context:contains_info(info)
-    return self:overlap(info.start_row, info.end_row)
-end
-
 ---@param parser vim.treesitter.LanguageTree
 function Context:parse(parser)
     for _, range in ipairs(self.ranges) do
@@ -260,7 +246,7 @@ end
 ---@param root TSNode
 ---@return TSNode[]
 function Context:compute_conceal_nodes(language, root)
-    if not self:contains_node(root) then
+    if not self:overlaps_node(root) then
         return {}
     end
     if not vim.tbl_contains({ 'markdown', 'markdown_inline' }, language) then

lua/render-markdown/core/extmark.lua

@@ -18,16 +18,6 @@ function Extmark:get_mark()
     return self.mark
 end
 
----@param hidden Range2?
----@return boolean
-function Extmark:overlaps(hidden)
-    if hidden == nil then
-        return false
-    end
-    local row = self.mark.start_row
-    return row >= hidden[1] and row <= hidden[2]
-end
-
 ---@param ns_id integer
 ---@param buf integer
 function Extmark:show(ns_id, buf)

lua/render-markdown/core/range.lua

@@ -25,10 +25,11 @@ function Range.__lt(a, b)
     end
 end
 
----@param other render.md.Range
+---@param top integer
+---@param bottom integer
 ---@return boolean
-function Range:contains(other)
-    return self.top <= other.top and self.bottom >= other.bottom
+function Range:contains(top, bottom)
+    return self.top <= top and self.bottom >= bottom
 end
 
 ---@param top integer

lua/render-markdown/core/ui.lua

@@ -52,8 +52,9 @@ function M.get_row_marks(buf, win)
 
     local marks = {}
     for _, extmark in ipairs(buffer_state:get_marks()) do
-        if extmark:overlaps(hidden) then
-            table.insert(marks, extmark:get_mark())
+        local mark = extmark:get_mark()
+        if hidden:contains(mark.start_row, mark.start_row) then
+            table.insert(marks, mark)
         end
     end
     return row, marks
@@ -115,7 +116,8 @@ function M.update(buf, win, parse)
         end
         local hidden = config:hidden(mode, row)
         for _, extmark in ipairs(buffer_state:get_marks()) do
-            if extmark:get_mark().conceal and extmark:overlaps(hidden) then
+            local mark = extmark:get_mark()
+            if mark.conceal and hidden ~= nil and hidden:contains(mark.start_row, mark.start_row) then
                 extmark:hide(M.namespace, buf)
             else
                 extmark:show(M.namespace, buf)
@@ -186,7 +188,7 @@ end
 ---@return render.md.Mark[]
 function M.parse_tree(buf, language, root)
     log.buf('debug', 'language', buf, language)
-    if not Context.get(buf):contains_node(root) then
+    if not Context.get(buf):overlaps_node(root) then
         return {}
     end
 

lua/render-markdown/health.lua

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

lua/render-markdown/render/table.lua

@@ -56,7 +56,7 @@ function Render:setup()
     self.info:for_each_child(function(row)
         if row.type == 'pipe_table_delimiter_row' then
             delim = self:parse_delim(row)
-        elseif self.context:contains_info(row) then
+        elseif self.context:overlaps_node(row:get_node()) then
             if vim.tbl_contains({ 'pipe_table_header', 'pipe_table_row' }, row.type) then
                 table.insert(table_rows, row)
             else