refactor: rewrite TransNode and use main_loop in process instead of buffer function

lua/Trans/core/buffer.lua

@@ -1,32 +1,24 @@
 local api, fn = vim.api, vim.fn
-local Trans = require('Trans')
 
 ---@class TransBuffer
 ---@field bufnr integer buffer handle
 ---@field [number] string buffer[line] content
 local buffer = {}
 
-local main_loop = Trans.util.main_loop
-
-
 -- INFO : corountine can't invoke C function
 ---Clear all content in buffer
 function buffer:wipe()
-    main_loop(function()
     api.nvim_buf_set_lines(self.bufnr, 0, -1, false, {})
-    end)
 end
 
 ---Delete buffer [_start, _end] line content [one index]
 ---@param _start? integer start line index
 ---@param _end? integer end line index
 function buffer:deleteline(_start, _end)
-    main_loop(function()
     ---@diagnostic disable-next-line: cast-local-type
     _start = _start and _start - 1 or self:line_count() - 1
     _end = _end and _end - 1 or _start + 1
     api.nvim_buf_set_lines(self.bufnr, _start, _end, false, {})
-    end)
 end
 
 ---Set buffer option
@@ -105,11 +97,9 @@ end
 ---@param ns number? highlight namespace
 function buffer:add_highlight(linenr, hl_group, col_start, col_end, ns)
     -- vim.print(linenr, hl_group, col_start, col_end, ns)
-    main_loop(function()
     linenr = linenr - 1
     col_start = col_start or 0
     api.nvim_buf_add_highlight(self.bufnr, ns or -1, hl_group, linenr, col_start, col_end or -1)
-    end)
 end
 
 ---Get buffer line count
@@ -170,7 +160,6 @@ end
 buffer.__newindex = function(self, key, nodes)
     if type(key) == 'number' then
         self:setline(nodes, key)
-
     else
         rawset(self, key, nodes)
     end

lua/Trans/core/util.lua

@@ -192,6 +192,34 @@ function M.is_word(str)
     return str:match('%w+') == str
 end
 
+---@param list any[]
+---@param step table
+---@return any[]
+function M.list_concat(list, step)
+    local size = #list
+    local ret = { list[1] }
+    if size <= 1 then return ret end
+    for i = 2, size do
+        ret[i * 2 - 2] = step
+        ret[i * 2 - 1] = list[i]
+    end
+    -- FIXME : Use deepcopy step?
+    return ret
+end
+
+
+---Get the field of the list
+---@param list any[]
+---@param field any
+---@return any[]
+function M.list_fields(list, field)
+    local ret = {}
+    for i, v in ipairs(list) do
+        ret[i] = v[field]
+    end
+    return ret
+end
+
 ---@class Trans
 ---@field util TransUtil
 return M

lua/Trans/frontend/hover/init.lua

@@ -185,16 +185,16 @@ function M:process(data)
         self:fallback()
         return
     end
-    -- vim.pretty_print(result)
+
     local opts = self.opts
+    local buffer = self.buffer
+
     if opts.auto_play then
         (data.from == "en" and data.str or result.definition[1]):play()
     end
-    -- local node = Trans.util.node
-    -- local it, t, f = node.item, node.text, node.format
-    -- self.buffer:setline(it('hello', 'MoreMsg'))
 
-    local buffer = self.buffer
+    -- vim.pretty_print(result)
+    Trans.util.main_loop(function()
         if not buffer:is_valid() then
             buffer:init()
         else
@@ -203,6 +203,7 @@ function M:process(data)
 
         ---@cast name string
         self:load(result, name, opts.order[name])
+    end)
 
     local display_size = Trans.util.display_size(buffer:lines(), opts.width)
     local window = self.window

lua/Trans/frontend/hover/load.lua

