fix: fix #106 get rows_indent by treesitter logic bug

Author: shellRaining

lua/hlchunk/mods/indent/init.lua

@@ -82,17 +82,18 @@ function IndentMod:render(range)
     }
     local char_num = #self.conf.chars
     local style_num = #self.meta.hl_name_list
+    local leftcol = self.meta.leftcol
+    local sw = self.meta.shiftwidth
     local render_info = {}
     for lnum = range.start, range.finish do
         local blankLen = self.meta.cache:get(range.bufnr, lnum)
-        local render_char_num, offset, shadow_char_num =
-            indentHelper.calc(blankLen, self.meta.leftcol, self.meta.shiftwidth)
+        local render_char_num, offset, shadow_char_num = indentHelper.calc(blankLen, leftcol, sw)
         for i = 1, render_char_num do
             local char = self.conf.chars[(i - 1 + shadow_char_num) % char_num + 1]
             local style = self.meta.hl_name_list[(i - 1 + shadow_char_num) % style_num + 1]
             table.insert(render_info, {
                 lnum = lnum,
-                virt_text_win_col = offset + self.meta.leftcol + (i - 1) * self.meta.shiftwidth,
+                virt_text_win_col = offset + leftcol + (i - 1) * sw,
                 virt_text = { { char, style } },
             })
         end

lua/hlchunk/utils/indentHelper.lua

@@ -1,4 +1,3 @@
-local fn = vim.fn
 local cFunc = require("hlchunk.utils.cFunc")
 
 -- get the virtual indent of the given line
@@ -24,6 +23,7 @@ local indentHelper = {}
 ---@return number render_num, number offset, number shadowed_num return the render char number and the start index of the
 -- first render char, the last is shadowed char number
 function indentHelper.calc(blank, leftcol, sw)
+    blank = blank or ""
     local blankLen = type(blank) == "string" and #blank or blank --[[@as number]]
     if blankLen - leftcol <= 0 or sw <= 0 then
         return 0, 0, 0
@@ -68,18 +68,17 @@ local function get_rows_indent_by_treesitter(range)
     end
 
     local bufnr = range.bufnr
-    for i = range.start, range.finish, -1 do
-        rows_indent[i] = vim.api.nvim_buf_call(bufnr, function()
-            local indent = ts_indent.get_indent(i + 1)
-            if indent == -1 then
-                indent = fn.indent(i + 1)
-                if indent == 0 and cFunc.get_line_len(bufnr, i) == 0 then
-                    indent = get_virt_indent(bufnr, i)
-                end
-            end
-            ---@diagnostic disable-next-line: redundant-return-value
-            return indent
+    for i = range.start, range.finish, 1 do
+        local t1 = vim.api.nvim_buf_call(bufnr, function()
+            return ts_indent.get_indent(i + 1)
         end)
+        local t2 = cFunc.get_indent(bufnr, i)
+        local line_len = cFunc.get_line_len(bufnr, i)
+        local indent = math.min(t1, t2)
+        if indent == 0 and line_len == 0 then
+            indent = get_virt_indent(bufnr, i)
+        end
+        rows_indent[i] = indent
     end
 
     return indentHelper.ROWS_INDENT_RETCODE.OK, rows_indent