perf: add ml_get_buf, ml_get_buf_len and skipwhite

Author: shellRaining

lua/hlchunk/mods/chunk/init.lua

@@ -201,7 +201,6 @@ function ChunkMod:createAutocmd()
         end
         debounce_render_cb(event)
     end
-
     api.nvim_create_autocmd({ "CursorMovedI", "CursorMoved" }, {
         group = self.meta.augroup_name,
         callback = debounce_render_cb_with_pre_hook,

lua/hlchunk/mods/indent/init.lua

@@ -51,15 +51,6 @@ function IndentMod:renderLine(bufnr, lnum, blankLen)
         local style = self.meta.hl_name_list[(i - 1 + shadow_char_num) % #self.meta.hl_name_list + 1]
         row_opts.virt_text = { { char, style } }
         row_opts.virt_text_win_col = offset + (i - 1) * self.meta.shiftwidth
-
-        -- when use treesitter, without this judge, when paste code will over render
-        -- if row_opts.virt_text_win_col < 0 or row_opts.virt_text_win_col >= fn.indent(index) then
-        --     vim.notify(tostring(index))
-        --     -- if the len of the line is 0, and have leftcol, we should draw it indent by context
-        --     if api.nvim_buf_get_lines(bufnr, index - 1, index, false)[1] ~= "" then
-        --         return
-        --     end
-        -- end
         api.nvim_buf_set_extmark(bufnr, self.meta.ns_id, lnum, 0, row_opts)
     end
 end

lua/hlchunk/utils/cFunc.lua

@@ -2,31 +2,69 @@ local ffi = require("ffi")
 
 ffi.cdef([[
     typedef struct {} Error;
+    typedef int colnr_T;
     typedef struct file_buffer buf_T;
     typedef int32_t linenr_T;
     buf_T *find_buffer_by_handle(int buffer, Error *err);
-    int get_indent_buf(buf_T *buf, linenr_T lnum);
-    int get_sw_value(buf_T *buf);
+    int get_indent_buf(buf_T *buf, linenr_T lnum); // fn.indent
+    int get_sw_value(buf_T *buf); // fn.shiftwidth
+    char *ml_get_buf(buf_T *buf, linenr_T lnum); // fn.getbufline
+    colnr_T ml_get_buf_len(buf_T *buf, linenr_T lnum); // #fn.getbufline
+
+    // string utils
+    char *skipwhite(const char *p);
 ]])
 local C = ffi.C
 
 local M = {}
 
 ---@param bufnr number
----@param row number 0-index
+---@param lnum number 0-index
 ---@return number
-function M.get_indent(bufnr, row)
+function M.get_indent(bufnr, lnum)
     local line_cnt = vim.api.nvim_buf_line_count(bufnr)
-    if row >= line_cnt then
+    if lnum >= line_cnt then
         return -1
     end
     local handler = C.find_buffer_by_handle(bufnr, ffi.new("Error"))
-    return C.get_indent_buf(handler, row + 1)
+    return C.get_indent_buf(handler, lnum + 1)
 end
 
 function M.get_sw(bufnr)
     local handler = C.find_buffer_by_handle(bufnr, ffi.new("Error"))
     return C.get_sw_value(handler)
 end
 
+---@param bufnr number
+---@param lnum number 0-index
+---@return string
+function M.get_line(bufnr, lnum)
+    local line_cnt = vim.api.nvim_buf_line_count(bufnr)
+    if lnum >= line_cnt then
+        return ""
+    end
+    local handler = C.find_buffer_by_handle(bufnr, ffi.new("Error"))
+    return C.ml_get_buf(handler, lnum + 1)
+end
+
+---@param bufnr number
+---@param lnum number 0-index
+---@return number
+function M.get_line_len(bufnr, lnum)
+    local line_cnt = vim.api.nvim_buf_line_count(bufnr)
+    if lnum >= line_cnt then
+        return 0
+    end
+    local handler = C.find_buffer_by_handle(bufnr, ffi.new("Error"))
+    return C.ml_get_buf_len(handler, lnum + 1)
+end
+
+---return the first non-white character in the string, or '' if the string is empty or contains only white characters
+---@param s string
+---@return string
+function M.skipwhite(s)
+    local c = ffi.string(C.skipwhite(s), 1)
+    return c == "\0" and "" or c
+end
+
 return M

lua/hlchunk/utils/indentHelper.lua

@@ -3,12 +3,17 @@ local cFunc = require("hlchunk.utils.cFunc")
 
 -- get the virtual indent of the given line
 ---@param bufnr number
----@param line number
+---@param lnum number 0-indexed
 ---@return number
-local function get_virt_indent(bufnr, line)
-    return vim.api.nvim_buf_call(bufnr, function()
-        return cFunc.get_indent(bufnr, fn.nextnonblank(line + 1) - 1)
-    end)
+local function get_virt_indent(bufnr, lnum)
+    local line_cnt = vim.api.nvim_buf_line_count(bufnr)
+    for i = lnum + 1, line_cnt do
+        local line = cFunc.get_line(bufnr, i)
+        if cFunc.skipwhite(line) ~= "" then
+            return cFunc.get_indent(bufnr, i)
+        end
+    end
+    return -1
 end
 
 local indentHelper = {}
@@ -40,11 +45,12 @@ indentHelper.ROWS_INDENT_RETCODE = {
 ---@return table<number, number>
 local function get_rows_indent_by_context(range)
     local rows_indent = {}
+    local bufnr = range.bufnr
 
     for i = range.finish, range.start, -1 do
-        rows_indent[i] = cFunc.get_indent(range.bufnr, i)
-        if rows_indent[i] == 0 and #fn.getline(i + 1) == 0 then
-            rows_indent[i] = get_virt_indent(range.bufnr, i)
+        rows_indent[i] = cFunc.get_indent(bufnr, i)
+        if rows_indent[i] == 0 and cFunc.get_line_len(bufnr, i) == 0 then
+            rows_indent[i] = get_virt_indent(bufnr, i)
         end
     end
 
@@ -61,13 +67,14 @@ local function get_rows_indent_by_treesitter(range)
         return indentHelper.ROWS_INDENT_RETCODE.NO_TS, {}
     end
 
+    local bufnr = range.bufnr
     for i = range.start, range.finish, -1 do
-        rows_indent[i] = vim.api.nvim_buf_call(range.bufnr, function()
+        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 #fn.getline(i + 1) == 0 then
-                    indent = get_virt_indent(range.bufnr, i)
+                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

test/features/cFunc_spec.lua

@@ -0,0 +1,17 @@
+local assert = require("luassert")
+local cFunc = require("hlchunk.utils.cFunc")
+
+describe("cFunc", function()
+    it("skipwhite", function()
+        local str
+
+        str = "    abc"
+        assert.equals(cFunc.skipwhite(str), "a")
+        str = "    "
+        assert.equals(cFunc.skipwhite(str), "")
+        str = ""
+        assert.equals(cFunc.skipwhite(str), "")
+        str = "abc"
+        assert.equals(cFunc.skipwhite(str), "a")
+    end)
+end)