@@ -20,7 +20,7 @@ local M = setmetatable({}, {
 ---@type TransHoverRenderer
 local default = {
     str = function(hover, result)
-        hover.buffer:setline(it(result.str, 'TransWord'))
+        hover.buffer:setline(it { result.str, 'TransWord' })
     end,
     translation = function(hover, result)
         local translation = result.translation
@@ -31,7 +31,7 @@ local default = {
 
         for _, value in ipairs(translation) do
             buffer:setline(
-                it(interval .. value, 'TransTranslation')
+                it { interval .. value, 'TransTranslation' }
             )
         end
 
@@ -46,7 +46,7 @@ local default = {
 
         for _, value in ipairs(definition) do
             buffer:setline(
-                it(interval .. value, 'TransDefinition')
+                it { interval .. value, 'TransDefinition' }
             )
         end
 

lua/Trans/frontend/hover/offline.lua

@@ -9,7 +9,7 @@ function M.title(hover, result)
     local title = result.title
     if not title then return end
     if type(title) == 'string' then
-        hover.buffer:setline(it(title, 'TransWord'))
+        hover.buffer:setline(it { title, 'TransWord' })
         return
     end
 
@@ -22,18 +22,17 @@ function M.title(hover, result)
     local phonetic = title.phonetic
 
     hover.buffer:setline(f {
-        width = hover.opts.width,
-        text = t {
-            it(word, 'TransWord'),
+        it { word, 'TransWord' },
         t {
-                it('['),
-                it((phonetic and phonetic ~= '') and phonetic or icon.notfound, 'TransPhonetic'),
-                it(']')
+            it { '[' },
+            it { (phonetic and phonetic ~= '') and phonetic or icon.notfound, 'TransPhonetic' },
+            it { ']' }
         },
 
-            it(collins and icon.star:rep(collins) or icon.notfound, 'TransCollins'),
-            it(oxford == 1 and icon.yes or icon.no)
-        },
+        it { collins and icon.star:rep(collins) or icon.notfound, 'TransCollins' },
+        it { oxford == 1 and icon.yes or icon.no },
+
+        width = hover.opts.width,
     })
 end
 
@@ -47,12 +46,12 @@ function M.tag(hover, result)
     local size = #tag
 
     for i = 1, size, 3 do
-        buffer:setline(it(
+        buffer:setline(it {
             interval .. tag[i] ..
             (tag[i + 1] and interval .. tag[i + 1] ..
             (tag[i + 2] and interval .. tag[i + 2] or '') or ''),
             'TransTag'
-        ))
+        })
     end
 
     buffer:setline('')
@@ -67,7 +66,7 @@ function M.exchange(hover, result)
 
     for description, value in pairs(exchange) do
         buffer:setline(
-            it(interval .. description .. interval .. value, 'TransExchange')
+            it { interval .. description .. interval .. value, 'TransExchange' }
         )
     end
 
@@ -83,7 +82,7 @@ function M.pos(hover, result)
 
     for description, value in pairs(pos) do
         buffer:setline(
-            it(interval .. description .. interval .. value, 'TransPos')
+            it { interval .. description .. interval .. value, 'TransPos' }
         )
     end
 

lua/Trans/frontend/hover/youdao.lua

@@ -30,16 +30,16 @@ function M.web(hover, result)
 
     local indent = interval .. '  ' .. hover.opts.icon.list .. ' '
     for _, w in ipairs(result.web) do
-        buffer:setline(it(
+        buffer:setline(it {
             interval .. w.key,
             'TransWeb'
-        ))
+        })
 
         for _, v in ipairs(remove_duplicate(w.value)) do
-            buffer:setline(it(
+            buffer:setline(it {
                 indent .. v,
                 'TransWeb'
-            ))
+            })
         end
     end
     buffer:setline('')
@@ -53,11 +53,11 @@ function M.explains(hover, result)
 
 
     for i = 1, #explains, 2 do
-        buffer:setline(it(
+        buffer:setline(it {
             interval .. explains[i] ..
             (explains[i + 1] and interval .. explains[i + 1] or ''),
             'TransExplains'
-        ))
+        })
     end
     buffer:setline('')
 end

lua/Trans/util/bing_node.lua

@@ -1,166 +0,0 @@
---- INFO : Generated by newbing
-
--- 基类node
-local Node = {}
-Node.__index = Node
-
--- 构造函数
-function Node:new(row, col, width, height)
-    local obj = {
-        row = row,
-        col = col,
-        width = width,
-        height = height,
-    }
-    setmetatable(obj, self)
-    return obj
-end
-
--- 渲染方法（空实现）
-function Node:render()
-end
-
--- 更新方法（空实现）
-function Node:update()
-end
-
--- 子类box node
-local BoxNode = setmetatable({}, Node)
-BoxNode.__index = BoxNode
-
--- 构造函数
-function BoxNode:new(row, col, width, height, border_style)
-    local obj = Node.new(self, row, col, width, height)
-    obj.border_style = border_style or "single"
-    return obj
-end
-
--- 渲染方法（画边框）
-function BoxNode:render()
-    local top_left_char =
-        self.border_style == "single" and "┌" or self.border_style == "double" and "╔"
-    local top_right_char =
-        self.border_style == "single" and "┐" or self.border_style == "double" and "╗"
-    local bottom_left_char =
-        self.border_style == "single" and "└" or self.border_style == "double" and "╚"
-    local bottom_right_char =
-        self.border_style == "single" and "┘" or self.border_style == "double" and "╝"
-    local horizontal_char =
-        self.border_style == "single" and "-" or self.border_style == "double" and "="
-    local vertical_char =
-        self.border_style == "single" and "|" or self.border_style == "double" and "|"
-
-    -- draw top line
-    vim.api.nvim_buf_set_text(
-        vim.api.nvim_get_current_buf(),
-        self.row,
-        self.col,
-        self.row,
-        math.min(self.col + self.width - 1),
-        { top_left_char .. horizontal_char:rep(self.width - 2) .. top_right_char }
-    )
-
-    -- draw bottom line
-    vim.api.nvim_buf_set_text(
-        vim.api.nvim_get_current_buf(),
-        math.min(self.row + self.height - 1),
-        math.max(self.col),
-        math.min(self.row + self.height - 1),
-        math.min(self.col + self.width - 1),
-        { bottom_left_char .. horizontal_char:rep(self.width - 2) .. bottom_right_char }
-    )
-
-    -- draw left line
-    for i = self.row + 1, self.row + self.height - 2 do
-        vim.api.nvim_buf_set_text(
-            vim.api.nvim_get_current_buf(),
-            i,
-            math.max(self.col),
-            i,
-            math.max(self.col + 1),
-            { vertical_char }
-        )
-    end
-
-    -- draw right line
-    for i = self.row + 1, self.row + self.height - 2 do
-        vim.api.nvim_buf_set_text(
-            vim.api.nvim_get_current_buf(),
-            i,
-            math.min(self.col + self.width - 1),
-            i,
-            math.min(self.col + self.width),
-            { vertical_char }
-        )
-    end
-end
-
--- 更新方法（暂无）
-
--- 子类text node
-local TextNode = setmetatable({}, Node)
-TextNode.__index = TextNode
-
--- 构造函数
-function TextNode:new(row, col, width, height, text_content)
-    local obj = Node.new(self, row, col, width, height)
-    obj.text_content = text_content or ""
-    return obj
-end
-
--- 渲染方法（写入文本内容）
-function TextNode:render()
-    -- split text content by newline character
-    local lines = vim.split(obj.text_content, "\n")
-
-    -- write each line to buffer text within the node boundaries
-    for i, line in ipairs(lines) do
-        if i <= self.height then
-            vim.api.nvim_buf_set_text(
-                vim.api.nvim_get_current_buf(),
-                math.min(self.row + i - 1), math.max(self.col),
-                math.min(self.row + i - 1),
-                math.min(self.col + self.width - 1),
-                { line:sub(1, self.width) }
-            )
-        end
-    end
-end
-
--- 更新方法（暂无）
-
--- 子类extmark node
-local ExtmarkNode = setmetatable({}, Node)
-ExtmarkNode.__index = ExtmarkNode
-
--- 构造函数
-function ExtmarkNode:new(row, col, width, height, hl_group)
-    local obj = Node.new(self, row, col, width, height)
-    obj.hl_group = hl_group or "Normal"
-    return obj
-end
-
--- 渲染方法（创建一个extmark）
-function ExtmarkNode:render()
-    -- create a namespace for extmarks
-    local ns = vim.api.nvim_create_namespace("nodes")
-
-    -- create an extmark with the given highlight group and position
-    vim.api.nvim_buf_set_extmark(
-        vim.api.nvim_get_current_buf(),
-        ns,
-        self.row,
-        self.col,
-        { hl_group = self.hl_group, end_line = self.row + self.height - 1, end_col = self.col + self.width - 1 }
-    )
-end
-
--- 更新方法（暂无）
-
--- 返回所有的节点类
-return {
-    Node = Node,
-    BoxNode = BoxNode,
-    TextNode = TextNode,
-    ExtmarkNode = ExtmarkNode,
-}

lua/Trans/util/node.lua

@@ -1,3 +1,11 @@
+local util = require('Trans').util
+
+---@class TransNode
+---@field [1] string text to be rendered
+---@field render fun(self: TransNode, buffer: TransBuffer, line: number, col: number) render the node
+
+
+---@class TransItem : TransNode
 local item_meta = {
     render = function(self, buffer, line, col)
         if self[2] then
@@ -6,71 +14,85 @@ local item_meta = {
     end,
 }
 
+---@class TransText : TransNode
+---@field step string
+---@field nodes TransNode[]
 local text_meta = {
+    ---@param self TransText
+    ---@param buffer TransBuffer
+    ---@param line integer
+    ---@param col integer
     render = function(self, buffer, line, col)
-        local items = self.items
-        local step  = self.step or ""
-        local len   = #step
+        local nodes = self.nodes
+        local step  = self.step
+        local len = step and #step or 0
 
-        for i = 1, self.size do
-            local item = items[i]
-            item:render(buffer, line, col)
-            col = col + #item[1] + len
+        for _, node in ipairs(nodes) do
+            node:render(buffer, line, col)
+            col = col + #node[1] + len
         end
     end,
 }
 
 item_meta.__index = item_meta
-text_meta.__index = function(self, key)
-    return text_meta[key] or (key == 1 and table.concat(self.strs, self.step) or nil)
+text_meta.__index = text_meta
+
+
+---Basic item node
+---@param tuple {[1]: string, [2]: string?}
+---@return TransItem
+local function item(tuple)
+    return setmetatable(tuple, item_meta)
 end
 
-local function item(text, highlight)
+
+
+---@param nodes {[number]: TransNode, step: string?}
+---@return table
+local function text(nodes)
     return setmetatable({
-        [1] = text,
-        [2] = highlight,
-    }, item_meta)
-end
-
-local function text(items)
-    local strs = {}
-    local size = #items
-    assert(size > 1)
-    for i = 1, size do
-        strs[i] = items[i][1]
-    end
-
-    return setmetatable({
-        strs = strs,
-        size = size,
-        items = items,
+        [1]   = table.concat(util.list_fields(nodes, 1), nodes.step),
+        step  = nodes.step,
+        nodes = nodes,
     }, text_meta)
 end
 
-local function format(opts)
-    local str   = opts.text
-    local size  = str.size
-    local width = opts.width
-    local spin  = opts.spin or " "
 
-    local wid = str[1]:width()
+---@param args {[number]: TransNode, width: integer, spin: string?}
+local function format(args)
+    local width = args.width
+    local spin  = args.spin or " "
+    local size  = #args
+    local wid   = 0
+    for i = 1, size do
+        wid = wid + args[i][1]:width()
+    end
+
     local space = math.max(math.floor((width - wid) / (size - 1)), 0)
-    if space > 0 then
-        str.step = spin:rep(space)
-    end
-    return str
+
+    args.step = spin:rep(space)
+    args.width = nil
+    args.spin = nil
+
+    ---@diagnostic disable-next-line: param-type-mismatch
+    return text(args)
 end
 
----@type table<string, function>
+
+---@class TransUtil
+---@field node TransNodes
+
+
+---@class TransNodes
 return {
     item = item,
     text = text,
     format = format,
     conjunction = function(str)
         return {
-            item("", "TransTitleRound"),
-            item(str, "TransTitle"),
-            item("", "TransTitleRound"),
+            item { "", "TransTitleRound" },
+            item { str, "TransTitle" },
+            item { "", "TransTitleRound" },
         }
     end,
 }