fix: indented table border

## Details

Issue: #191

When calulating the leading spaces for a table row to determine how much
to indent a border only the node text was used. However if tables are
indented enough under a list item a leading continuation node eats some
of the spaces. This does not happen consistently between the heading and
other rows resulting in the number of spaces appearing different. When
this occurs we assume the table is not properly aligned on the left and
do not render a border.

To fix this caclulate the number of leadings spaces using the entire
line for the row and not just the node text.

Other unrelated changes:

- Move treesitter queries out of treesitter module and into where they
  are actually used
- Use the treesitter module to cache parsed queries to avoid parsing
  more than once per unique query
- This also avoid needing to do a vim.schedule in our state setup,
  instead the queries end up being naturally lazily evaluated

Author: MeanderingProgrammer

lua/render-markdown/core/treesitter.lua

@@ -1,63 +1,20 @@
+---@type table<string, vim.treesitter.Query>
+local queries = {}
+
 ---@class render.md.TreeSitter
 local M = {}
 
----@class render.md.treesitter.Queries
-M.queries = {
-    markdown = [[
-        (section) @section
-
-        (atx_heading [
-            (atx_h1_marker)
-            (atx_h2_marker)
-            (atx_h3_marker)
-            (atx_h4_marker)
-            (atx_h5_marker)
-            (atx_h6_marker)
-        ] @heading)
-        (setext_heading) @heading
-
-        [
-            (thematic_break)
-            (minus_metadata)
-            (plus_metadata)
-        ] @dash
-
-        (fenced_code_block) @code
-
-        [
-            (list_marker_plus)
-            (list_marker_minus)
-            (list_marker_star)
-        ] @list_marker
-
-        [
-            (task_list_marker_unchecked)
-            (task_list_marker_checked)
-        ] @checkbox
-
-        (block_quote) @quote
-
-        (pipe_table) @table
-    ]],
-    markdown_quote = [[
-        [
-            (block_quote_marker)
-            (block_continuation)
-        ] @quote_marker
-    ]],
-    inline = [[
-        (code_span) @code
-
-        (shortcut_link) @shortcut
-
-        [
-            (image)
-            (email_autolink)
-            (inline_link)
-            (full_reference_link)
-        ] @link
-    ]],
-}
+---@param language string
+---@param query string
+---@return vim.treesitter.Query
+function M.parse(language, query)
+    local result = queries[query]
+    if result == nil then
+        result = vim.treesitter.query.parse(language, query)
+        queries[query] = result
+    end
+    return result
+end
 
 ---@param language string
 ---@param injection render.md.Injection?

lua/render-markdown/handler/markdown.lua

@@ -2,11 +2,13 @@ local Context = require('render-markdown.core.context')
 local list = require('render-markdown.core.list')
 local log = require('render-markdown.core.log')
 local state = require('render-markdown.state')
+local treesitter = require('render-markdown.core.treesitter')
 
 ---@class render.md.handler.buf.Markdown
 ---@field private marks render.md.Marks
 ---@field private config render.md.buffer.Config
 ---@field private context render.md.Context
+---@field private query vim.treesitter.Query
 ---@field private renderers table<string, render.md.Renderer>
 local Handler = {}
 Handler.__index = Handler
@@ -18,6 +20,45 @@ function Handler.new(buf)
     self.marks = list.new_marks()
     self.config = state.get(buf)
     self.context = Context.get(buf)
