refactor: use item_wrap and text_wrap as line node

lua/Trans/content.lua

@@ -1,4 +1,38 @@
 local api = vim.api
+
+
+local item_meta = {
+    load_hl = function(self, content, line, col)
+        if self.hl then
+            content:newhl {
+                name = self.hl,
+                line = line,
+                _start = col,
+                _end = col + #self.text,
+            }
+        end
+    end
+}
+
+local text_meta = {
+    load_hl = function(self, content, line, col)
+        for _, item in ipairs(self.items) do
+            item:load_hl(content, line, col)
+            col = col + #item.text
+        end
+    end,
+}
+
+local format_meta = {
+    load_hl = function(self, content, line, col)
+        local space = self.space
+        for _, item in ipairs(self.items) do
+            item:load_hl(content, line, col)
+            col = col + #item.text + space
+        end
+    end
+}
+
 local content = {
     newline = function(self, value)
         if not self.modifiable then
@@ -16,24 +50,6 @@ local content = {
         self.highlights[self.hl_size] = opt
     end,
 
-    center_line = function(self, text, highlight)
-        vim.validate {
-            text = { text, 's' }
-        }
-
-        local space = math.floor((self.window.width - text:width()) / 2)
-        local interval = (' '):rep(space)
-        self:newline(interval .. text)
-        if highlight then
-            self:newhl {
-                name   = highlight,
-                line   = self.size - 1,
-                _start = space,
-                _end   = space + #text,
-            }
-        end
-    end,
-
     wipe = function(self)
         local clear = require('table.clear')
         clear(self.lines)
@@ -55,7 +71,7 @@ local content = {
         api.nvim_buf_set_lines(window.bufnr, offset, -1, true, self.lines)
 
         local hl
-        for i = 1, self.hl_size  do
+        for i = 1, self.hl_size do
             hl = self.highlights[i]
             api.nvim_buf_add_highlight(window.bufnr, window.hl, hl.name, offset + hl.line, hl._start, hl._end)
         end
@@ -64,7 +80,7 @@ local content = {
 
     actual_height = function(self, wrap)
         wrap = wrap or self.window:option('wrap')
-        if  wrap then
+        if wrap then
             local height = 0
             local width = self.window.width
             local lines = self.lines
@@ -78,78 +94,70 @@ local content = {
         end
     end,
 
-    addline = function(self, newline, highlight)
+    item_wrap = function(text, hl)
-        self:newline(newline)
+        return setmetatable({
-        if highlight then
+            text = text,
-            self:newhl {
+            hl = hl,
-                name = highlight,
+        }, { __index = item_meta })
-                line = self.size - 1,
-                _start = 0,
-                _end = -1,
-            }
-        end
     end,
 
-    items_wrap = function(self)
+    text_wrap = function(...)
-        local items = {}
+        local items = { ... }
-        local size = 0
+        local strs = {}
+
+        for i, item in ipairs(items) do
+            strs[i] = item.text
+        end
+
+        return setmetatable({
+            text = table.concat(strs),
+            items = items,
+        }, { __index = text_meta })
+    end,
+
+    format = function(self, ...)
+        local nodes = { ... }
+        local size = #nodes
+        assert(size > 1, 'check items size')
         local width = 0
+        local strs = {}
+        for i, node in ipairs(nodes) do
+            local str = node.text
+            strs[i] = str
+            width = width + str:width()
+        end
 
-        return {
+        local space = math.floor(((self.window.width - width) / (size - 1)))
-            add_item = function(item, highlight)
+        assert(space > 0, 'try to expand window size')
-                size = size + 1
+        local interval = (' '):rep(space)
-                items[size] = { item, highlight }
+        return setmetatable({
-                width = width + item:width()
+            text = table.concat(strs, interval),
-            end,
+            items = nodes,
-
+            space = space,
-            load = function()
+        }, { __index = format_meta })
-                assert(size > 1, 'no item need be loaded')
-                local space = math.floor((self.window.width - width) / (size - 1))
-                assert(space > 0, vim.inspect(items))
-                local interval = (' '):rep(space)
-                local line = ''
-
-                local function load_item(idx)
-                    local item = items[idx]
-                    if item[2] then
-                        self:newhl {
-                            name = item[2],
-                            line = self.size, -- NOTE : 此时还没插入新行, size ==> 行号(zero index)
-                            _start = #line,
-                            _end = #line + #item[1],
-                        }
-                    end
-                    line = line .. item[1]
-                end
-
-                load_item(1)
-                for i = 2, size do
-                    line = line .. interval
-                    load_item(i)
-                end
-
-                self:newline(line)
-            end
-        }
     end,
 
-    line_wrap = function(self)
+    center = function(self, item)
-        self:newline('')
+        local space = bit.rshift(self.window.width - item.text:width(), 1)
-        local index = self.size
+        item.text = (' '):rep(space) .. item.text
-        return function(text, highlight)
+        local load_hl = item.load_hl
-            if highlight then
+        item.load_hl = function (this, content, line, col)
-                local _start = #self.lines[index]
+            load_hl(this, content, line, col + space)
-                local _end = _start + #text
-                self:newhl {
-                    name = highlight,
-                    line = index - 1,
-                    _start = _start,
-                    _end = _end,
-                }
-            end
-
-            self.lines[index] = self.lines[index] .. text
         end
+
+        return item
+    end,
+
+    addline = function(self, ...)
+        local strs = {}
+        local col = 0
+        for i, node in ipairs { ... } do
+            local str = node.text
+            strs[i] = str
+            node:load_hl(self, self.size, col)
+            col = col + #str
+        end
+        self:newline(table.concat(strs))
     end
 }
 

lua/Trans/view/float.lua

@@ -26,17 +26,26 @@ local function set_title()
     local title = m_window.contents[1]
     local github = '  https://github.com/JuanZoran/Trans.nvim'
 
-    title:center_line(github, '@text.uri')
+    local item = title.item_wrap
 
+    title:addline(
+        title:center(item(github, '@text.uri'))
+    )
+
+    local text = title.text_wrap
+    local format = '%s(%d)'
     for i, engine_ch in ipairs(conf.float.engine) do
         local engine_us = engine_map[engine_ch]
         set_tag_hl(engine_us, 'wait')
 
         local round = engine_us .. 'round'
-        local wrap = title:line_wrap()
+        title:addline(
-        wrap('', round)
+            text(
-        wrap(engine_ch .. '(' .. i .. ')', engine_us)
+                item('', round),
-        wrap('', round)
+                item(format:format(engine_ch, i), engine_us),
+                item('', round)
+            )
+        )
     end
 end
 

lua/Trans/view/hover.lua

@@ -4,32 +4,44 @@ local conf = require('Trans').conf
 local m_window
 local m_result
 local m_content
+-- content utility
+local text
+local item
+
 local m_indent = '    '
 
+
 local title = function(str)
-    local wrapper = m_content:line_wrap()
+    m_content:addline(
-    wrapper('', 'TransTitleRound')
+        text(
-    wrapper(str, 'TransTitle')
+            item('', 'TransTitleRound'),
-    wrapper('', 'TransTitleRound')
+            item(str, 'TransTitle'),
+            item('', 'TransTitleRound')
+        )
+    )
 end
 
 local exist = function(str)
     return str and str ~= ''
 end
 
+
 local process = {
     title = function()
-        local line = m_content:items_wrap()
         local icon = conf.icon
 
-        line.add_item(m_result.word, 'TransWord')
+        m_content:addline(
-
+            m_content:format(
-        line.add_item('[' .. (exist(m_result.phonetic) and m_result.phonetic or icon.notfound) .. ']', 'TransPhonetic')
+                item(m_result.word, 'TransWord'),
-
+                text(
-        line.add_item((exist(m_result.collins) and icon.star:rep(m_result.collins) or icon.notfound), 'TransCollins')
+                    item('['),
-
+                    item(exist(m_result.phonetic) and m_result.phonetic or icon.notfound, 'TransPhonetic'),
-        line.add_item((m_result.oxford == 1 and icon.yes or icon.no))
+                    item(']')
-        line.load()
+                ),
+                item(m_result.collins and icon.star:rep(m_result.collins) or icon.notfound, 'TransCollins'),
+                item(m_result.oxford == 1 and icon.yes or icon.no)
+            )
+        )
     end,
 
     tag = function()
@@ -45,6 +57,7 @@ local process = {
                 toefl = '托福',
                 gre   = 'gre ',
             }
+
             local tags = {}
             local size = 0
             local interval = '    '
@@ -53,14 +66,20 @@ local process = {
                 tags[size] = tag_map[tag]
             end
 
+
             for i = 1, size, 3 do
                 m_content:addline(
-                    m_indent .. tags[i] .. interval .. (tags[i + 1] or '') .. interval .. (tags[i + 2] or ''),
+                    item(
-                    'TransTag'
+                        m_indent ..
+                        tags[i] ..
+                        (tags[i + 1] and interval .. tags[i + 1] ..
+                            (tags[i + 2] and interval .. tags[i + 2] or '') or ''),
+                        'TransTag'
+                    )
                 )
             end
 
-            m_content:addline('')
+            m_content:newline('')
         end
     end,
 
@@ -82,15 +101,13 @@ local process = {
                 t = '不定式标记infm   ',
                 d = '限定词determiner ',
             }
-
             for pos in vim.gsplit(m_result.pos, '/', true) do
                 m_content:addline(
-                    m_indent .. pos_map[pos:sub(1, 1)] .. pos:sub(3) .. '%',
+                    item(m_indent .. pos_map[pos:sub(1, 1)] .. pos:sub(3) .. '%', 'TransPos')
-                    'TransPos'
                 )
             end
 
-            m_content:addline('')
+            m_content:newline('')
         end
     end,
 
@@ -113,12 +130,11 @@ local process = {
 
             for exc in vim.gsplit(m_result.exchange, '/', true) do
                 m_content:addline(
-                    m_indent .. exchange_map[exc:sub(1, 1)] .. interval .. exc:sub(3),
+                    item(m_indent .. exchange_map[exc:sub(1, 1)] .. interval .. exc:sub(3), 'TransExchange')
-                    'TransExchange'
                 )
             end
 
-            m_content:addline('')
+            m_content:newline('')
         end
     end,
 
@@ -127,12 +143,11 @@ local process = {
 
         for trs in vim.gsplit(m_result.translation, '\n', true) do
             m_content:addline(
-                m_indent .. trs,
+                item(m_indent .. trs, 'TransTranslation')
-                'TransTranslation'
             )
         end
 
-        m_content:addline('')
+        m_content:newline('')
     end,
 
     definition = function()
@@ -142,17 +157,19 @@ local process = {
             for def in vim.gsplit(m_result.definition, '\n', true) do
                 def = def:gsub('^%s+', '', 1) -- TODO :判断是否需要分割空格
                 m_content:addline(
-                    m_indent .. def,
+                    item(m_indent .. def, 'TransDefinition')
-                    'TransDefinition'
                 )
             end
 
-            m_content:addline('')
+            m_content:newline('')
         end
     end,
 
     failed = function()
-        m_content:addline(conf.icon.notfound .. m_indent .. '没有找到相关的翻译', 'TransFailed')
+        m_content:addline(
+            item(conf.icon.notfound .. m_indent .. '没有找到相关的翻译', 'TransFailed')
+        )
+
         m_window:set_width(m_content.lines[1]:width())
     end,
 }
@@ -164,10 +181,10 @@ local try_del_keymap = function()
     end
 end
 
+
 local cmd_id
 local pin
 local next
-
 local action
 action = {
     pageup = function()
@@ -266,6 +283,11 @@ return function(word)
     m_window.animation = hover.animation
     m_content = m_window.contents[1]
 
+    if not text then
+        text = m_content.text_wrap
+        item = m_content.item_wrap
+    end
+
     if m_result then
         if hover.auto_play then action.play() end