chore(refactor): move window range computation to env module

Author: MeanderingProgrammer

lua/render-markdown/core/conceal.lua

@@ -147,7 +147,7 @@ end
 ---@param language string
 ---@param root TSNode
 function Conceal:compute_tree(language, root)
-    if not self.context:overlaps_node(root) then
+    if not self.context:overlaps(root) then
         return
     end
     if not vim.tbl_contains({ 'markdown', 'markdown_inline' }, language) then
@@ -158,8 +158,8 @@ function Conceal:compute_tree(language, root)
         return
     end
     self.context:for_each(function(range)
-        local start, stop = range.top, range.bottom
-        for id, node, data in query:iter_captures(root, self.buf, start, stop) do
+        local top, bottom = range.top, range.bottom
+        for id, node, data in query:iter_captures(root, self.buf, top, bottom) do
             if data.conceal_lines ~= nil then
                 local node_range = self:node_range(id, node, data)
                 local row = unpack(node_range)

lua/render-markdown/core/context.lua

@@ -37,7 +37,8 @@ function Context.new(props, offset)
 
     local ranges = {}
     for _, window in ipairs(Env.buf.windows(props.buf)) do
-        ranges[#ranges + 1] = Context.compute_range(props.buf, window, offset)
+        local top, bottom = Env.range(props.buf, window, offset)
+        ranges[#ranges + 1] = Range.new(top, bottom)
     end
     self.ranges = Range.coalesce(ranges)
     self.callouts = {}
@@ -54,27 +55,6 @@ function Context.new(props, offset)
     return self
 end
 
----@private
----@param buf integer
----@param win integer
----@param offset integer
----@return render.md.Range
-function Context.compute_range(buf, win, offset)
-    local top = math.max(Env.win.view(win).topline - 1 - offset, 0)
-
-    local bottom = top
-    local lines = vim.api.nvim_buf_line_count(buf)
-    local size = vim.api.nvim_win_get_height(win) + (2 * offset)
-    while bottom < lines and size > 0 do
-        bottom = bottom + 1
-        if Env.row.visible(win, bottom) then
-            size = size - 1
-        end
-    end
-
-    return Range.new(top, bottom)
-end
-
 ---@param config render.md.base.Config
 ---@return boolean
 function Context:skip(config)
@@ -114,11 +94,6 @@ function Context:add_checkbox(row, checkbox)
     self.checkboxes[row] = checkbox
 end
 
----@return integer
-function Context:tab_size()
-    return Env.buf.get(self.buf, 'tabstop')
-end
-
 ---@param node? render.md.Node
 ---@return integer
 function Context:width(node)
@@ -128,19 +103,6 @@ function Context:width(node)
     return Str.width(node.text) + self:get_offset(node) - self.conceal:get(node)
 end
 
----@param row integer
----@param offset render.md.context.Offset
-function Context:add_offset(row, offset)
-    if offset.width <= 0 then
-        return
-    end
-    if self.offsets[row] == nil then
-        self.offsets[row] = {}
-    end
-    local offsets = self.offsets[row]
-    offsets[#offsets + 1] = offset
-end
-
 ---@private
 ---@param node render.md.Node
 ---@return integer
@@ -155,6 +117,19 @@ function Context:get_offset(node)
     return result
 end
 
+---@param row integer
+---@param offset render.md.context.Offset
+function Context:add_offset(row, offset)
+    if offset.width <= 0 then
+        return
+    end
+    if self.offsets[row] == nil then
+        self.offsets[row] = {}
+    end
+    local offsets = self.offsets[row]
+    offsets[#offsets + 1] = offset
+end
+
 ---@param value number
 ---@param used integer
 ---@return integer
@@ -171,53 +146,55 @@ end
 
 ---@param win integer
 ---@return boolean
-function Context:contains_window(win)
-    local window_range = Context.compute_range(self.buf, win, 0)
-    return self:for_each(function(range)
-        return range:contains(window_range.top, window_range.bottom)
-    end)
+function Context:contains(win)
+    local top, bottom = Env.range(self.buf, win, 0)
+    for _, range in ipairs(self.ranges) do
+        if range:contains(top, bottom) then
+            return true
+        end
+    end
+    return false
 end
 
 ---@param node TSNode
 ---@return boolean
-function Context:overlaps_node(node)
+function Context:overlaps(node)
     local top, _, bottom, _ = node:range()
-    return self:for_each(function(range)
-        return range:overlaps(top, bottom)
-    end)
+    for _, range in ipairs(self.ranges) do
+        if range:overlaps(top, bottom) then
+            return true
+        end
+    end
+    return false
 end
 
 ---@param parser vim.treesitter.LanguageTree
 function Context:parse(parser)
-    self:for_each(function(range)
+    for _, range in ipairs(self.ranges) do
         parser:parse({ range.top, range.bottom })
-    end)
+    end
 end
 
 ---@param root TSNode
 ---@param query vim.treesitter.Query
 ---@param callback fun(capture: string, node: render.md.Node)
 function Context:query(root, query, callback)
-    self:for_each(function(range)
-        local start, stop = range.top, range.bottom
-        for id, ts_node in query:iter_captures(root, self.buf, start, stop) do
+    for _, range in ipairs(self.ranges) do
+        local top, bottom = range.top, range.bottom
+        for id, ts_node in query:iter_captures(root, self.buf, top, bottom) do
             local capture = query.captures[id]
             local node = Node.new(self.buf, ts_node)
             log.node(capture, node)
             callback(capture, node)
         end
-    end)
+    end
 end
 
----@param callback fun(range: render.md.Range): boolean?
----@return boolean
+---@param callback fun(range: render.md.Range)
 function Context:for_each(callback)
     for _, range in ipairs(self.ranges) do
-        if callback(range) then
-            return true
-        end
+        callback(range)
     end
-    return false
 end
 
 ---@class render.md.context.Cache: { [integer]: render.md.Context }
@@ -226,17 +203,17 @@ local Cache = {}
 ---@class render.md.context.Manager
 local M = {}
 
----@param props render.md.context.Props
-function M.reset(props)
-    Cache[props.buf] = Context.new(props, 10)
-end
-
 ---@param buf integer
 ---@param win integer
 ---@return boolean
-function M.contains_range(buf, win)
+function M.contains(buf, win)
     local context = Cache[buf]
-    return context ~= nil and context:contains_window(win)
+    return context ~= nil and context:contains(win)
+end
+
+---@param props render.md.context.Props
+function M.reset(props)
+    Cache[props.buf] = Context.new(props, 10)
 end
 
 ---@param buf integer

lua/render-markdown/core/ui.lua

@@ -85,13 +85,7 @@ end
 ---@param event string
 ---@param change boolean
 function M.update(buf, win, event, change)
-    log.buf(
-        'info',
-        'update',
-        buf,
-        string.format('event %s', event),
-        string.format('change %s', change)
-    )
+    log.buf('info', 'update', buf, event, string.format('change %s', change))
     if not Env.valid(buf, win) then
         return
     end
@@ -124,7 +118,7 @@ end
 ---@return boolean
 function M.parse(buf, win, change)
     -- Need to parse when things change or we have not parsed the visible range yet
-    return change or not Context.contains_range(buf, win)
+    return change or not Context.contains(buf, win)
 end
 
 ---@private
@@ -246,7 +240,7 @@ end
 ---@return render.md.Mark[]
 function M.parse_tree(ctx, language)
     log.buf('debug', 'language', ctx.buf, language)
-    if not Context.get(ctx.buf):overlaps_node(ctx.root) then
+    if not Context.get(ctx.buf):overlaps(ctx.root) then
         return {}
     end
 

lua/render-markdown/health.lua

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

lua/render-markdown/lib/env.lua

@@ -68,6 +68,26 @@ function M.valid(buf, win)
     return buf == M.win.buf(win)
 end
 
+---@param buf integer
+---@param win integer
+---@param offset integer
+---@return integer, integer
+function M.range(buf, win, offset)
+    local top = math.max(M.win.view(win).topline - 1 - offset, 0)
+
+    local bottom = top
+    local lines = vim.api.nvim_buf_line_count(buf)
+    local size = vim.api.nvim_win_get_height(win) + (2 * offset)
+    while bottom < lines and size > 0 do
+        bottom = bottom + 1
+        if M.row.visible(win, bottom) then
+            size = size - 1
+        end
+    end
+
+    return top, bottom
+end
+
 ---@class render.md.env.Row
 M.row = {}
 

lua/render-markdown/render/code.lua

@@ -1,4 +1,5 @@
 local Base = require('render-markdown.render.base')
+local Env = require('render-markdown.lib.env')
 local Icons = require('render-markdown.integ.icons')
 local Str = require('render-markdown.lib.str')
 local colors = require('render-markdown.colors')
@@ -63,7 +64,7 @@ function Render:offset(value, used)
     local result = self.context:percent(value, used)
     if self.node.text:find('\t') ~= nil then
         -- Rounds to the next multiple of tab size
-        local tab_size = self.context:tab_size()
+        local tab_size = Env.buf.get(self.context.buf, 'tabstop')
         result = math.ceil(result / tab_size) * tab_size
     end
     return result

lua/render-markdown/render/table.lua

@@ -63,7 +63,7 @@ function Render:setup()
     self.node:for_each_child(function(row)
         if row.type == 'pipe_table_delimiter_row' then
             delim = self:parse_delim(row)
-        elseif self.context:overlaps_node(row:get()) then
+        elseif self.context:overlaps(row:get()) then
             if
                 vim.tbl_contains(
                     { 'pipe_table_header', 'pipe_table_row' },