+    self.query = treesitter.parse(
+        'markdown',
+        [[
+            (section) @section
+
+            (atx_heading [
+                (atx_h1_marker)
+                (atx_h2_marker)
+                (atx_h3_marker)
+                (atx_h4_marker)
+                (atx_h5_marker)
+                (atx_h6_marker)
+            ] @heading)
+            (setext_heading) @heading
+
+            [
+                (thematic_break)
+                (minus_metadata)
+                (plus_metadata)
+            ] @dash
+
+            (fenced_code_block) @code
+
+            [
+                (list_marker_plus)
+                (list_marker_minus)
+                (list_marker_star)
+            ] @list_marker
+
+            [
+                (task_list_marker_unchecked)
+                (task_list_marker_checked)
+            ] @checkbox
+
+            (block_quote) @quote
+
+            (pipe_table) @table
+        ]]
+    )
     self.renderers = {
         checkbox = require('render-markdown.render.checkbox'),
         code = require('render-markdown.render.code'),
@@ -34,7 +75,7 @@ end
 ---@param root TSNode
 ---@return render.md.Mark[]
 function Handler:parse(root)
-    self.context:query(root, state.markdown_query, function(capture, info)
+    self.context:query(root, self.query, function(capture, info)
         local renderer = self.renderers[capture]
         if renderer ~= nil then
             local render = renderer:new(self.marks, self.config, self.context, info)

lua/render-markdown/handler/markdown_inline.lua

@@ -4,11 +4,13 @@ local list = require('render-markdown.core.list')
 local log = require('render-markdown.core.log')
 local state = require('render-markdown.state')
 local str = require('render-markdown.core.str')
+local treesitter = require('render-markdown.core.treesitter')
 
 ---@class render.md.handler.buf.MarkdownInline
 ---@field private marks render.md.Marks
 ---@field private config render.md.buffer.Config
 ---@field private context render.md.Context
+---@field private query vim.treesitter.Query
 local Handler = {}
 Handler.__index = Handler
 
@@ -19,13 +21,28 @@ function Handler.new(buf)
     self.marks = list.new_marks()
     self.config = state.get(buf)
     self.context = Context.get(buf)
+    self.query = treesitter.parse(
+        'markdown_inline',
+        [[
+            (code_span) @code
+
+            (shortcut_link) @shortcut
+
+            [
+                (image)
+                (email_autolink)
+                (inline_link)
+                (full_reference_link)
+            ] @link
+        ]]
+    )
     return self
 end
 
 ---@param root TSNode
 ---@return render.md.Mark[]
 function Handler:parse(root)
-    self.context:query(root, state.inline_query, function(capture, info)
+    self.context:query(root, self.query, function(capture, info)
         if capture == 'code' then
             self:code(info)
         elseif capture == 'shortcut' then

lua/render-markdown/health.lua

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

lua/render-markdown/render/quote.lua

@@ -1,9 +1,10 @@
 local Base = require('render-markdown.render.base')
 local log = require('render-markdown.core.log')
-local state = require('render-markdown.state')
+local treesitter = require('render-markdown.core.treesitter')
 
 ---@class render.md.render.Quote: render.md.Renderer
 ---@field private quote render.md.Quote
+---@field private query vim.treesitter.Query
 ---@field private highlight string
 local Render = setmetatable({}, Base)
 Render.__index = Render
@@ -24,14 +25,24 @@ function Render:setup()
         return false
     end
 
+    self.query = treesitter.parse(
+        'markdown',
+        [[
+            [
+                (block_quote_marker)
+                (block_continuation)
+            ] @quote_marker
+        ]]
+    )
+
     local callout = self.context:get_component(self.info)
     self.highlight = callout ~= nil and callout.highlight or self.quote.highlight
 
     return true
 end
 
 function Render:render()
-    self.context:query(self.info:get_node(), state.markdown_quote_query, function(capture, info)
+    self.context:query(self.info:get_node(), self.query, function(capture, info)
         if capture == 'quote_marker' then
             self:quote_marker(info)
         else

lua/render-markdown/render/table.lua

@@ -302,19 +302,20 @@ function Render:full()
         end
     end
 
-    ---@param row render.md.table.Row
-    ---@return integer
-    local function get_spaces(row)
-        return math.max(str.spaces('start', row.info.text), row.info.start_col)
-    end
-
     local first, last = rows[1], rows[#rows]
     if not width_equal(first) or not width_equal(last) then
         return
     end
 
-    local spaces = get_spaces(first)
-    if spaces ~= get_spaces(last) then
+    ---@param info render.md.NodeInfo
+    ---@return integer
+    local function get_spaces(info)
+        return math.max(str.spaces('start', info:line('first', 0) or ''), info.start_col)
+    end
+
+    local first_info, last_info = first.info, #rows == 1 and delim.info or last.info
+    local spaces = get_spaces(first_info)
+    if spaces ~= get_spaces(last_info) then
         return
     end
 
@@ -335,8 +336,7 @@ function Render:full()
         })
     end
 
-    local last_info = #rows == 1 and delim.info or last.info
-    table_border(first.info, true, { border[1], border[2], border[3] })
+    table_border(first_info, true, { border[1], border[2], border[3] })
     table_border(last_info, false, { border[7], border[8], border[9] })
 end
 

lua/render-markdown/state.lua

@@ -14,9 +14,6 @@ local configs = {}
 ---@field file_types string[]
 ---@field latex render.md.Latex
 ---@field custom_handlers table<string, render.md.Handler>
----@field markdown_query vim.treesitter.Query
----@field markdown_quote_query vim.treesitter.Query
----@field inline_query vim.treesitter.Query
 local M = {}
 
 ---@return boolean
@@ -47,11 +44,6 @@ function M.setup(default_config, user_config)
     M.file_types = config.file_types
     M.latex = config.latex
     M.custom_handlers = config.custom_handlers
-    vim.schedule(function()
-        M.markdown_query = vim.treesitter.query.parse('markdown', treesitter.queries.markdown)
-        M.markdown_quote_query = vim.treesitter.query.parse('markdown', treesitter.queries.markdown_quote)
-        M.inline_query = vim.treesitter.query.parse('markdown_inline', treesitter.queries.inline)
-    end)
     log.setup(config.log_level)
     for _, language in ipairs(M.file_types) do
         treesitter.inject(language, config.injections[language])