Merge branch 'experimental'

README.md

@@ -1,6 +1,7 @@
 # Trans.nvim
 
 <!--toc:start-->
+
 - [Trans.nvim](#transnvim)
   - [特点](#特点)
   - [屏幕截图](#屏幕截图)
@@ -14,15 +15,17 @@
   - [感谢](#感谢)
   - [贡献](#贡献)
   - [待办 (画大饼)](#待办-画大饼)
-<!--toc:end-->
-
+  <!--toc:end-->
 
 ## 特点
-- 使用纯lua编写, 速度极快
-> `Lazy.nvim`的记录: <font color="#0099FF">`➜   Trans.nvim 0.82ms`</font>
+
+- 使用纯 lua 编写, 速度极快
+
+  > `Lazy.nvim`的记录: <font color="#0099FF">`➜   Trans.nvim 0.82ms`</font>
 
 - **可以定义快捷键读英文单词**
-> 见wiki
+
+  > 见 wiki
 
 - 大部分功能可以自定义:
   - 高亮
@@ -34,19 +37,20 @@
 - **完全离线** 的单词翻译体验 (可能后面会支持在线翻译)
 - 支持显示:
   - 柯林斯星级
-  - 牛津3000词汇
+  - 牛津 3000 词汇
   - 中文翻译
-  - 英文翻译  (不是英译中, 而是用英文解释)
+  - 英文翻译 (不是英译中, 而是用英文解释)
   - 词根
   - etc
 - 舒服的排版和`动画`
 - 支持 `normal`和 `visual`模式
-    > <font color='#FF9900'>不支持 visual-block mode</font>
-  
+  > <font color='#FF9900'>不支持 visual-block mode</font>
 - 本地词库单词量: `430w`
-  
+
 ## 屏幕截图
+
 ### 演示
+
 https://user-images.githubusercontent.com/107862700/213752097-2eee026a-ddee-4531-bf80-ba2cbc8b44ef.mp4
 
 > 视频演示的在线查询, 查询速度取决于你的网络状况  
@@ -55,22 +59,23 @@ https://user-images.githubusercontent.com/107862700/213752097-2eee026a-ddee-4531
 https://user-images.githubusercontent.com/107862700/215941500-3293c571-20a1-44e2-b202-77079f158ce9.mp4
 
 ### 主题
-> 如果你有更美观或者更适合的配色, 欢迎提PR  
+
+> 如果你有更美观或者更适合的配色, 欢迎提 PR  
 > 主题配色在: `lua/Trans/theme.lua`文件中，你只需要添加你主题的表就可以了
 
-
 - `default`
-![default](./theme/default.png) 
+  ![default](./theme/default.png)
 
 - `dracula`
-![dracula](./theme/dracula.png) 
+  ![dracula](./theme/dracula.png)
 
 - `tokyonight`
-![tokyonight](./theme/tokyonight.png) 
-
+  ![tokyonight](./theme/tokyonight.png)
 
 ## 安装
-*安装之前, 首先需要明确本插件的依赖:*
+
+_安装之前, 首先需要明确本插件的依赖:_
+
 - [ECDICT](https://github.com/skywind3000/ECDICT): 插件所用的离线单词数据库
 - sqlite.lua: 操作数据库所用的库
 - sqlite3: 数据库
@@ -92,13 +97,14 @@ use {
 }
 ```
 
-**如果你想要使用Packer的惰性加载，这里有一个例子**  
+**如果你想要使用 Packer 的惰性加载，这里有一个例子**
+
 ```lua
 use {
     "JuanZoran/Trans.nvim",
     keys = {
         { {'n', 'x'}, 'mm' }, -- 换成其他你想用的key即可
-        { {'n', 'x'}, 'mk' }, 
+        { {'n', 'x'}, 'mk' },
         { 'n', 'mi' },
     },
     run = 'bash ./install.sh', -- 自动下载使用的本地词库
@@ -111,6 +117,7 @@ use {
     end
 }
 ```
+
 </details>
 
 <details>
@@ -133,38 +140,46 @@ use {
         }
     }
 ```
+
 </details>
 
-<font color="#FF9900">**注意事项**: </font>  
+<font color="#FF9900">**注意事项**: </font>
+
 - `install.sh`
-  - 使用了 `wget`下载词库, 安装请确保你的环境变量中存在wget
+
+  - 使用了 `wget`下载词库, 安装请确保你的环境变量中存在 wget
   - install.sh 下载后会自动将词库解压, 并移动到 `$HOME/.vim/dict`文件夹下
   - 目前仅在 `Ubuntu22.04`的环境下测试通过
     > 如果上述条件不符合, 请删掉 `run = 'install.sh'`部分, 考虑手动安装词库
-    > 如果上述条件满足, 仍出现问题, 欢迎在issue里向我反馈,我会及时尝试解决
+    > 如果上述条件满足, 仍出现问题, 欢迎在 issue 里向我反馈,我会及时尝试解决
 
 - 下载词典的过程中, 需要能够 `流畅的访问github下载`
-    > 词库文件压缩包大小为: **281M**
-    > 解压缩后的大小大概为: 1.2G
+
+  > 词库文件压缩包大小为: **281M**
+  > 解压缩后的大小大概为: 1.2G
 
 - 安装后如果不能正常运行, 请尝试检查一下问题:
+
   - 本机是否已经安装了 `sqlite3`
-    > Linux下安装:
+    > Linux 下安装:
     > `sudo pacman -S sqlite # Arch`  
     > `sudo apt-get install sqlite3 libsqlite3-dev # Ubuntu`
-    
+
   > 后续会增加 `healthcheck` 进行检查
 
 - **`auto_play`** 使用步骤:
-    > linux 只需要安装`festival`  
-    > sudo apt-get install festival festvox-kallpc16k  
-    > ***如果你想要设置音色，发音可以访问:*** [Festival官方](https://www.cstr.ed.ac.uk/projects/festival/morevoices.html)  
-    > 可以选择英音、美音、男声、女声
 
-    > 其他操作系统
-    - 需要确保安装了`nodejs`
-    - 进入插件的`tts`目录运行`npm install`
-        > 如果`install.sh`运行正常则自动安装，如果安装失败，请尝试手动安装
+  > linux 只需要安装`festival`  
+  > sudo apt-get install festival festvox-kallpc16k  
+  > **_如果你想要设置音色，发音可以访问:_** [Festival 官方](https://www.cstr.ed.ac.uk/projects/festival/morevoices.html)  
+  > 可以选择英音、美音、男声、女声
+
+  > 其他操作系统
+
+  - 需要确保安装了`nodejs`
+  - 进入插件的`tts`目录运行`npm install`
+    > 如果`install.sh`运行正常则自动安装，如果安装失败，请尝试手动安装
+
 - `title`的配置，只对`neovim 0.9`版本有效
 
 <details>
@@ -174,41 +189,49 @@ use {
     - 用户配置: `~/.festivalrc`
 
 - 更改声音
-    - 在festival的voices文件内建立自己的文件夹
-        > 一般其默认配置目录在`/usr/share/festival/voices`  
 
-        示例:
-        > `sudo mkdir /usr/share/festival/voices/my_voices`
+  - 在 festival 的 voices 文件内建立自己的文件夹
 
-    - 下载想要的voices文件并解压 
-        > 可能需要   
+    > 一般其默认配置目录在`/usr/share/festival/voices`
 
-        - 试听[在这里](https://www.cstr.ed.ac.uk/projects/festival/morevoices.html))
-        - 下载[在这里](http://festvox.org/packed/festival/2.5/voices/))
-        > 假设下载的文件在`Downloads`文件夹, 下载的文件为:`festvox_cmu_us_aew_cg.tar.gz`
+    示例:
 
-        示例:
-        > `cd ~/Downloads && tar -xf festvox_cmu_us_aew_cg.tar.gz`
+    > `sudo mkdir /usr/share/festival/voices/my_voices`
 
-    - 将音频文件拷贝到festival文件夹
-        示例:
-        > `sudo cp -r festival/lib/voices/us/cmu_us_aew_cg/ /usr/share/festival/voices/my_voices/`
+  - 下载想要的 voices 文件并解压
 
-    - 在配置文件中设置默认的声音
-        示例:
-        > 加入`(set! voice_default voice_cmu_indic_hin_ab_cg)`到配置文件
+    > 可能需要 
 
-    - 安装完成
+    - 试听[在这里](https://www.cstr.ed.ac.uk/projects/festival/morevoices.html))
+    - 下载[在这里](http://festvox.org/packed/festival/2.5/voices/))
+      > 假设下载的文件在`Downloads`文件夹, 下载的文件为:`festvox_cmu_us_aew_cg.tar.gz`
+
+    示例:
+
+    > `cd ~/Downloads && tar -xf festvox_cmu_us_aew_cg.tar.gz`
+
+  - 将音频文件拷贝到 festival 文件夹
+    示例:
+
+    > `sudo cp -r festival/lib/voices/us/cmu_us_aew_cg/ /usr/share/festival/voices/my_voices/`
+
+  - 在配置文件中设置默认的声音
+    示例:
+
+    > 加入`(set! voice_default voice_cmu_indic_hin_ab_cg)`到配置文件
+
+  - 安装完成
 
 - 相关说明网站
-    > 可能需要 
-    - [wiki](https://archlinux.org/packages/community/any/festival-us/) 查看更多详细配置
-    - [官方网站](http://festvox.org/dbs/index.html) 
-    - [用户手册](http://www.festvox.org/docs/manual-2.4.0/festival_toc.html) 
+  > 可能需要 
+  - [wiki](https://archlinux.org/packages/community/any/festival-us/) 查看更多详细配置
+  - [官方网站](http://festvox.org/dbs/index.html)
+  - [用户手册](http://www.festvox.org/docs/manual-2.4.0/festival_toc.html)
 
 </details>
 
 ## 配置
+
 ```lua
 require'Trans'.setup {
     view = {
@@ -314,12 +337,15 @@ require'Trans'.setup {
 
     -- TODO :add online translate engine
 }
- 
+
 ```
 
 ## 快捷键绑定
+
 **示例:**
+
 > 示例中展示, 将`mm`映射成快捷键
+
 ```lua
 vim.keymap.set({'n', 'x'}, 'mm', '<Cmd>Translate<CR>')
 vim.keymap.set({'n', 'x'}, 'mk', '<Cmd>TransPlay<CR>') -- 自动发音选中或者光标下的单词
@@ -328,7 +354,9 @@ vim.keymap.set('n', 'mi', '<Cmd>TranslateInput<CR>')
 ```
 
 ## 高亮组
+
 > 默认定义
+
 ```lua
 {
     TransWord = {
@@ -378,23 +406,27 @@ vim.keymap.set('n', 'mi', '<Cmd>TranslateInput<CR>')
 ```
 
 ## 声明
+
 - 本插件词典基于[ECDICT](https://github.com/skywind3000/ECDICT)
 
 ## 感谢
-- [ECDICT](https://github.com/skywind3000/ECDICT)       本地词典的提供
-- [sqlite.lua](https://github.com/kharji/sqlite.lua)    数据库访问
-- [T.vim](https://github.com/sicong-li/T.vim)           灵感来源
+
+- [ECDICT](https://github.com/skywind3000/ECDICT) 本地词典的提供
+- [sqlite.lua](https://github.com/kharji/sqlite.lua) 数据库访问
+- [T.vim](https://github.com/sicong-li/T.vim) 灵感来源
 
 ## 贡献
+
 > 更新比较频繁, 文档先鸽了  
-> 如果你想要参加这个项目, 可以提issue, 我会把文档补齐
+> 如果你想要参加这个项目, 可以提 issue, 我会把文档补齐
 
 ## 待办 (画大饼)
+
 - [x] 多风格样式查询
-- [x] 重新录制屏幕截图示例 
-- [x] 快捷键定义 
-- [x] 自动读音 
+- [x] 重新录制屏幕截图示例
+- [x] 快捷键定义
+- [x] 自动读音
 - [ ] 变量命名的支持
 - [ ] 历史查询结果保存
-- [ ] 在线多引擎异步查询 
-- [ ] `句子翻译` | `中翻英` 的支持 
+- [ ] 在线多引擎异步查询
+- [ ] `句子翻译` | `中翻英` 的支持

install.sh

@@ -2,18 +2,17 @@
 set -e
 
 if test -e "$HOME/.vim/dict/ultimate.db"; then
-    exit
+	exit
 fi
 
-
 mkdir -p "$HOME/.vim/dict"
 
 wget https://github.com/skywind3000/ECDICT-ultimate/releases/download/1.0.0/ecdict-ultimate-sqlite.zip -O /tmp/dict.zip
 
 unzip /tmp/dict.zip -d "$HOME/.vim/dict" && rm -rf /tmp/dict.zip
 
-uNames=`uname -s`
-osName=${uNames: 0: 4}
-if [ "$osName" != "Linux" ];then
-    cd ./tts/ && npm install
+uNames=$(uname -s)
+osName=${uNames:0:4}
+if [ "$osName" != "Linux" ]; then
+	cd ./tts/ && npm install
 fi

lua/Trans/buffer.lua

@@ -0,0 +1,167 @@
+local api, fn = vim.api, vim.fn
+
+---@class buf
+---@field bufnr integer buffer handle
+---@field size integer buffer line count
+local buffer = {}
+
+---Clear all content in buffer
+function buffer:wipe()
+    api.nvim_buf_set_lines(self.bufnr, 0, -1, false, {})
+    self.size = 0
+end
+
+---delete buffer [_start, _end] line content [one index]
+---@param _start integer start line index
+---@param _end integer end line index
+function buffer:del(_start, _end)
+    if not _start then
+        fn.deletebufline(self.bufnr, '$')
+    else
+        _end = _end or _start
+        fn.deletebufline(self.bufnr, _start, _end)
+    end
+    self.size = api.nvim_buf_line_count(self.bufnr)
+end
+
+---Set buffer option
+---@param name string option name
+---@param value any option value
+function buffer:set(name, value)
+    api.nvim_buf_set_option(self.bufnr, name, value)
+end
+
+---get buffer option
+---@param name string option name
+---@return any
+function buffer:option(name)
+    return api.nvim_buf_get_option(self.bufnr, name)
+end
+
+function buffer:delete()
+    api.nvim_buf_delete(self.bufnr, { force = true })
+end
+
+---Set buffer load keymap
+---@param key string
+---@param operation function | string
+function buffer:map(key, operation)
+    vim.keymap.set('n', key, operation, {
+        buffer = self.bufnr,
+        silent = true,
+    })
+end
+
+---Execute normal keycode in this buffer[no recursive]
+---@param key string key code
+function buffer:normal(key)
+    api.nvim_buf_call(self.bufnr, function()
+        vim.cmd([[normal! ]] .. key)
+    end)
+end
+
+---@return boolean
+---@nodiscard
+function buffer:is_valid()
+    return api.nvim_buf_is_valid(self.bufnr)
+end
+
+---Get buffer [i, j] line content
+---@param i integer? start line index
+---@param j integer? end line index
+---@return string[]
+function buffer:lines(i, j)
+    i = i and i - 1 or 0
+    j = j and j - 1 or -1
+    return api.nvim_buf_get_lines(self.bufnr, i, j, false)
+end
+
+---Calculate buffer content display height
+---@param width integer
+---@return integer height
+function buffer:height(width)
+    local size = self.size
+    local lines = self:lines()
+    local height = 0
+    for i = 1, size do
+        height = height + math.max(1, (math.ceil(lines[i]:width() / width)))
+    end
+    return height
+end
+
+---Add|Set line content
+---@param nodes string|table|table[] string -> as line content | table -> as a node | table[] -> as node[]
+---@param index number? line number should be set[one index]
+function buffer:addline(nodes, index)
+    local newsize = self.size + 1
+    assert(index == nil or index <= newsize)
+    index = index or newsize
+    if index == newsize then
+        self.size = newsize
+    end
+
+    if type(nodes) == 'string' then
+        self[index] = nodes
+        return
+    end
+
+
+    local line = index - 1
+    local bufnr = self.bufnr
+    local col = 0
+    if type(nodes[1]) == 'string' then
+        self[index] = nodes[1]
+        nodes:load(bufnr, line, col)
+        return
+    end
+
+
+    local strs = {}
+    local num = #nodes
+    for i = 1, num do
+        strs[i] = nodes[i][1]
+    end
+
+    self[index] = table.concat(strs)
+    for i = 1, num do
+        local node = nodes[i]
+        node:load(bufnr, line, col)
+        col = col + #node[1]
+    end
+end
+
+function buffer:init()
+    self.bufnr = api.nvim_create_buf(false, false)
+    self:set('filetype', 'Trans')
+    self:set('buftype', 'nofile')
+    self.size = 0
+end
+
+---@private
+buffer.__index = function(self, key)
+    local res = buffer[key]
+    if res then
+        return res
+
+    elseif type(key) == 'number' then
+        return fn.getbufoneline(self.bufnr, key)
+
+    else
+        error('invalid key' .. key)
+    end
+end
+
+---@private
+buffer.__newindex = function(self, key, text)
+    assert(key <= self.size + 1)
+    fn.setbufline(self.bufnr, key, text)
+end
+
+---buffer constructor
+---@return buf
+return function()
+    return setmetatable({
+        bufnr = -1,
+        size = 0,
+    }, buffer)
+end

lua/Trans/content.lua

@@ -1,138 +0,0 @@
-local api = vim.api
-
-local content = {
-    newline = function(self, value)
-        local index = self.size + 1
-        self.size = index
-        self.lines[index] = value
-    end,
-
-    newhl = function(self, opt)
-        local index = self.hl_size + 1
-        self.hl_size = index
-        self.highlights[index] = opt
-    end,
-
-    wipe = function(self)
-        local clear = require('table.clear')
-        clear(self.lines)
-        clear(self.highlights)
-        self.size = 0
-        self.hl_size = 0
-    end,
-
-    ---将内容连接上对应的窗口
-    ---@param self table content对象
-    ---@param offset integer 起始行
-    attach = function(self, offset)
-        if self.size == 0 then
-            return
-        end
-
-        offset = offset or 0
-        local win = self.window
-        win:bufset('modifiable', true)
-        --- NOTE : 使用-1 则需要按顺序设置
-        api.nvim_buf_set_lines(win.bufnr, offset, -1, true, self.lines)
-
-        local hl
-        local highlights = self.highlights
-        local method = api.nvim_buf_add_highlight
-        for i = 1, self.hl_size do
-            hl = highlights[i]
-            method(win.bufnr, win.hl, hl.name, offset + hl.line, hl._start, hl._end)
-        end
-        win:bufset('modifiable', false)
-    end,
-
-    actual_height = function(self, wrap)
-        wrap = wrap or self.window:option('wrap')
-        if wrap then
-            local height = 0
-            local width = self.window.width
-            local lines = self.lines
-            for i = 1, self.size do
-                height = height + math.max(1, (math.ceil(lines[i]:width() / width)))
-            end
-            return height
-
-        else
-            return self.size
-        end
-    end,
-
-    format = function(self, opt)
-        local win_width = opt.width or self.window.width
-        local nodes = opt.nodes
-        local size = #nodes
-        assert(size > 1, 'check items size')
-        local tot_width = 0
-        local strs = {}
-        local str
-        for i = 1, size do
-            str = nodes[i].text
-            strs[i] = str
-            tot_width = tot_width + str:width()
-        end
-
-        local space = math.floor(((win_width - tot_width) / (size - 1)))
-        if opt.strict and space < 0 then
-            return false
-        end
-
-        local interval = (' '):rep(space)
-        return {
-            text = table.concat(strs, interval),
-            load_hl = function(_, content, line, col)
-                for _, item in ipairs(nodes) do
-                    item:load_hl(content, line, col)
-                    col = col + #item.text + space
-                end
-            end
-        }
-    end,
-
-    center = function(self, item)
-        local text = item.text
-        local space = bit.rshift(self.window.width - text:width(), 1)
-        item.text = (' '):rep(space) .. text
-        local load_hl = item.load_hl
-        item.load_hl = function(this, content, line, col)
-            load_hl(this, content, line, col + space)
-        end
-        return item
-    end,
-
-    addline = function(self, ...)
-        local strs = {}
-        local col = 0
-        local str
-        local line = self.size -- line is zero index
-
-        for i, node in ipairs { ... } do
-            str = node.text
-            strs[i] = str
-            node:load_hl(self, line, col)
-            col = col + #str
-        end
-        self:newline(table.concat(strs))
-    end
-}
-
-content.__index = content
-
----content的构造函数
----@param window table 链接的窗口
----@return table 构造好的content
-return function(window)
-    vim.validate {
-        window = { window, 't' },
-    }
-    return setmetatable({
-        window = window,
-        size = 0,
-        hl_size = 0,
-        lines = {},
-        highlights = {},
-    }, content)
-end

lua/Trans/init.lua

@@ -1,13 +1,26 @@
 local M = {}
+local api, fn = vim.api, vim.fn
 
-local title = vim.fn.has('nvim-0.9') == 1 and {
+if fn.executable('sqlite3') ~= 1 then
+    error('Please check out sqlite3')
+end
+
+local win_title = fn.has('nvim-0.9') == 1 and {
     { '', 'TransTitleRound' },
     { ' Trans', 'TransTitle' },
     { '', 'TransTitleRound' },
 } or nil
 
+-- local title = {
+--     "████████╗██████╗  █████╗ ███╗   ██╗███████╗",
+--     "╚══██╔══╝██╔══██╗██╔══██╗████╗  ██║██╔════╝",
+--     "   ██║   ██████╔╝███████║██╔██╗ ██║███████╗",
+--     "   ██║   ██╔══██╗██╔══██║██║╚██╗██║╚════██║",
+--     "   ██║   ██║  ██║██║  ██║██║ ╚████║███████║",
+--     "   ╚═╝   ╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═══╝╚══════╝",
+--}
 
-string.width = vim.fn.strwidth
+string.width = api.nvim_strwidth
 string.isEn = function(self)
     local char = { self:byte(1, -1) }
     for i = 1, #self do
@@ -18,17 +31,15 @@ string.isEn = function(self)
     return true
 end
 
-
-string.play = vim.fn.has('linux') == 1 and function(self)
+string.play = fn.has('linux') == 1 and function(self)
     local cmd = ([[echo "%s" | festival --tts]]):format(self)
-    vim.fn.jobstart(cmd)
+    fn.jobstart(cmd)
 end or function(self)
-    local seperator = vim.fn.has('unix') and '/' or '\\'
+    local seperator = fn.has('unix') and '/' or '\\'
     local file = debug.getinfo(1, "S").source:sub(2):match('(.*)lua') .. seperator .. 'tts' .. seperator .. 'say.js'
-    vim.fn.jobstart('node ' .. file .. ' ' .. self)
+    fn.jobstart('node ' .. file .. ' ' .. self)
 end
 
-
 M.conf = {
     view = {
         i = 'float',
@@ -39,7 +50,7 @@ M.conf = {
         width = 37,
         height = 27,
         border = 'rounded',
-        title = title,
+        title = win_title,
         keymap = {
             pageup = '[[',
             pagedown = ']]',
@@ -69,7 +80,7 @@ M.conf = {
         width = 0.8,
         height = 0.8,
         border = 'rounded',
-        title = title,
+        title = win_title,
         keymap = {
             quit = 'q',
         },
@@ -110,8 +121,8 @@ M.conf = {
     -- theme = 'tokyonight',
 
     db_path = '$HOME/.vim/dict/ultimate.db',
-
     engine = {
+        youdao = {},
         -- baidu = {
         --     appid = '',
         --     appPasswd = '',
@@ -121,7 +132,6 @@ M.conf = {
         --     appPasswd = '',
         -- },
     },
-
     -- TODO :
     -- register word
     -- history = {
@@ -147,75 +157,78 @@ M.setup = function(opts)
     end
 
     local engines = {}
+    local i = 1
     for k, _ in pairs(conf.engine) do
-        table.insert(engines, k)
+        engines[i] = k
+        i = i + 1
     end
-    conf.engines = engines
 
+    conf.engines = engines
     times = times + 1
     if times == 1 then
-        local api = vim.api
-
-        local get_mode    = api.nvim_get_mode
-        local set_hl      = api.nvim_set_hl
+        ---@format disable
         local new_command = api.nvim_create_user_command
-
-        if vim.fn.executable('sqlite3') ~= 1 then
-            error('Please check out sqlite3')
-        end
-
-        new_command('Translate', function()
-            M.translate()
-        end, { desc = '  单词翻译', })
-
-        new_command('TranslateInput', function()
-            M.translate('i')
-        end, { desc = '  搜索翻译' })
-
-        new_command('TransPlay', function()
-            local word = M.get_word(get_mode().mode)
+        new_command('Translate'      , function() M.translate()    end, { desc = '  单词翻译',})
+        new_command('TranslateInput' , function() M.translate('i') end, { desc = '  搜索翻译',})
+        new_command('TransPlay'      , function()
+            local word = M.get_word(api.nvim_get_mode().mode)
             if word ~= '' and word:isEn() then
                 word:play()
             end
         end, { desc = ' 自动发音' })
 
-        local hls = require('Trans.ui.theme')[conf.theme]
+
+        local set_hl = api.nvim_set_hl
+        local hls    = require('Trans.ui.theme')[conf.theme]
         for hl, opt in pairs(hls) do
             set_hl(0, hl, opt)
         end
+        ---@format enable
     end
 end
 
 local function get_select()
-    local s_start = vim.fn.getpos("v")
-    local s_end = vim.fn.getpos(".")
-    if s_start[2] > s_end[2] or s_start[3] > s_end[3] then
-        s_start, s_end = s_end, s_start
-    end
+    local _start = fn.getpos("v")
+    local _end = fn.getpos('.')
 
-    local n_lines = math.abs(s_end[2] - s_start[2]) + 1
-    local lines = vim.api.nvim_buf_get_lines(0, s_start[2] - 1, s_end[2], false)
-    lines[1] = string.sub(lines[1], s_start[3], -1)
-    if n_lines == 1 then
-        lines[n_lines] = string.sub(lines[n_lines], 1, s_end[3] - s_start[3] + 1)
-    else
-        lines[n_lines] = string.sub(lines[n_lines], 1, s_end[3])
+    if _start[2] > _end[2] or (_start[3] > _end[3] and _start[2] == _end[2]) then
+        _start, _end = _end, _start
+    end
+    local s_row, s_col = _start[2], _start[3]
+    local e_row, e_col = _end[2], _end[3]
+
+    -- print(s_row, e_row, s_col, e_col)
+    ---@type string
+    ---@diagnostic disable-next-line: assign-type-mismatch
+    local line = fn.getline(e_row)
+    local uidx = vim.str_utfindex(line, math.min(#line, e_col))
+    e_col = vim.str_byteindex(line, uidx)
+
+    if s_row == e_row then
+        return line:sub(s_col, e_col)
+
+    else
+        local lines = fn.getline(s_row, e_row)
+        local i = #lines
+        lines[1] = lines[1]:sub(s_col)
+        lines[i] = line:sub(1, e_col)
+        return table.concat(lines)
     end
-    return table.concat(lines, '')
 end
 
 M.get_word = function(mode)
     local word
     if mode == 'n' then
-        word = vim.fn.expand('<cword>')
+        word = fn.expand('<cword>')
+
     elseif mode == 'v' then
-        vim.api.nvim_input('<ESC>')
+        api.nvim_input('<ESC>')
         word = get_select()
+
     elseif mode == 'i' then
         -- TODO Use Telescope with fuzzy finder
-        vim.ui.input({ prompt = '请输入需要查询的单词: ' }, function(input)
-            word = input
-        end)
+        ---@diagnostic disable-next-line: param-type-mismatch
+        word = fn.input('请输入需要查询的单词:')
     else
         error('invalid mode: ' .. mode)
     end
@@ -229,7 +242,7 @@ M.translate = function(mode, view)
         view = { view, 's', true }
     }
 
-    mode = mode or vim.api.nvim_get_mode().mode
+    mode = mode or api.nvim_get_mode().mode
     view = view or M.conf.view[mode]
     assert(mode and view)
     local word = M.get_word(mode)
@@ -240,7 +253,6 @@ M.translate = function(mode, view)
     end
 end
 
-
-M.augroup = vim.api.nvim_create_augroup('Trans', { clear = true })
+M.ns = api.nvim_create_namespace('Trans')
 
 return M

lua/Trans/node.lua

@@ -1,39 +1,73 @@
--- NOTE : 设置content的node
-local item_load = function(self, content, line, col)
-    if self.hl then
-        content:newhl {
-            name = self.hl,
-            line = line,
-            _start = col,
-            _end = col + #self.text,
-        }
+local api = vim.api
+local ns = require('Trans').ns
+local add_hl = api.nvim_buf_add_highlight
+
+local item_meta = {
+    load = function(self, bufnr, line, col)
+        if self[2] then
+            add_hl(bufnr, ns, self[2], line, col, col + #self[1])
+        end
+    end,
+}
+
+local text_meta = {
+    load = function(self, bufnr, line, col)
+        local items = self.items
+        local step = self.step or ''
+        local len = #step
+
+        for i = 1, self.size do
+            local item = items[i]
+            item:load(bufnr, line, col)
+            col = col + #item[1] + len
+        end
+    end
+}
+
+item_meta.__index = item_meta
+text_meta.__index = function(self, key)
+    local res = text_meta[key]
+    if res then
+        return res
+    elseif key == 1 then
+        return table.concat(self.strs, self.step)
     end
 end
 
 return {
-    item = function(text, hl)
-        return {
-            text = text,
-            hl = hl,
-            load_hl = item_load,
-        }
+    item = function(text, highlight)
+        return setmetatable({
+            [1] = text,
+            [2] = highlight,
+        }, item_meta)
     end,
 
-    text = function(...)
-        local items = { ... }
+    text = function(items)
         local strs = {}
-        for i, item in ipairs(items) do
-            strs[i] = item.text
+        local size = #items
+        assert(size > 1)
+        for i = 1, size do
+            strs[i] = items[i][1]
         end
 
-        return {
-            text = table.concat(strs),
-            load_hl = function(_, content, line, col)
-                for _, item in ipairs(items) do
-                    item:load_hl(content, line, col)
-                    col = col + #item.text
-                end
-            end
-        }
+        return setmetatable({
+            strs  = strs,
+            size  = size,
+            items = items,
+        }, text_meta)
+    end,
+
+    format = function(opts)
+        local text  = opts.text
+        local size  = text.size
+        local width = opts.width
+        local spin  = opts.spin or ' '
+
+        local wid   = text[1]:width()
+        local space = math.max(math.floor((width - wid) / (size - 1)), 0)
+        if space > 0 then
+            text.step = spin:rep(space)
+        end
+        return text
     end,
 }

lua/Trans/query/baidu.lua

@@ -41,19 +41,25 @@ return function(word)
         callback = function(str)
             local ok, res = pcall(vim.json.decode, str)
             if ok and res and res.trans_result then
-                result.value = {
-                    word = word,
+                result[1] = {
+                    title = { word = word },
                     [isEn and 'translation' or 'definition'] = res.trans_result[1].dst,
                 }
 
                 if result.callback then
-                    result.callback(result.value)
+                    result.callback(result[1])
                 end
             else
-                result.value = false
+                result[1] = false
             end
         end,
     })
 
     return result
 end
+
+
+
+-- NOTE :free tts:
+-- https://zj.v.api.aa1.cn/api/baidu-01/?msg=我爱你&choose=0&su=100&yd=5
+-- 选择转音频的人物，女生1 输入0 ｜ 女生2输入：5｜男生1 输入：1｜男生2 输入：2｜男生3 输入：3

lua/Trans/query/offline.lua

@@ -8,7 +8,7 @@ local path = require('Trans').conf.db_path
 local dict = db:open(path)
 
 vim.api.nvim_create_autocmd('VimLeavePre', {
-    group = require("Trans").augroup,
+    once = true,
     callback = function()
         if db:isopen() then
             db:close()
@@ -16,11 +16,10 @@ vim.api.nvim_create_autocmd('VimLeavePre', {
     end
 })
 
+
 return function(word)
-    local res = dict:select('stardict', {
-        where = {
-            word = word,
-        },
+    local res = (dict:select('stardict', {
+        where = { word = word, },
         keys = {
             'word',
             'phonetic',
@@ -33,6 +32,16 @@ return function(word)
             'exchange',
         },
         limit = 1,
-    })
-    return res[1]
+    }))[1]
+
+    if res then
+        res.title = {
+            word = res.word,
+            oxford = res.oxford,
+            collins = res.collins,
+            phonetic = res.phonetic,
+        }
+    end
+
+    return res
 end

lua/Trans/query/youdao.lua

@@ -1,48 +1,74 @@
-local youdao    = require("Trans").conf.engine.youdao
-local appKey    = youdao.appKey
-local appPasswd = youdao.appPasswd
-local uri       = 'https://openapi.youdao.com/api'
-local salt      = tostring(math.random(bit.rshift(1, 5)))
-
-
-local ok, curl = pcall(require, 'plenary.curl')
-if not ok then
-    error('plenary not found')
-end
-
-
-local function get_field(word)
-    local len     = #word
-    local curtime = tostring(os.time())
-    local input   = len > 20 and
-        word:sub(1, 10) .. len .. word:sub(-10) or word
-
-    -- sign=sha256(应用ID+input+salt+curtime+应用密钥)；
-    local hash = appKey .. input .. salt .. curtime .. appPasswd
-    local sign = vim.fn.sha256(hash)
-
-    return {
-        q        = word,
-        from     = 'auto',
-        to       = 'zh-CHS',
-        signType = 'v3',
-        appKey   = appKey,
-        salt     = salt,
-        curtime  = curtime,
-        sign     = sign,
-    }
-end
+local GET = require("Trans.util.curl").GET
 
 return function(word)
-    -- return result
-    local field  = get_field(word)
-    local output = curl.post(uri, {
-        body = field,
-    })
-    if output.exit == 0 and output.status == 200 then
-        local result = vim.fn.json_decode(output.body)
-        if result and result.errorCode == 0 then
-            --- TODO :
+    local isEn = word:isEn()
+    local result = {}
+
+    local uri = ('https://v.api.aa1.cn/api/api-fanyi-yd/index.php?msg=%s&type=%d'):format(word, isEn and 2 or 1)
+    GET(uri, {
+        callback = function(str)
+            local ok, res = pcall(vim.json.decode, str)
+            if not ok or not res or not res.text or isEn and res.text:isEn() then
+                result[1] = false
+                return
+            end
+
+            result[1] = {
+                title = { word = word },
+                [isEn and 'translation' or 'definition'] = res.text,
+            }
+
+            if result.callback then
+                result.callback(result[1])
+            end
         end
-    end
+    })
+
+    return result
 end
+
+-- local youdao    = require("Trans").conf.engine.youdao
+-- local uri       = 'https://openapi.youdao.com/api'
+-- local salt      = tostring(math.random(bit.lshift(1, 15)))
+-- local appid     = youdao.appid
+-- local appPasswd = youdao.appPasswd
+
+-- local post = require('Trans.util.curl').POST
+
+-- local function get_field(word)
+--     -- local to = isEn and 'zh-'
+--     local len     = #word
+--     local curtime = tostring(os.time())
+--     local input   = len > 20 and
+--         word:sub(1, 10) .. len .. word:sub(-10) or word
+
+--     -- sign=sha256(应用ID+input+salt+curtime+应用密钥)；
+--     local hash = appid .. input .. salt .. curtime .. appPasswd
+--     local sign = vim.fn.sha256(hash)
+
+--     return {
+--         q        = word,
+--         from     = 'auto',
+--         to       = 'zh-CHS',
+--         signType = 'v3',
+--         appKey   = appid,
+--         salt     = salt,
+--         curtime  = curtime,
+--         sign     = sign,
+--     }
+-- end
+
+-- return function(word)
+--     -- return result
+--     -- local field  = get_field(word)
+--     -- local output = post(uri, {
+--     --     body = field,
+--     -- })
+
+--     -- if output.exit == 0 and output.status == 200 then
+--     --     local result = vim.fn.json_decode(output.body)
+--     --     if result and result.errorCode == 0 then
+--     --         --- TODO :
+--     --     end
+--     -- end
+-- end

lua/Trans/util/animation.lua

@@ -1,55 +0,0 @@
-local display = function(self)
-    local callback = self.callback or function()
-
-    end
-
-    local target = self.times
-    if self.sync then
-        if target then
-            for i = 1, target do
-                if self.run then
-                    self:frame(i)
-                end
-            end
-
-        else
-            while self.run do
-                self:frame()
-            end
-        end
-
-        callback()
-    else
-        local frame
-        if target then
-            local times = 0
-            frame = function()
-                if self.run and times < target then
-                    times = times + 1
-                    self:frame(times)
-                    vim.defer_fn(frame, self.interval)
-                else
-                    callback()
-                end
-            end
-
-        else
-            frame = function()
-                if self.run then
-                    self:frame()
-                    vim.defer_fn(frame, self.interval)
-                else
-                    callback()
-                end
-            end
-        end
-        frame()
-    end
-end
-
-
-return function(opts)
-    opts.run = true
-    opts.display = display
-    return opts
-end

lua/Trans/util/curl.lua

@@ -12,9 +12,32 @@ local curl = {}
 
 curl.GET = function(uri, opts)
     --- TODO :
+    vim.validate {
+        uri = { uri, 's' },
+        opts = { opts, 't' }
+    }
+    local cmd = {'curl', '-s', ('"%s"'):format(uri)}
+    local callback = opts.callback
+
+    local output = ''
+    local option = {
+        stdin = 'null',
+        on_stdout = function(_, stdout)
+            local str = table.concat(stdout)
+            if str ~= '' then
+                output = output .. str
+            end
+        end,
+        on_exit = function()
+            callback(output)
+        end,
+    }
+
+    vim.fn.jobstart(table.concat(cmd, ' '), option)
 end
 
 
+
 curl.POST = function(uri, opts)
     vim.validate {
         uri = { uri, 's' },
@@ -23,7 +46,7 @@ curl.POST = function(uri, opts)
 
     local callback = opts.callback
 
-    local cmd = { 'curl', '-s', uri }
+    local cmd = { 'curl', '-s', ('"%s"'):format(uri) }
     local size = 3
 
     local function insert(...)
@@ -63,5 +86,4 @@ curl.POST = function(uri, opts)
     vim.fn.jobstart(table.concat(cmd, ' '), option)
 end
 
-
 return curl

lua/Trans/util/display.lua

@@ -0,0 +1,48 @@
+return function(opts)
+    local target = opts.times
+    opts.run = target ~= 0
+
+    ---@type function[]
+    local tasks = {}
+    local function do_task()
+        for _, task in ipairs(tasks) do
+            task()
+        end
+    end
+
+    local frame
+    if target then
+        local times = 0
+        frame = function()
+            if opts.run and times < target then
+                times = times + 1
+                opts:frame(times)
+                vim.defer_fn(frame, opts.interval)
+
+            else
+                do_task()
+            end
+        end
+
+    else
+        frame = function()
+            if opts.run then
+                opts:frame()
+                vim.defer_fn(frame, opts.interval)
+            else
+                do_task()
+            end
+        end
+    end
+    frame()
+
+    ---任务句柄, 如果任务结束了则立即执行, 否则立即执行
+    ---@param task function
+    return function(task)
+        if opts.run then
+            tasks[#tasks + 1] = task
+        else
+            task()
+        end
+    end
+end

lua/Trans/view/float.lua

@@ -1,11 +1,11 @@
+local api = vim.api
 local conf = require('Trans').conf
-local m_window
-local m_result
-local m_content
+local buffer = require('Trans.buffer')()
 
 local node = require("Trans.node")
 local t = node.text
 local it = node.item
+local f = node.format
 
 
 local engine_map = {
@@ -16,102 +16,104 @@ local engine_map = {
 }
 
 local function set_tag_hl(name, status)
-    local hl = conf.float.tag[status]
-    m_window:set_hl(name, {
-        fg = '#000000',
-        bg = hl,
-    })
+    -- local hl = conf.float.tag[status]
+    -- m_window:set_hl(name, {
+    --     fg = '#000000',
+    --     bg = hl,
+    -- })
 
-    m_window:set_hl(name .. 'round', {
-        fg = hl,
-    })
+    -- m_window:set_hl(name .. 'round', {
+    --     fg = hl,
+    -- })
 end
 
 local function set_title()
-    local title = m_window:new_content()
-    local github = '  https://github.com/JuanZoran/Trans.nvim'
+    -- local title = m_window:new_content()
+    -- local github = '  https://github.com/JuanZoran/Trans.nvim'
 
-    title:addline(
-        title:center(it(github, '@text.uri'))
-    )
+    -- title:addline(
+    --     title:center(it(github, '@text.uri'))
+    -- )
 
-    local f = '%s(%d)'
+    -- local f = '%s(%d)'
 
-    local tags = {}
-    local load_tag = function(engine, index)
-        set_tag_hl(engine, 'wait')
-        local round = engine .. 'round'
-        table.insert(tags, t(
-            it('', round),
-            it(f:format(engine_map[engine], index), engine),
-            it('', round)
-        ))
-    end
-    load_tag('offline', 1)
-    title:addline(unpack(tags))
-    title:newline('')
+    -- local tags = {}
+    -- local load_tag = function(engine, index)
+    --     set_tag_hl(engine, 'wait')
+    --     local round = engine .. 'round'
+    --     table.insert(tags, t(
+    --         it('', round),
+    --         it(f:format(engine_map[engine], index), engine),
+    --         it('', round)
+    --     ))
+    -- end
+    -- load_tag('offline', 1)
+    -- title:addline(unpack(tags))
+    -- title:newline('')
 end
 
 local action = {
     quit = function()
-        m_window:try_close()
+        -- m_window:try_close()
     end,
 }
 
-local exist = function (str)
+local exist = function(str)
     return str and str ~= ''
 end
 
 local function process()
     -- TODO :
-    local icon = conf.icon
-    m_content:addline(m_content:format {
-        nodes = {
-            it(m_result.word, 'TransWord'),
-            t(
-                it('['),
-                it(exist(m_result.phonetic) and m_result.phonetic or icon.notfound, 'TransPhonetic'),
-                it(']')
-            ),
-            it(m_result.collins and icon.star:rep(m_result.collins) or icon.notfound, 'TransCollins'),
-            it(m_result.oxford == 1 and icon.yes or icon.no)
-        },
-        width = math.floor(m_window.width * 0.5)
-    })
-    m_content:addline(it('该窗口还属于实验性功能 .... '))
+    -- local icon = conf.icon
+    -- m_content:addline(m_content:format {
+    --     nodes = {
+    --         it(m_result.word, 'TransWord'),
+    --         t(
+    --             it('['),
+    --             it(exist(m_result.phonetic) and m_result.phonetic or icon.notfound, 'TransPhonetic'),
+    --             it(']')
+    --         ),
+    --         it(m_result.collins and icon.star:rep(m_result.collins) or icon.notfound, 'TransCollins'),
+    --         it(m_result.oxford == 1 and icon.yes or icon.no)
+    --     },
+    --     width = math.floor(m_window.width * 0.5)
+    -- })
+    -- m_content:addline(it('该窗口还属于实验性功能 .... '))
 end
 
 return function(word)
     -- TODO :online query
-    local float = conf.float
-    vim.notify('[注意]: float窗口目前还待开发, 如果需要input查询功能, 请将窗口改成hover',
-        vim.log.WARN)
-    local opt = {
-        relative  = 'editor',
-        width     = float.width,
-        height    = float.height,
-        border    = float.border,
-        title     = float.title,
-        animation = float.animation,
-        row       = bit.rshift((vim.o.lines - float.height), 1),
-        col       = bit.rshift((vim.o.columns - float.width), 1),
-        zindex    = 20,
-    }
-    m_window = require('Trans.window')(true, opt)
-    set_title()
-    m_content = m_window:new_content()
-    m_result = require('Trans.query.offline')(word)
-    if m_result then
-        set_tag_hl('offline', 'success')
-        process()
-    else
-        set_tag_hl('offline', 'fail')
-    end
+    -- local float = conf.float
+    vim.notify([[
+[注意]: 
+float窗口目前还待开发
+如果需要input查询功能, 请将窗口改成hover]])
+    -- local opt = {
+    --     relative  = 'editor',
+    --     width     = float.width,
+    --     height    = float.height,
+    --     border    = float.border,
+    --     title     = float.title,
+    --     animation = float.animation,
+    --     row       = bit.rshift((vim.o.lines - float.height), 1),
+    --     col       = bit.rshift((vim.o.columns - float.width), 1),
+    --     zindex    = 20,
+    -- }
+    -- m_window = require('Trans.window')(true, opt)
+    -- set_title()
+    -- m_content = m_window:new_content()
+    -- m_result = require('Trans.query.offline')(word)
+    -- if m_result then
+    --     set_tag_hl('offline', 'success')
+    --     process()
+    -- else
+    --     set_tag_hl('offline', 'fail')
+    -- end
 
-    m_window:open()
-    m_window:bufset('bufhidden', 'wipe')
+    -- m_window:open()
+    -- m_window:bufset('bufhidden', 'wipe')
 
-    for act, key in pairs(float.keymap) do
-        m_window:map(key, action[act])
-    end
+    -- for act, key in pairs(float.keymap) do
+    --     m_window:map(key, action[act])
+    -- end
 end

lua/Trans/view/hover.lua

@@ -1,55 +1,58 @@
 local api = vim.api
 local conf = require('Trans').conf
-local new_window = require('Trans.window')
+local hover = conf.hover
+local buffer = require('Trans.buffer')()
+local error_msg = conf.icon.notfound .. '    没有找到相关的翻译'
 
-local m_window
-local m_result
-local m_content
+local node = require('Trans.node')
+local it, t, f = node.item, node.text, node.format
 
--- content utility
-local node = require("Trans.node")
-local t = node.text
-local it = node.item
+local function handle_result(result)
+    local icon = conf.icon
+    local notfound = icon.notfound
+    local indent = '    '
 
-local m_indent = '    '
+    local word = result.title.word
+    if hover.auto_play then
+        string.play(word:isEn() and word or result.definition)
+    end
 
-local title = function(str)
-    m_content:addline(
-        t(it('', 'TransTitleRound'), it(str, 'TransTitle'), it('', 'TransTitleRound'))
-    )
-end
+    local addtitle = function(title)
+        buffer:addline {
+            it('', 'TransTitleRound'),
+            it(title, 'TransTitle'),
+            it('', 'TransTitleRound'),
+        }
+    end
 
-local exist = function(str)
-    return str and str ~= ''
-end
+    local process = {
+        title = function(title)
+            local oxford   = title.oxford
+            local collins  = title.collins
+            local phonetic = title.phonetic
 
-local process = {
-    title = function()
-        local icon = conf.icon
-        local line
-        if m_result.word:find(' ', 1, true) then
-            line = it(m_result.word, 'TransWord')
+            if not phonetic and not collins and not oxford then
+                buffer:addline(it(word, 'TransWord'))
 
-        else
-            line = m_content:format {
-                nodes = {
-                    it(m_result.word, 'TransWord'),
-                    t(
-                        it('['),
-                        it(exist(m_result.phonetic) and m_result.phonetic or icon.notfound, 'TransPhonetic'),
-                        it(']')
-                    ),
-                    it(m_result.collins and icon.star:rep(m_result.collins) or icon.notfound, 'TransCollins'),
-                    it(m_result.oxford == 1 and icon.yes or icon.no)
-                },
-            }
-        end
-        m_content:addline(line)
-    end,
+            else
+                buffer:addline(f {
+                    width = hover.width,
+                    text = t {
+                        it(word, 'TransWord'),
+                        t {
+                            it('['),
+                            it((phonetic and phonetic ~= '') and phonetic or notfound, 'TransPhonetic'),
+                            it(']')
+                        },
+                        it(collins and icon.star:rep(collins) or notfound, 'TransCollins'),
+                        it(oxford == 1 and icon.yes or icon.no)
+                    },
+                })
+            end
+        end,
 
-    tag = function()
-        if exist(m_result.tag) then
-            title('标签')
+        tag = function(tag)
+            addtitle('标签')
             local tag_map = {
                 zk    = '中考',
                 gk    = '高考',
@@ -64,17 +67,16 @@ local process = {
             local tags = {}
             local size = 0
             local interval = '    '
-            for tag in vim.gsplit(m_result.tag, ' ', true) do
+            for _tag in vim.gsplit(tag, ' ', true) do
                 size = size + 1
-                tags[size] = tag_map[tag]
+                tags[size] = tag_map[_tag]
             end
 
 
             for i = 1, size, 3 do
-                m_content:addline(
+                buffer:addline(
                     it(
-                        m_indent ..
-                        tags[i] ..
+                        indent .. tags[i] ..
                         (tags[i + 1] and interval .. tags[i + 1] ..
                             (tags[i + 2] and interval .. tags[i + 2] or '') or ''),
                         'TransTag'
@@ -82,13 +84,11 @@ local process = {
                 )
             end
 
-            m_content:newline('')
-        end
-    end,
+            buffer:addline('')
+        end,
 
-    pos = function()
-        if exist(m_result.pos) then
-            title('词性')
+        pos = function(pos)
+            addtitle('词性')
             local pos_map = {
                 a = '代词pron         ',
                 c = '连接词conj       ',
@@ -105,20 +105,18 @@ local process = {
                 d = '限定词determiner ',
             }
 
-            local f = '%s %2s%%'
-            for pos in vim.gsplit(m_result.pos, '/', true) do
-                m_content:addline(
-                    it(m_indent .. f:format(pos_map[pos:sub(1, 1)], pos:sub(3)), 'TransPos')
+            local s = '%s %2s%%'
+            for _pos in vim.gsplit(pos, '/', true) do
+                buffer:addline(
+                    it(indent .. s:format(pos_map[_pos:sub(1, 1)], _pos:sub(3)), 'TransPos')
                 )
             end
 
-            m_content:newline('')
-        end
-    end,
+            buffer:addline('')
+        end,
 
-    exchange = function()
-        if exist(m_result.exchange) then
-            title('词形变化')
+        exchange = function(exchange)
+            addtitle('词形变化')
             local exchange_map = {
                 ['p'] = '过去式      ',
                 ['d'] = '过去分词    ',
@@ -132,264 +130,266 @@ local process = {
                 ['f'] = '第三人称单数',
             }
             local interval = '    '
-            for exc in vim.gsplit(m_result.exchange, '/', true) do
-                m_content:addline(
-                    it(m_indent .. exchange_map[exc:sub(1, 1)] .. interval .. exc:sub(3), 'TransExchange')
+            for exc in vim.gsplit(exchange, '/', true) do
+                buffer:addline(
+                    it(indent .. exchange_map[exc:sub(1, 1)] .. interval .. exc:sub(3), 'TransExchange')
                 )
             end
 
-            m_content:newline('')
-        end
-    end,
+            buffer:addline('')
+        end,
 
-    translation = function()
-        if exist(m_result.translation) then
-            title('中文翻译')
+        translation = function(translation)
+            addtitle('中文翻译')
 
-            for trs in vim.gsplit(m_result.translation, '\n', true) do
-                m_content:addline(
-                    it(m_indent .. trs, 'TransTranslation')
+            for trs in vim.gsplit(translation, '\n', true) do
+                buffer:addline(
+                    it(indent .. trs, 'TransTranslation')
                 )
             end
-        end
 
-        m_content:newline('')
-    end,
+            buffer:addline('')
+        end,
 
-    definition = function()
-        if exist(m_result.definition) then
-            title('英文注释')
+        definition = function(definition)
+            addtitle('英文注释')
 
-            for def in vim.gsplit(m_result.definition, '\n', true) do
+            for def in vim.gsplit(definition, '\n', true) do
                 def = def:gsub('^%s+', '', 1) -- TODO :判断是否需要分割空格
-                m_content:addline(
-                    it(m_indent .. def, 'TransDefinition')
+                buffer:addline(
+                    it(indent .. def, 'TransDefinition')
                 )
             end
 
-            m_content:newline('')
+            buffer:addline('')
+        end,
+    }
+
+    buffer:set('modifiable', true)
+    for _, field in ipairs(conf.order) do
+        local value = result[field]
+        if value and value ~= '' then
+            process[field](value)
         end
-    end,
-}
-
-
-local try_del_keymap = function()
-    for _, key in pairs(conf.hover.keymap) do
-        pcall(vim.keymap.del, 'n', key, { buffer = true })
     end
+    buffer:set('modifiable', false)
 end
 
+local function open_window(opts)
+    opts = opts or {}
 
-local cmd_id
-local pin
-local next
-local action
-action = {
-    pageup = function()
-        m_window:normal('gg')
-    end,
+    local col      = opts.col or 1
+    local row      = opts.row or 1
+    local width    = opts.width or hover.width
+    local height   = opts.height or hover.height
+    local relative = opts.relative or 'cursor'
 
-    pagedown = function()
-        m_window:normal('G')
-    end,
+    return require('Trans.window') {
+        col       = col,
+        row       = row,
+        buf       = buffer,
+        relative  = relative,
+        width     = width,
+        height    = height,
+        title     = hover.title,
+        border    = hover.border,
+        animation = hover.animation,
+        ns        = require('Trans').ns,
+    }
+end
 
-    pin = function()
-        if pin then
-            error('too many window')
+local function handle_keymap(win, word)
+    local keymap = hover.keymap
+    local cur_buf = api.nvim_get_current_buf()
+    local del = vim.keymap.del
+    local function try_del_keymap()
+        for _, key in pairs(keymap) do
+            pcall(del, 'n', key)
         end
-        pcall(api.nvim_del_autocmd, cmd_id)
+    end
 
-        m_window:try_close {
-            callback = function()
-                m_window:reopen {
-                    win_opt = {
-                        relative = 'editor',
-                        row = 1,
-                        col = vim.o.columns - m_window.width - 3,
-                    },
-                    opt = {
-                        callback = function()
-                            m_window:bufset('bufhidden', 'wipe')
-                            m_window:set('wrap', true)
-                        end
-                    },
+    local lock = false
+    local cmd_id
+    local next
+    local action = {
+        pageup = function()
+            buffer:normal('gg')
+        end,
+
+        pagedown = function()
+            buffer:normal('G')
+        end,
+
+        pin = function()
+            if lock then
+                error('请先关闭窗口')
+            else
+                lock = true
+            end
+            pcall(api.nvim_del_autocmd, cmd_id)
+            local width, height = win.width, win.height
+            local col = vim.o.columns - width - 3
+            local buf = buffer.bufnr
+            local run = win:try_close()
+            run(function()
+                local w, r = open_window {
+                    width = width,
+                    height = height,
+                    relative = 'editor',
+                    col = col,
                 }
 
-                vim.keymap.del('n', conf.hover.keymap.pin, { buffer = true })
-                --- NOTE : 只允许存在一个pin窗口
-                local buf = m_window.bufnr
-                pin = true
-                local toggle = conf.hover.keymap.toggle_entry
-                if toggle then
-                    next = m_window.winid
-                    vim.keymap.set('n', toggle, action.toggle_entry, { silent = true, buffer = buf })
-                end
+                next = w.winid
+                win = w
+                r(function()
+                    w:set('wrap', true)
+                end)
 
+                del('n', keymap.pin)
                 api.nvim_create_autocmd('BufWipeOut', {
                     callback = function(opt)
-                        if opt.buf == buf then
-                            pin = false
+                        if opt.buf == buf or opt.buf == cur_buf then
+                            lock = false
                             api.nvim_del_autocmd(opt.id)
                         end
                     end
                 })
-            end
-        }
-    end,
-
-    close = function()
-        pcall(api.nvim_del_autocmd, cmd_id)
-        m_window:try_close { wipeout = true }
-        try_del_keymap()
-    end,
-
-    toggle_entry = function()
-        if pin and m_window:is_open() then
-            local prev = api.nvim_get_current_win()
-            api.nvim_set_current_win(next)
-            next = prev
-        else
-            vim.keymap.del('n', conf.hover.keymap.toggle_entry, { buffer = true })
-        end
-    end,
-
-    play = function()
-        m_result.word:play()
-    end,
-}
-
-
-local function handle()
-    local hover = conf.hover
-    if m_result.translation and hover.auto_play then
-        local ok = pcall(action.play)
-        if not ok then
-            vim.notify('自动发音失败， 请检查README发音部分', vim.log.WARN)
-        end
-    end
-
-    for _, field in ipairs(conf.order) do
-        process[field]()
-    end
-
-    for act, key in pairs(hover.keymap) do
-        vim.keymap.set('n', key, action[act], { buffer = true, silent = true })
-    end
-end
-
-local function online_query(word)
-    local lists = {}
-    local engines = conf.engines
-    local size = #engines
-    local icon = conf.icon
-    local error_msg = icon.notfound .. '    没有找到相关的翻译'
-    m_window:set_height(1)
-    local origin_width = m_window.width
-    m_window:set_width(error_msg:width())
-
-    if size == 0 then
-        m_content:addline(it(error_msg, 'TransFailed'))
-        m_window:open()
-        return
-    else
-        m_window:open()
-        for i = 1, size do
-            lists[size] = require('Trans.query.' .. engines[i])(word)
-        end
-    end
-
-    local cell = icon.cell
-    local spinner = require('Trans.ui.spinner')[conf.hover.spinner]
-    local range = #spinner
-
-    local timeout = conf.hover.timeout
-    local interval = math.floor(timeout / (m_window.width - spinner[1]:width()))
-    local width = m_window.width
-
-    local f = '%s %s'
-    require('Trans.util.animation')({
-        times = width,
-        interval = interval,
-        frame = function(self, times)
-            m_content:wipe()
-            for i, v in ipairs(lists) do
-                local res = v.value
-                if res then
-                    m_result = res
-                    m_window:set_width(origin_width)
-                    handle()
-                    m_content:attach()
-
-                    m_window.height = m_content:actual_height(true)
-                    m_window:open {
-                        animation = 'fold',
-                    }
-
-                    self.run = false
-                    return
-
-                elseif res == false then
-                    table.remove(lists, i)
-                    size = size - 1
-                end
-            end
-
-            local line
-            if size == 0 or times == width then
-                line = it(error_msg, 'TransFailed')
-                self.run = false
-            else
-                line = it(f:format(spinner[times % range + 1], cell:rep(times)), 'MoreMsg')
-            end
-
-            m_content:addline(line)
-            m_content:attach()
+            end)
         end,
-    }):display()
-end
 
-return function(word)
-    vim.validate {
-        word = { word, 's' },
+        close = function()
+            pcall(api.nvim_del_autocmd, cmd_id)
+            local run = win:try_close()
+            run(function()
+                buffer:delete()
+            end)
+            try_del_keymap()
+        end,
+
+        toggle_entry = function()
+            if lock and win:is_valid() then
+                local prev = api.nvim_get_current_win()
+                api.nvim_set_current_win(next)
+                next = prev
+            else
+                del('n', keymap.toggle_entry)
+            end
+        end,
+
+        play = function()
+            if word then
+                word:play()
+            end
+        end,
     }
-
-    local hover = conf.hover
-    m_window = new_window(false, {
-        relative  = 'cursor',
-        width     = hover.width,
-        height    = hover.height,
-        title     = hover.title,
-        border    = hover.border,
-        animation = hover.animation,
-        col       = 1,
-        row       = 1,
-    })
-
-    m_window:set('wrap', true)
-    m_content = m_window:new_content()
-
-    m_result = require('Trans.query.offline')(word)
-    if m_result then
-        handle()
-        local height = m_content:actual_height(true)
-        if height < m_window.height then
-            m_window:set_height(height)
-        end
-        m_window:open()
-    else
-        online_query(word)
+    local set = vim.keymap.set
+    for act, key in pairs(hover.keymap) do
+        set('n', key, action[act])
     end
 
-    -- Auto Close
     if hover.auto_close_events then
         cmd_id = api.nvim_create_autocmd(
             hover.auto_close_events, {
             buffer = 0,
-            callback = function()
-                m_window:try_close { wipeout = true }
-                try_del_keymap()
-                api.nvim_del_autocmd(cmd_id)
-            end,
+            callback = action.close,
         })
     end
 end
+
+local function online_query(win, word)
+    local lists = {
+        remove = table.remove
+    }
+    local engines = conf.engines
+    local size = #engines
+    local icon = conf.icon
+    local error_line = it(error_msg, 'TransFailed')
+    if size == 0 then
+        buffer:addline(error_line)
+        return
+    end
+
+    for i = 1, size do
+        lists[i] = require('Trans.query.' .. engines[i])(word)
+    end
+    local cell      = icon.cell
+    local timeout   = hover.timeout
+    local spinner   = require('Trans.ui.spinner')[hover.spinner]
+    local range     = #spinner
+    local interval  = math.floor(timeout / (win.width - spinner[1]:width()))
+    local win_width = win.width
+
+    local s = '%s %s'
+    local width, height = hover.width, hover.height
+    local function waitting_result(this, times)
+        for i = 1, size do
+            local res = lists[i][1]
+            if res then
+                buffer:wipe()
+                win:set_width(width)
+                handle_result(res)
+                height = math.min(height, buffer:height(width))
+
+                win:expand {
+                    field = 'height',
+                    target = height,
+                }
+                this.run = false
+                return
+            elseif res == false then
+                lists:remove(i)
+                size = size - 1
+            end
+        end
+
+        if size == 0 or times == win_width then
+            buffer:addline(error_line, 1)
+            this.run = false
+        else
+            buffer:addline(it(s:format(spinner[times % range + 1], cell:rep(times)), 'MoreMsg'), 1)
+        end
+    end
+
+    buffer:set('modifiable', true)
+    local run = require('Trans.util.display') {
+        times = win_width,
+        interval = interval,
+        frame = waitting_result,
+    }
+
+    run(function()
+        buffer:set('modifiable', false)
+    end)
+end
+
+---处理不同hover模式的窗口
+---@param word string 待查询的单词
+return function(word)
+    buffer:init()
+    local result = require('Trans.query.offline')(word)
+
+    if result then
+        handle_result(result)
+        local width = hover.width
+        local win, run = open_window {
+            width = width,
+            height = math.min(buffer:height(width), hover.height)
+        }
+        run(function()
+            win:set('wrap', true)
+            handle_keymap(win, word)
+        end)
+
+    else
+        local win, run = open_window {
+            width = error_msg:width(),
+            height = 1,
+        }
+
+        run(function()
+            win:set('wrap', true)
+            handle_keymap(win, word)
+            online_query(win, word)
+        end)
+    end
+end

lua/Trans/window.lua

@@ -1,248 +1,221 @@
 local api = vim.api
-local new_content = require('Trans.content')
-local new_animation = require('Trans.util.animation')
+local display = require('Trans.util.display')
 
-local busy = false
-local function lock()
-    while busy do
+---@class win
+---@field winid integer window handle
+---@field width integer
+---@field height integer
+---@field ns integer namespace for highlight
+---@field animation table window animation
+---@field buf buf buffer for attached
+local window = {}
+
+---Change window attached buffer
+---@param buf buf
+function window:set_buf(buf)
+    api.nvim_win_set_buf(self.winid, buf.bufnr)
+    self.buf = buf
+end
+
+---Check window valid
+---@return boolean
+function window:is_valid()
+    return api.nvim_win_is_valid(self.winid)
+end
+
+---Set window option
+---@param option string option name
+---@param value any
+function window:set(option, value)
+    api.nvim_win_set_option(self.winid, option, value)
+end
+
+---@param name string option name
+---@return any
+function window:option(name)
+    return api.nvim_win_get_option(self.winid, name)
+end
+
+---@param height integer
+function window:set_height(height)
+    api.nvim_win_set_height(self.winid, height)
+    self.height = height
+end
+
+---@param width integer
+function window:set_width(width)
+    api.nvim_win_set_width(self.winid, width)
+    self.width = width
+end
+
+---Expand window [width | height] value
+---@param opts table 窗口的配置
+---|'field'string [width | height]
+---|'target'integer
+---@return function
+function window:expand(opts)
+    self:lock()
+    local field  = opts.field
+    local target = opts.target
+    local cur    = self[field]
+    local times  = math.abs(target - cur)
+
+    local wrap = self:option('wrap')
+    self:set('wrap', false)
+    local interval = opts.interval or self.animation.interval
+    local method = api['nvim_win_set_' .. field]
+
+    local winid = self.winid
+    local frame = target > cur and function(_, cur_times)
+        method(winid, cur + cur_times)
+    end or function(_, cur_times)
+        method(winid, cur - cur_times)
+    end
+
+    local run = display {
+        times    = times,
+        frame    = frame,
+        interval = interval,
+    }
+
+    run(function()
+        self:set('wrap', wrap)
+        self[field] = target
+        self:unlock()
+    end)
+    return run
+end
+
+---Close window
+---@return function run run until close done
+function window:try_close()
+    local field = ({
+        slid = 'width',
+        fold = 'height',
+    })[self.animation.close]
+
+    --- 播放动画
+    local run = self:expand {
+        field = field,
+        target = 1,
+    }
+    run(function()
+        api.nvim_win_close(self.winid, true)
+    end)
+    return run
+end
+
+---lock window [open | close] operation
+function window:lock()
+    while self.busy do
         vim.wait(50)
     end
-    busy = true
+    self.busy = true
 end
 
----@class window
----@field winid integer 窗口的handle
----@field bufnr integer 窗口对应buffer的handle
----@field width integer 窗口当前的宽度
----@field height integer 窗口当前的高度
----@field hl integer 窗口highlight的namespace
----@field contents table[] 窗口内容的对象数组
+function window:unlock()
+    self.busy = false
+end
 
----@type window
-local window = {
-    set = function(self, option, value)
-        api.nvim_win_set_option(self.winid, option, value)
-    end,
+---设置窗口本地的高亮组
+---@param name string 高亮组的名称
+---@param opts table 高亮选项
+function window:set_hl(name, opts)
+    api.nvim_set_hl(self.ns, name, opts)
+end
 
-    set_height = function(self, height)
-        api.nvim_win_set_height(self.winid, height)
-        self.height = height
-    end,
-
-    set_width = function(self, width)
-        api.nvim_win_set_width(self.winid, width)
-        self.width = width
-    end,
-
-    bufset = function(self, option, value)
-        api.nvim_buf_set_option(self.bufnr, option, value)
-    end,
-
-    ---@nodiscard
-    option = function(self, name)
-        return api.nvim_win_get_option(self.winid, name)
-    end,
-
-    map = function(self, key, operation)
-        vim.keymap.set('n', key, operation, {
-            buffer = self.bufnr,
-            silent = true,
-        })
-    end,
-
-    ---@nodiscard
-    is_open = function(self)
-        return api.nvim_win_is_valid(self.winid)
-    end,
-
-    normal = function(self, key)
-        api.nvim_buf_call(self.bufnr, function()
-            vim.cmd([[normal! ]] .. key)
-        end)
-    end,
-
-    draw = function(self)
-        local offset = 0
-        for _, content in ipairs(self.contents) do
-            content:attach(offset)
-            offset = offset + content.size
-        end
-    end,
-
-    open = function(self, opts)
-        self:draw()
-        local wrap = self:option('wrap')
-        self:set('wrap', false)
-        opts            = opts or {}
-        local animation = opts.animation or self.animation.open
-        local callback  = function()
-            busy = false
-            self:set('wrap', wrap)
-            if opts.callback then
-                opts.callback()
-            end
-        end
-
-        lock()
-        if animation then
-            local interval = self.animation.interval
-            local field = ({
-                fold = 'height',
-                slid = 'width',
-            })[animation]
-
-            local method = api['nvim_win_set_' .. field]
-            local winid = self.winid
-            new_animation({
-                interval = interval,
-                times = self[field],
-                frame = function(_, times)
-                    method(winid, times)
-                end,
-                callback = callback,
-            }):display()
-
-        else
-            callback()
-        end
-    end,
-
-    ---安全的关闭窗口
-    try_close = function(self, opts)
-        opts = opts or {}
-        self:set('wrap', false)
-
-        if self:is_open() then
-            local callback = function()
-                api.nvim_win_close(self.winid, true)
-                self.winid = -1
-                busy = false
-                if opts.callback then
-                    opts.callback()
-                end
-                if api.nvim_buf_is_valid(self.bufnr) and opts.wipeout then
-                    api.nvim_buf_delete(self.bufnr, { force = true })
-                    self.bufnr = -1
-                end
-            end
-
-            lock()
-            self.config = api.nvim_win_get_config(self.winid)
-            local animation = self.animation.close
-            if animation then
-                local interval = self.animation.interval
-                local field = ({
-                    fold = 'height',
-                    slid = 'width',
-                })[animation]
-
-                local target = self[field]
-                local method = api['nvim_win_set_' .. field]
-                local winid = self.winid
-                new_animation({
-                    times = target,
-                    frame = function(_, times)
-                        method(winid, target - times)
-                    end,
-                    callback = callback,
-                    interval = interval,
-                }):display()
-
-            else
-                callback()
-            end
-        end
-    end,
-
-    reopen = function(self, opts)
-        assert(self.bufnr ~= -1)
-        local entry   = opts.entry or false
-        local win_opt = opts.win_opt or {}
-        local opt     = opts.opt
-
-        self.config.win = nil
-        for k, v in pairs(win_opt) do
-            self.config[k] = v
-        end
-
-        self.winid = api.nvim_open_win(self.bufnr, entry, self.config)
-        self:open(opt)
-    end,
-
-    set_hl = function(self, name, opts)
-        api.nvim_set_hl(self.hl, name, opts)
-    end,
-
-    new_content = function(self)
-        local index = self.size + 1
-        self.size = index
-        self.contents[index] = new_content(self)
-
-        return self.contents[index]
-    end,
-}
+---buffer:addline() helper function
+---@param node table
+---@return table node formatted node
+function window:center(node)
+    local text = node[1]
+    local width = text:width()
+    local win_width = self.width
+    local space = math.max(math.floor((win_width - width) / 2), 0)
+    node[1] = (' '):rep(space) .. text
+    return node
+end
 
+---@private
 window.__index = window
 
+---@class win_opts
+---@field buf buf buffer for attached
+---@field height integer
+---@field width integer
+---@field col integer
+---@field row integer
+---@field border string
+---@field title string | nil | table
+---@field relative string
+---@field ns integer namespace for highlight
+---@field zindex? integer
+---@field enter? boolean cursor should [enter] window
+---@field animation table window animation
 
+---window constructor
+---@param opts win_opts
+---@return table
+---@return function
+return function(opts)
+    assert(type(opts) == 'table')
+    local ns        = opts.ns
+    local buf       = opts.buf
+    local col       = opts.col
+    local row       = opts.row
+    local title     = opts.title
+    local width     = opts.width
+    local enter     = opts.enter or false
+    local height    = opts.height
+    local border    = opts.border
+    local zindex    = opts.zindex
+    local relative  = opts.relative
+    local animation = opts.animation
 
----窗口对象的构造器
----@param entry boolean 光标初始化时是否应该进入窗口
----@param option table 需要设置的选项
----@return window win
----@nodiscard
-return function(entry, option)
-    vim.validate {
-        entry = { entry, 'b' },
-        option = { option, 't' },
-    }
+    local open = animation.open
 
-    local opt = {
-        relative = option.relative,
-        width    = option.width,
-        height   = option.height,
-        border   = option.border,
-        title    = option.title,
-        col      = option.col,
-        row      = option.row,
+    local field = ({
+        slid = 'width',
+        fold = 'height',
+    })[open]
 
+    local win_opt = {
         title_pos = nil,
         focusable = false,
-        zindex    = option.zindex or 100,
         style     = 'minimal',
+        zindex    = zindex,
+        width     = width,
+        height    = height,
+        col       = col,
+        row       = row,
+        border    = border,
+        title     = title,
+        relative  = relative,
     }
 
-    if opt.title then
-        opt.title_pos = 'center'
+    if field then
+        win_opt[field] = 1
     end
 
-    local bufnr = api.nvim_create_buf(false, true)
-    local ok, winid = pcall(api.nvim_open_win, bufnr, entry, opt)
-    if not ok then
-        error('open window faild: ' .. vim.inspect(opt))
+    if win_opt.title then
+        win_opt.title_pos = 'center'
     end
 
-    local win
-    win = {
-        winid     = winid,
-        bufnr     = bufnr,
-        width     = opt.width,
-        height    = opt.height,
-        animation = option.animation,
-        hl        = api.nvim_create_namespace('TransWinHl'),
-        size      = 0,
-        contents  = {}
-    }
+    local win = setmetatable({
+        buf       = buf,
+        ns        = ns,
+        height    = win_opt.height,
+        width     = win_opt.width,
+        animation = animation,
+        winid     = api.nvim_open_win(buf.bufnr, enter, win_opt),
+    }, window)
 
-    ---@diagnostic disable-next-line: param-type-mismatch
-    setmetatable(win, window)
-
-
-    win:bufset('filetype', 'Trans')
-    win:bufset('buftype', 'nofile')
-    api.nvim_win_set_hl_ns(win.winid, win.hl)
+    api.nvim_win_set_hl_ns(win.winid, win.ns)
     win:set_hl('Normal', { link = 'TransWin' })
     win:set_hl('FloatBorder', { link = 'TransBorder' })
-    ---@diagnostic disable-next-line: return-type-mismatch
-    return win
+
+    return win, win:expand {
+        field = field,
+        target = opts[field],
+    }
 end