From 273fb8d2c1af31acc8964b0dbf0b225432745fd2 Mon Sep 17 00:00:00 2001
From: JuanZoran <1430359574@qq.com>
Date: Sat, 14 Jan 2023 14:22:25 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86wrap?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/Trans/core/action.lua    | 15 ++++++---
 lua/Trans/core/content.lua   | 61 +++++++++++++++++-------------------
 lua/Trans/core/handler.lua   | 15 ++++-----
 lua/Trans/core/init.lua      |  2 +-
 lua/Trans/core/window.lua    | 55 ++++++++++++++++----------------
 lua/Trans/init.lua           | 10 +++---
 lua/Trans/setup.lua          |  4 +++
 lua/Trans/util/init.lua      | 18 +++++++++++
 lua/Trans/util/test/test.lua | 17 ++++++++--
 9 files changed, 118 insertions(+), 79 deletions(-)
 create mode 100644 lua/Trans/util/init.lua

diff --git a/lua/Trans/core/action.lua b/lua/Trans/core/action.lua
index 497193d..f3617d8 100644
--- a/lua/Trans/core/action.lua
+++ b/lua/Trans/core/action.lua
@@ -1,18 +1,23 @@
-
 local function feedkey(mode, key)
     vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, false, true), mode, false)
 end
 
+local util = require('Trans.util')
 
 local M = {
-    pageup = function (bufnr)
-        return function ()
-            vim.api.nvim_buf_call(bufnr, function ()
+    pageup = function(bufnr, winid)
+        local top = math.min(10, util.get_height(bufnr, winid) - vim.api.nvim_win_get_height(winid) + 1)
+        return function()
+            vim.api.nvim_buf_call(bufnr, function()
                 -- TODO :
+                vim.cmd([[normal!]] .. top .. 'zt')
+                -- vim.cmd([[normal!]] .. 'G')
+                -- vim.api.nvim_command("noautocmd silent! normal! " .. vim.wo.scroll .. "zt")
+                -- vim.cmd([[do WinScrolled]])
             end)
         end
     end,
-    pagedown = function ()
+    pagedown = function()
         feedkey('n', '<C-d>')
     end
 }
diff --git a/lua/Trans/core/content.lua b/lua/Trans/core/content.lua
index 791fcf5..8d8b797 100644
--- a/lua/Trans/core/content.lua
+++ b/lua/Trans/core/content.lua
@@ -1,7 +1,7 @@
 local M = {}
 M.__index = M
 
-M.get_width = vim.fn.strdisplaywidth
+M.get_width = vim.fn.strwidth
 -- local get_width = vim.fn.strwidth
 -- local get_width = vim.api.nvim_strwidth
 
@@ -75,7 +75,7 @@ function M:alloc_items()
                     table.insert(self.highlights[self.len], {
                         name = items[index][2],
                         _start = _start,
-                        _end = _end
+                        _end = _end,
                     })
                 end
                 value = value .. items[index][1]
@@ -92,30 +92,28 @@ function M:alloc_items()
     }
 end
 
-function M:alloc_text()
-    local value = ''
-    return {
-        add_text = function(text, highlight)
-            if highlight then
-                local _start = #value
-                local _end = _start + #text
-                table.insert(self.highlights[self.len + 1], {
-                    name = highlight,
-                    _start = _start,
-                    _end = _end,
-                })
-            end
-            value = value .. text
-        end,
-        load = function ()
-            self.len = self.len + 1
-            self.lines[self.len] = value
+---返回新行的包装函数
+---@return function
+function M:text_wrapper()
+    local l = self.len + 1 -- 取出当前行
+    self.lines[l] = ''
+    self.len = l
+    return function(text, highlight)
+        if highlight then
+            local _start = #self.lines[l]
+            local _end = _start + #text
+            table.insert(self.highlights[l], {
+                name = highlight,
+                _start = _start,
+                _end = _end,
+            })
         end
-    }
+        self.lines[l] = self.lines[l] .. text
+    end
 end
 
-
 function M:addline(text, highlight)
+    assert(text, 'empty text')
     self.len = self.len + 1
     if highlight then
         table.insert(self.highlights[self.len], {
@@ -127,11 +125,11 @@ function M:addline(text, highlight)
     self.lines[self.len] = text
 end
 
--- 窗口宽度
 function M:new(width)
     vim.validate {
         width = { width, 'n' }
     }
+
     local default = (' '):rep(width) -- default value is empty line
     local new_content = {
         width = width,
@@ -142,7 +140,6 @@ function M:new(width)
                 return tbl[key]
             end
         }),
-
     }
 
     new_content.lines = setmetatable({}, {
@@ -152,17 +149,17 @@ function M:new(width)
         end,
 
         __newindex = function(tbl, key, value)
-            if value then
-                for _ = new_content.len + 1, key - 1 do
-                    rawset(tbl, key, '')
-                end
-
-                rawset(tbl, key, value)
-                new_content.len = key
+            assert(value, 'add no value as new line')
+            for i = new_content.len + 1, key - 1 do
+                rawset(tbl, i, '')
             end
+            rawset(tbl, key, value)
+
+            new_content.len = key
         end
     })
-    return setmetatable(new_content, self)
+
+    return setmetatable(new_content, M)
 end
 
 return M
diff --git a/lua/Trans/core/handler.lua b/lua/Trans/core/handler.lua
index 67a1807..15b480b 100644
--- a/lua/Trans/core/handler.lua
+++ b/lua/Trans/core/handler.lua
@@ -55,11 +55,10 @@ local function exist(res)
 end
 
 local function expl(c, text)
-    local t = c:alloc_text()
-    t.add_text('', 'TransTitleRound')
-    t.add_text(text, 'TransTitle')
-    t.add_text('', 'TransTitleRound')
-    t.load()
+    local wrapper = c:text_wrapper()
+    wrapper('', 'TransTitleRound')
+    wrapper(text, 'TransTitle')
+    wrapper('', 'TransTitleRound')
 end
 
 local indent = '    '
@@ -134,14 +133,16 @@ M.hover = {
             expl(content, '英文注释')
 
             vim.tbl_map(function(def)
-                content:addline(def, 'TransDefinition')
+                def = def:gsub('%s+', '', 1)
+                content:addline(indent .. def, 'TransDefinition')
             end, vim.split(indent .. result.definition, '\n', { plain = true, trimempry = true }))
 
             content:addline('')
         end
     end,
+
     failed = function(content)
-        content:addline(icon.notfound .. indent .. '没有找到相关的翻译')
+        content:addline(icon.notfound .. indent .. '没有找到相关的翻译', 'TransNotFound')
     end,
 }
 
diff --git a/lua/Trans/core/init.lua b/lua/Trans/core/init.lua
index 062747f..20b3ba1 100644
--- a/lua/Trans/core/init.lua
+++ b/lua/Trans/core/init.lua
@@ -26,7 +26,7 @@ M.translate = function(method, view)
     local word
     if method == 'input' then
         ---@diagnostic disable-next-line: param-type-mismatch
-        word = vim.fn.input('请输入您要查询的单词:') -- TODO Use Telescope with fuzzy finder
+        word = vim.fn.input('请输入您要查询的单词: ') -- TODO Use Telescope with fuzzy finder
     elseif method == 'n' then
         word = vim.fn.expand('<cword>')
     elseif method == 'v' then
diff --git a/lua/Trans/core/window.lua b/lua/Trans/core/window.lua
index 2c436bb..5580f54 100644
--- a/lua/Trans/core/window.lua
+++ b/lua/Trans/core/window.lua
@@ -1,11 +1,12 @@
-local M    = {}
-local api  = vim.api
-local conf = require('Trans').conf
+local M      = {}
+local api    = vim.api
+local conf   = require('Trans').conf
 local action = require('Trans.core.action')
+local util   = require('Trans.util')
 
-M.id       = 0
-M.bufnr    = 0
-M.ns       = api.nvim_create_namespace('Trans')
+M.id    = 0
+M.bufnr = 0
+M.ns    = api.nvim_create_namespace('Trans')
 
 
 function M.init(view)
@@ -25,9 +26,9 @@ function M.init(view)
         style     = 'minimal',
         border    = conf.window.border,
         title     = {
-            {'', 'TransTitleRound'},
-            {'Trans', 'TransTitle'},
-            {'', 'TransTitleRound'},
+            { '', 'TransTitleRound' },
+            { 'Trans', 'TransTitle' },
+            { '', 'TransTitleRound' },
         },
         title_pos = 'center',
         focusable = true,
@@ -57,20 +58,21 @@ M.draw = function(content)
         end
     end
 
-    local len = #content.lines
-    if M.height > len then
-        api.nvim_win_set_height(M.id, len)
-    end
-    if len == 1 then
-        api.nvim_win_set_width(M.id, content.get_width(content.lines[1]))
-    end
-
-
     api.nvim_buf_set_option(M.bufnr, 'modifiable', false)
     api.nvim_buf_set_option(M.bufnr, 'filetype', 'Trans')
     api.nvim_win_set_option(M.id, 'wrap', not M.float)
     api.nvim_win_set_option(M.id, 'winhl', ('Normal:Trans%sWin,FloatBorder:Trans%sBorder'):format(M.view, M.view))
 
+    local height = util.get_height(M.bufnr, M.id)
+    if M.height > height then
+        api.nvim_win_set_height(M.id, height)
+    end
+
+    if height == 1 then
+        api.nvim_win_set_width(M.id, content.get_width(content.lines[1]))
+    end
+
+
     if M.float then
         vim.keymap.set('n', 'q', function()
             if api.nvim_win_is_valid(M.id) then
@@ -82,6 +84,8 @@ M.draw = function(content)
         -- TODO : set keymaps for window
         M.auto_close()
     end
+
+    M['load_' .. M.view .. '_keymap']()
 end
 
 
@@ -100,15 +104,12 @@ M.auto_close = function()
 end
 
 
--- M.load_keymap = function (once)
---     local keymap = conf.keymap[M.view]
---     local function warp(func)
---         return func or function ()
---             vim.api.nvim_get_keymap(' th')
---         end
---     end
---
--- end
+M.load_hover_keymap = function()
+    local keymap = conf.keymap[M.view]
+    for act, key in pairs(keymap) do
+        vim.keymap.set('n', key, action[act](M.bufnr, M.id))
+    end
+end
 
 
 return M
diff --git a/lua/Trans/init.lua b/lua/Trans/init.lua
index 24f66e7..ec2966f 100644
--- a/lua/Trans/init.lua
+++ b/lua/Trans/init.lua
@@ -10,7 +10,7 @@ M.conf = {
         border = 'rounded',
         hover = {
             width = 36,
-            height = 23,
+            height = 30,
         },
         float = {
             width = 0.8,
@@ -49,11 +49,11 @@ M.conf = {
     --     -- TODO
     --     'offline',
     -- }
-    map = {
+    keymap = {
         -- TODO
         hover = {
-            pageup = '<C-u>',
-            pagedown = '<C-d>',
+            pageup = ']]',
+            -- pagedown = '<C-d>',
         },
     },
     -- history = {
@@ -82,7 +82,7 @@ M.setup = function(opts)
     window.float.height = math.floor((vim.o.lines - vim.o.cmdheight - 1) * window.float.height)
     window.float.width = math.floor(vim.o.columns * window.float.width)
 
-    -- TODO : replace the height and width for float options
+
     M.translate = require('Trans.core').translate
     require("Trans.setup")
 end
diff --git a/lua/Trans/setup.lua b/lua/Trans/setup.lua
index 2aa9b7f..f74c45e 100644
--- a/lua/Trans/setup.lua
+++ b/lua/Trans/setup.lua
@@ -24,6 +24,7 @@ local highlights = {
     TransTitle = {
         fg = '#0f0f15',
         bg = '#75beff',
+        bold = true,
     },
     TransTitleRound = {
         fg = '#75beff',
@@ -53,6 +54,9 @@ local highlights = {
         fg = '#faf743',
         bold = true,
     },
+    TransNotFound = {
+        fg = '#7aa89f',
+    },
 }
 
 -- TODO
diff --git a/lua/Trans/util/init.lua b/lua/Trans/util/init.lua
new file mode 100644
index 0000000..c0461c3
--- /dev/null
+++ b/lua/Trans/util/init.lua
@@ -0,0 +1,18 @@
+local function get_height(bufnr, winid)
+    if not vim.wo[winid].wrap then
+        return vim.api.nvim_buf_line_count(bufnr)
+    end
+
+    local width = vim.api.nvim_win_get_width(winid)
+
+    local lines = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
+    local height = 0
+    for i = 1, #lines do
+        height = height + math.max(1, (math.ceil(vim.fn.strwidth(lines[i]) / width)))
+    end
+    return height
+end
+
+return {
+    get_height = get_height,
+}
diff --git a/lua/Trans/util/test/test.lua b/lua/Trans/util/test/test.lua
index cc11b32..fd1be57 100644
--- a/lua/Trans/util/test/test.lua
+++ b/lua/Trans/util/test/test.lua
@@ -1,10 +1,23 @@
 -- 记录开始时间
 local starttime = os.clock(); --> os.clock()用法
 
-for i = 1, 10, 2 do
-    print(i)
+local function pw(str)
+    -- local res = vim.fn.strdisplaywidth(str)
+    local res = vim.fn.strwidth(str)
+    print(res)
 end
 
+pw('n. either extremity of something that has length')
+pw('n.the point in time at which something ends')
+pw('n.the concluding parts of an event or occurrence')
+pw('n.a final part or section')
+-- 48
+-- 43
+-- 48
+-- 25
+
+
+
 
 -- 记录结束时间
 local endtime = os.clock(); --> os.clock()用法

From 8f0aae8b772fc761a4b72c4633253122251fe8d2 Mon Sep 17 00:00:00 2001
From: JuanZoran <1430359574@qq.com>
Date: Sat, 14 Jan 2023 17:16:49 +0800
Subject: [PATCH 2/9] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BA=86Translat?=
 =?UTF-8?q?eLast=20=E6=9F=A5=E7=9C=8B=E4=B8=8A=E4=B8=80=E6=AC=A1=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=B0=E5=BD=95,=20=E8=BF=98=E6=9C=89?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/Trans/core/action.lua    | 33 +++++++------
 lua/Trans/core/content.lua   | 22 +++++----
 lua/Trans/core/handler.lua   |  1 -
 lua/Trans/core/init.lua      |  7 +--
 lua/Trans/core/window.lua    | 91 ++++++++++++++++++------------------
 lua/Trans/init.lua           | 21 +++++----
 lua/Trans/setup.lua          |  9 ++--
 lua/Trans/util/test/test.lua | 21 ++-------
 8 files changed, 98 insertions(+), 107 deletions(-)

diff --git a/lua/Trans/core/action.lua b/lua/Trans/core/action.lua
index f3617d8..d3ad71b 100644
--- a/lua/Trans/core/action.lua
+++ b/lua/Trans/core/action.lua
@@ -1,26 +1,25 @@
-local function feedkey(mode, key)
-    vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, false, true), mode, false)
+-- local util = require('Trans.util')
+local bufnr = require('Trans.core.window').bufnr
+-- local winid = require('Trans.core.window').id
+local api = vim.api
+local function buf_feedkey(key)
+    if bufnr and api.nvim_buf_is_valid(bufnr) then
+        api.nvim_buf_call(bufnr, function()
+            vim.cmd([[normal! ]] .. key)
+        end)
+        return true
+    else
+        return false
+    end
 end
 
-local util = require('Trans.util')
-
 local M = {
-    pageup = function(bufnr, winid)
-        local top = math.min(10, util.get_height(bufnr, winid) - vim.api.nvim_win_get_height(winid) + 1)
-        return function()
-            vim.api.nvim_buf_call(bufnr, function()
-                -- TODO :
-                vim.cmd([[normal!]] .. top .. 'zt')
-                -- vim.cmd([[normal!]] .. 'G')
-                -- vim.api.nvim_command("noautocmd silent! normal! " .. vim.wo.scroll .. "zt")
-                -- vim.cmd([[do WinScrolled]])
-            end)
-        end
+    pageup = function()
+        return buf_feedkey('gg')
     end,
     pagedown = function()
-        feedkey('n', '<C-d>')
+        return buf_feedkey('G')
     end
 }
 
-
 return M
diff --git a/lua/Trans/core/content.lua b/lua/Trans/core/content.lua
index 8d8b797..1abdce3 100644
--- a/lua/Trans/core/content.lua
+++ b/lua/Trans/core/content.lua
@@ -1,9 +1,8 @@
 local M = {}
 M.__index = M
 
+
 M.get_width = vim.fn.strwidth
--- local get_width = vim.fn.strwidth
--- local get_width = vim.api.nvim_strwidth
 
 ---@alias block table add_hl(key, hl_name)
 ---返回分配的块状区域, e_col 设置为-1则为末尾
@@ -52,32 +51,31 @@ end
 
 function M:alloc_items()
     local items = {}
-    local len = 0
-    local size = 0
+    local width = 0 -- 所有item的总width
+    local size  = 0 -- item数目
     return {
         add_item = function(item, highlight)
             size = size + 1
             local wid = self.get_width(item)
             items[size] = { item, highlight }
-            len = len + wid
+            width = width + wid
         end,
 
         load = function()
             self.len = self.len + 1
-            local space = math.floor((self.width - len) / (size - 1))
+            local space = math.floor((self.width - width) / (size - 1))
             assert(space > 0)
             local interval = (' '):rep(space)
             local value = ''
             local function load_item(index)
                 if items[index][2] then
-                    local _start = #value
-                    local _end = _start + #items[index][1]
                     table.insert(self.highlights[self.len], {
                         name = items[index][2],
-                        _start = _start,
-                        _end = _end,
+                        _start = #value,
+                        _end = #value + #items[index][1],
                     })
                 end
+
                 value = value .. items[index][1]
             end
 
@@ -162,4 +160,8 @@ function M:new(width)
     return setmetatable(new_content, M)
 end
 
+function M:clear()
+    require('table.clear')(self)
+end
+
 return M
diff --git a/lua/Trans/core/handler.lua b/lua/Trans/core/handler.lua
index 15b480b..18951bd 100644
--- a/lua/Trans/core/handler.lua
+++ b/lua/Trans/core/handler.lua
@@ -127,7 +127,6 @@ M.hover = {
         content:addline('')
     end,
 
-
     definition = function(result, content)
         if exist(result.definition) then
             expl(content, '英文注释')
diff --git a/lua/Trans/core/init.lua b/lua/Trans/core/init.lua
index 20b3ba1..848f69d 100644
--- a/lua/Trans/core/init.lua
+++ b/lua/Trans/core/init.lua
@@ -24,16 +24,17 @@ M.translate = function(method, view)
     method = method or vim.api.nvim_get_mode().mode
     view = view or conf.view[method]
     local word
-    if method == 'input' then
+    if method == 'v' then
         ---@diagnostic disable-next-line: param-type-mismatch
         word = vim.fn.input('请输入您要查询的单词: ') -- TODO Use Telescope with fuzzy finder
     elseif method == 'n' then
         word = vim.fn.expand('<cword>')
-    elseif method == 'v' then
+    elseif method == 'input' then
         word = get_select()
+    elseif method == 'last' then
+        return win.show()
     end
 
-
     win.init(view)
     local result = api.query('offline', word)
     local content = c:new(win.width)
diff --git a/lua/Trans/core/window.lua b/lua/Trans/core/window.lua
index 5580f54..f4be1c8 100644
--- a/lua/Trans/core/window.lua
+++ b/lua/Trans/core/window.lua
@@ -1,12 +1,11 @@
-local M      = {}
-local api    = vim.api
-local conf   = require('Trans').conf
-local action = require('Trans.core.action')
-local util   = require('Trans.util')
+local M    = {}
+local api  = vim.api
+local conf = require('Trans').conf
+local util = require('Trans.util')
 
 M.id    = 0
-M.bufnr = 0
 M.ns    = api.nvim_create_namespace('Trans')
+M.bufnr = api.nvim_create_buf(false, true)
 
 
 function M.init(view)
@@ -15,19 +14,19 @@ function M.init(view)
     }
 
     M.view = view
-    M.float = view == 'float'
+    local is_float = view == 'float'
     M.height = conf.window[view].height
     M.width = conf.window[view].width
 
     local opts = {
-        relative  = M.float and 'editor' or 'cursor',
+        relative  = is_float and 'editor' or 'cursor',
         width     = M.width,
         height    = M.height,
         style     = 'minimal',
         border    = conf.window.border,
         title     = {
             { '', 'TransTitleRound' },
-            { 'Trans', 'TransTitle' },
+            { conf.icon.title .. ' Trans', 'TransTitle' },
             { '', 'TransTitleRound' },
         },
         title_pos = 'center',
@@ -35,7 +34,7 @@ function M.init(view)
         zindex    = 100,
     }
 
-    if M.float then
+    if is_float then
         opts.row = math.floor((vim.o.lines - M.height) / 2)
         opts.col = math.floor((vim.o.columns - M.width) / 2)
     else
@@ -43,13 +42,13 @@ function M.init(view)
         opts.col = 2
     end
 
-    M.bufnr = api.nvim_create_buf(false, true)
     M.id = api.nvim_open_win(M.bufnr, M.float, opts)
 end
 
 M.draw = function(content)
-    api.nvim_buf_set_lines(M.bufnr, 0, -1, false, content.lines)
+    api.nvim_buf_set_option(M.bufnr, 'modifiable', true)
 
+    api.nvim_buf_set_lines(M.bufnr, 0, -1, false, content.lines)
     if content.highlights then
         for l, _hl in pairs(content.highlights) do
             for _, hl in ipairs(_hl) do
@@ -57,39 +56,34 @@ M.draw = function(content)
             end
         end
     end
-
-    api.nvim_buf_set_option(M.bufnr, 'modifiable', false)
-    api.nvim_buf_set_option(M.bufnr, 'filetype', 'Trans')
-    api.nvim_win_set_option(M.id, 'wrap', not M.float)
-    api.nvim_win_set_option(M.id, 'winhl', ('Normal:Trans%sWin,FloatBorder:Trans%sBorder'):format(M.view, M.view))
-
-    local height = util.get_height(M.bufnr, M.id)
-    if M.height > height then
-        api.nvim_win_set_height(M.id, height)
-    end
-
-    if height == 1 then
+    M.load_opts()
+    if content.len == 1 then
         api.nvim_win_set_width(M.id, content.get_width(content.lines[1]))
     end
-
-
-    if M.float then
-        vim.keymap.set('n', 'q', function()
-            if api.nvim_win_is_valid(M.id) then
-                api.nvim_win_close(M.id, true)
-            end
-        end, { buffer = M.bufnr, silent = true })
-
-    else
-        -- TODO : set keymaps for window
-        M.auto_close()
-    end
-
-    M['load_' .. M.view .. '_keymap']()
 end
 
 
-M.auto_close = function()
+M.load_opts = function()
+    api.nvim_buf_set_option(M.bufnr, 'modifiable', false)
+    api.nvim_buf_set_option(M.bufnr, 'filetype', 'Trans')
+    api.nvim_win_set_option(M.id, 'winhl', ('Normal:Trans%sWin,FloatBorder:Trans%sBorder'):format(M.view, M.view))
+    local height = util.get_height(M.bufnr, M.id)
+    M['load_' .. M.view .. '_opts']()
+
+    if M.height > height then
+        api.nvim_win_set_height(M.id, height)
+    end
+end
+
+
+M.load_hover_opts = function()
+    local keymap = conf.keymap[M.view]
+    local action = require('Trans.core.action')
+
+    for act, key in pairs(keymap) do
+        vim.keymap.set('n', key, action[act])
+    end
+
     api.nvim_create_autocmd(
         { 'InsertEnter', 'CursorMoved', 'BufLeave', }, {
         buffer = 0,
@@ -100,15 +94,22 @@ M.auto_close = function()
             end
         end,
     })
+    api.nvim_win_set_option(M.id, 'wrap', not M.float)
+end
+
+M.load_float_opts = function()
+    vim.keymap.set('n', 'q', function()
+        if api.nvim_win_is_valid(M.id) then
+            api.nvim_win_close(M.id, true)
+        end
+    end, { buffer = M.bufnr, silent = true })
 
 end
 
 
-M.load_hover_keymap = function()
-    local keymap = conf.keymap[M.view]
-    for act, key in pairs(keymap) do
-        vim.keymap.set('n', key, action[act](M.bufnr, M.id))
-    end
+M.show = function()
+    M.init(M.view or 'float')
+    M.load_opts()
 end
 
 
diff --git a/lua/Trans/init.lua b/lua/Trans/init.lua
index ec2966f..ee0e2ab 100644
--- a/lua/Trans/init.lua
+++ b/lua/Trans/init.lua
@@ -2,7 +2,7 @@ local M = {}
 
 M.conf = {
     view = {
-        input = 'hover',
+        input = 'float',
         n = 'hover',
         v = 'hover',
     },
@@ -10,7 +10,7 @@ M.conf = {
         border = 'rounded',
         hover = {
             width = 36,
-            height = 30,
+            height = 26,
         },
         float = {
             width = 0.8,
@@ -34,14 +34,15 @@ M.conf = {
         -- },
     },
     icon = {
+        title = ' ',
         star = '',
-        notfound = '',
-        yes = '',
-        no = ''
+        -- notfound = '',
+        -- yes = '',
+        -- no = ''
         -- star = '⭐',
-        -- notfound = '❔',
-        -- yes = '✔️',
-        -- no = '❌'
+        notfound = '❔',
+        yes = '✔️',
+        no = '❌'
     },
     db_path = '$HOME/.vim/dict/ultimate.db',
     -- TODO :
@@ -52,8 +53,8 @@ M.conf = {
     keymap = {
         -- TODO
         hover = {
-            pageup = ']]',
-            -- pagedown = '<C-d>',
+            pageup = '[[',
+            pagedown = ']]',
         },
     },
     -- history = {
diff --git a/lua/Trans/setup.lua b/lua/Trans/setup.lua
index f74c45e..a95fc31 100644
--- a/lua/Trans/setup.lua
+++ b/lua/Trans/setup.lua
@@ -12,6 +12,10 @@ vim.api.nvim_create_user_command('TranslateInput', function()
     require("Trans").translate('input')
 end, { desc = '  搜索翻译' })
 
+vim.api.nvim_create_user_command('TranslateLast', function()
+    require("Trans").translate('last')
+end, { desc = '  显示上一次查询的内容' })
+
 
 local highlights = {
     TransWord = {
@@ -59,11 +63,6 @@ local highlights = {
     },
 }
 
--- TODO
--- vim.api.nvim_create_user_command('TranslateHistory', require("Trans.core").query_input, {
---     desc = '翻译输入的单词',
--- })
-
 for highlight, opt in pairs(highlights) do
     vim.api.nvim_set_hl(0, highlight, opt)
 end
diff --git a/lua/Trans/util/test/test.lua b/lua/Trans/util/test/test.lua
index fd1be57..8d5e8ff 100644
--- a/lua/Trans/util/test/test.lua
+++ b/lua/Trans/util/test/test.lua
@@ -1,24 +1,13 @@
 -- 记录开始时间
 local starttime = os.clock(); --> os.clock()用法
 
-local function pw(str)
-    -- local res = vim.fn.strdisplaywidth(str)
-    local res = vim.fn.strwidth(str)
-    print(res)
+local str = 'test'
+local len = #str
+
+for i = 1, 100000000 do
+    local size = len
 end
 
-pw('n. either extremity of something that has length')
-pw('n.the point in time at which something ends')
-pw('n.the concluding parts of an event or occurrence')
-pw('n.a final part or section')
--- 48
--- 43
--- 48
--- 25
-
-
-
-
 -- 记录结束时间
 local endtime = os.clock(); --> os.clock()用法
 print(string.format("end time   : %.4f", endtime));

From 549e10f02971586fef3f175cde630495e42a4e35 Mon Sep 17 00:00:00 2001
From: JuanZoran <1430359574@qq.com>
Date: Sat, 14 Jan 2023 19:35:13 +0800
Subject: [PATCH 3/9] =?UTF-8?q?chore:=20=E6=94=B9=E5=8F=98=E4=BA=86?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=87=BD=E6=95=B0=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/Trans/core/content.lua |  2 +-
 lua/Trans/core/handler.lua | 49 ++++++++++++++++++++++++++++++++++++++
 lua/Trans/core/init.lua    | 48 +++++++++++++++++--------------------
 lua/Trans/core/window.lua  | 18 +++++++-------
 lua/Trans/setup.lua        |  4 ++--
 5 files changed, 82 insertions(+), 39 deletions(-)

diff --git a/lua/Trans/core/content.lua b/lua/Trans/core/content.lua
index 1abdce3..c9e3a33 100644
--- a/lua/Trans/core/content.lua
+++ b/lua/Trans/core/content.lua
@@ -1,9 +1,9 @@
 local M = {}
 M.__index = M
 
-
 M.get_width = vim.fn.strwidth
 
+
 ---@alias block table add_hl(key, hl_name)
 ---返回分配的块状区域, e_col 设置为-1则为末尾
 ---@param s_row integer 起始行
diff --git a/lua/Trans/core/handler.lua b/lua/Trans/core/handler.lua
index 18951bd..68d2182 100644
--- a/lua/Trans/core/handler.lua
+++ b/lua/Trans/core/handler.lua
@@ -145,4 +145,53 @@ M.hover = {
     end,
 }
 
+M.process = function(view, result)
+    local conf = require('Trans').conf
+    local content = require('Trans.core.content'):new(conf.window[view].width)
+    if result then
+        if view == 'hover' then
+            vim.tbl_map(function(handle)
+                M.hover[handle](result, content)
+            end, conf.order)
+
+        elseif view == 'float' then
+            -- TODO :
+
+        else
+            error('unknown view ' .. view)
+        end
+    else
+        M[view].failed(content)
+    end
+    return content
+end
+
+
+
+--- TODO :Content Handler for float view
+M.float = {
+    title = function(result, content)
+
+    end,
+    tag = function(result, content)
+
+    end,
+    pos = function(result, content)
+
+    end,
+    exchange = function(result, content)
+
+    end,
+    translation = function(result, content)
+
+    end,
+    definition = function(result, content)
+
+    end,
+    faild = function(result, content)
+
+    end,
+}
+
+
 return M
diff --git a/lua/Trans/core/init.lua b/lua/Trans/core/init.lua
index 848f69d..3346288 100644
--- a/lua/Trans/core/init.lua
+++ b/lua/Trans/core/init.lua
@@ -3,7 +3,6 @@ local conf = require('Trans').conf
 local api = require('Trans.api')
 local win = require('Trans.core.window')
 local handler = require('Trans.core.handler')
-local c = require('Trans.core.content')
 
 
 local function get_select()
@@ -20,35 +19,32 @@ local function get_select()
     return table.concat(lines, '')
 end
 
+local function get_word(method)
+    if method == 'n' then
+        return vim.fn.expand('<cword>')
+    elseif method == 'v' then
+        return get_select()
+    elseif method == 'input' then
+        -- TODO Use Telescope with fuzzy finder
+        ---@diagnostic disable-next-line: param-type-mismatch
+        return vim.fn.input('请输入您要查询的单词: ')
+    elseif method == 'last' then
+        return win.show()
+    else
+        error('unknown method' .. method)
+    end
+end
+
 M.translate = function(method, view)
     method = method or vim.api.nvim_get_mode().mode
     view = view or conf.view[method]
-    local word
-    if method == 'v' then
-        ---@diagnostic disable-next-line: param-type-mismatch
-        word = vim.fn.input('请输入您要查询的单词: ') -- TODO Use Telescope with fuzzy finder
-    elseif method == 'n' then
-        word = vim.fn.expand('<cword>')
-    elseif method == 'input' then
-        word = get_select()
-    elseif method == 'last' then
-        return win.show()
+    local word = get_word(method)
+    if word then
+        win.init(view)
+        local result = api.query('offline', word)
+        local content = handler.process(view, result)
+        win.draw(content)
     end
-
-    win.init(view)
-    local result = api.query('offline', word)
-    local content = c:new(win.width)
-    local hd = handler[view]
-
-    if result then
-        for i = 1, #conf.order do
-            hd[conf.order[i]](result, content)
-        end
-
-    else
-        hd.failed(content)
-    end
-    win.draw(content)
 end
 
 
diff --git a/lua/Trans/core/window.lua b/lua/Trans/core/window.lua
index f4be1c8..7ecee19 100644
--- a/lua/Trans/core/window.lua
+++ b/lua/Trans/core/window.lua
@@ -42,7 +42,7 @@ function M.init(view)
         opts.col = 2
     end
 
-    M.id = api.nvim_open_win(M.bufnr, M.float, opts)
+    M.id = api.nvim_open_win(M.bufnr, is_float, opts)
 end
 
 M.draw = function(content)
@@ -57,22 +57,15 @@ M.draw = function(content)
         end
     end
     M.load_opts()
-    if content.len == 1 then
-        api.nvim_win_set_width(M.id, content.get_width(content.lines[1]))
-    end
 end
 
 
 M.load_opts = function()
     api.nvim_buf_set_option(M.bufnr, 'modifiable', false)
     api.nvim_buf_set_option(M.bufnr, 'filetype', 'Trans')
-    api.nvim_win_set_option(M.id, 'winhl', ('Normal:Trans%sWin,FloatBorder:Trans%sBorder'):format(M.view, M.view))
-    local height = util.get_height(M.bufnr, M.id)
+    api.nvim_win_set_option(M.id, 'winhl', 'Normal:TransWin,FloatBorder:TransBorder')
     M['load_' .. M.view .. '_opts']()
 
-    if M.height > height then
-        api.nvim_win_set_height(M.id, height)
-    end
 end
 
 
@@ -94,7 +87,12 @@ M.load_hover_opts = function()
             end
         end,
     })
-    api.nvim_win_set_option(M.id, 'wrap', not M.float)
+    api.nvim_win_set_option(M.id, 'wrap', M.view ~= 'float')
+
+    local height = util.get_height(M.bufnr, M.id)
+    if M.height > height then
+        api.nvim_win_set_height(M.id, height)
+    end
 end
 
 M.load_float_opts = function()
diff --git a/lua/Trans/setup.lua b/lua/Trans/setup.lua
index a95fc31..ccd5c62 100644
--- a/lua/Trans/setup.lua
+++ b/lua/Trans/setup.lua
@@ -48,10 +48,10 @@ local highlights = {
     TransDefinition = {
         link = 'Moremsg',
     },
-    TransHoverWin = {
+    TransWin = {
         link = 'Normal',
     },
-    TransHoverBorder = {
+    TransBorder = {
         link = 'FloatBorder',
     },
     TransCollins = {

From 0a2d05af700f218a6d5d557eef1894af9f42af81 Mon Sep 17 00:00:00 2001
From: JuanZoran <1430359574@qq.com>
Date: Sat, 14 Jan 2023 21:30:56 +0800
Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=8F=8D?=
 =?UTF-8?q?=E5=90=91=E9=80=89=E6=8B=A9=EF=BC=8C=E4=BD=8D=E7=BD=AE=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/Trans/core/handler.lua | 1 +
 lua/Trans/core/init.lua    | 5 +++++
 lua/Trans/core/window.lua  | 5 +++++
 lua/Trans/init.lua         | 2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lua/Trans/core/handler.lua b/lua/Trans/core/handler.lua
index 68d2182..e95e3d9 100644
--- a/lua/Trans/core/handler.lua
+++ b/lua/Trans/core/handler.lua
@@ -1,3 +1,4 @@
+---@diagnostic disable: unused-local
 local M = {}
 local icon = require('Trans').conf.icon
 
diff --git a/lua/Trans/core/init.lua b/lua/Trans/core/init.lua
index 3346288..5f83335 100644
--- a/lua/Trans/core/init.lua
+++ b/lua/Trans/core/init.lua
@@ -8,6 +8,10 @@ local handler = require('Trans.core.handler')
 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 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)
@@ -35,6 +39,7 @@ local function get_word(method)
     end
 end
 
+
 M.translate = function(method, view)
     method = method or vim.api.nvim_get_mode().mode
     view = view or conf.view[method]
diff --git a/lua/Trans/core/window.lua b/lua/Trans/core/window.lua
index 7ecee19..52d26c6 100644
--- a/lua/Trans/core/window.lua
+++ b/lua/Trans/core/window.lua
@@ -102,6 +102,11 @@ M.load_float_opts = function()
         end
     end, { buffer = M.bufnr, silent = true })
 
+    vim.keymap.set('n', '<Esc>', function()
+        if api.nvim_win_is_valid(M.id) then
+            api.nvim_win_close(M.id, true)
+        end
+    end, { buffer = M.bufnr, silent = true })
 end
 
 
diff --git a/lua/Trans/init.lua b/lua/Trans/init.lua
index ee0e2ab..ca3b821 100644
--- a/lua/Trans/init.lua
+++ b/lua/Trans/init.lua
@@ -34,7 +34,7 @@ M.conf = {
         -- },
     },
     icon = {
-        title = ' ',
+        title = ' ', -- 
         star = '',
         -- notfound = '',
         -- yes = '',

From 0a645c39883235970ee0f24b762a47f0ffebda3b Mon Sep 17 00:00:00 2001
From: JuanZoran <1430359574@qq.com>
Date: Sat, 14 Jan 2023 23:38:39 +0800
Subject: [PATCH 5/9] test: add more online engine support

---
 .gitignore                           |   1 +
 lua/Trans/README.md                  |  49 +++
 lua/Trans/util/md5.lua               | 431 +++++++++++++++++++++++++++
 lua/Trans/util/test/format.lua       | 188 ------------
 lua/Trans/util/test/is_Chinese.lua   |  15 -
 lua/Trans/util/test/query_youdao.lua |  71 -----
 lua/Trans/util/test/test.lua         |  14 -
 7 files changed, 481 insertions(+), 288 deletions(-)
 create mode 100644 lua/Trans/util/md5.lua
 delete mode 100644 lua/Trans/util/test/format.lua
 delete mode 100644 lua/Trans/util/test/is_Chinese.lua
 delete mode 100644 lua/Trans/util/test/query_youdao.lua
 delete mode 100644 lua/Trans/util/test/test.lua

diff --git a/.gitignore b/.gitignore
index e69de29..461fa1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+lua/Trans/util/test/
diff --git a/lua/Trans/README.md b/lua/Trans/README.md
index 8faec8a..6e02658 100644
--- a/lua/Trans/README.md
+++ b/lua/Trans/README.md
@@ -56,3 +56,52 @@ sentenceBold	text	将查询内容加粗的例句
 translation	text	例句翻译
 wfs	text	单词形式变化
 exam_type	text	考试类型
+
+## 百度
+from	string	源语言	返回用户指定的语言，或者自动检测出的语种（源语言设为auto时）
+to	string	目标语言	返回用户指定的目标语言
+trans_result	array	翻译结果	返回翻译结果，包括src和dst字段
+trans_result.*.src	string	原文	接入举例中的“apple”
+trans_result.*dst	string	译文	接入举例中的“苹果”
+error_code	integer	错误码	仅当出现错误时显示
+以下字段仅开通了词典、tts用户可见
+src_tts	string	原文tts链接	mp3格式，暂时无法指定发音
+dst_tts	string	译文tts链接	mp3格式，暂时无法指定发音
+dict	string	中英词典资源	返回中文或英文词典资源，包含音标；简明释义等内容
+
+### 返回结果
+- 英-> 中
+```json
+{
+    "from": "en", 
+    "to": "zh", 
+    "trans_result": [
+        {
+            "src": "apple", 
+            "dst": "苹果"
+        }
+    ]
+}
+```
+- 中->英
+```json
+{
+    "from": "zh", 
+    "to": "en", 
+    "trans_result": [
+        {
+            "src": "中国", 
+            "dst": "China"
+        }
+    ]
+}
+```
+## 彩云小译
+句子翻译
+> sh xiaoyi.sh en2zh "You know some birds are not meant to be caged, their feathers are just too bright."
+> 你知道有些鸟不应该被关在笼子里，它们的羽毛太亮了。
+
+## 必应
+
+## 腾讯翻译君
+
diff --git a/lua/Trans/util/md5.lua b/lua/Trans/util/md5.lua
new file mode 100644
index 0000000..4b3fdfb
--- /dev/null
+++ b/lua/Trans/util/md5.lua
@@ -0,0 +1,431 @@
+local md5 = {}
+-- local md5 = {
+--     _VERSION     = "md5.lua 1.1.0",
+--     _DESCRIPTION = "MD5 computation in Lua (5.1-3, LuaJIT)",
+--     _URL         = "https://github.com/kikito/md5.lua",
+--     _LICENSE     = [[
+--     MIT LICENSE
+--
+--     Copyright (c) 2013 Enrique García Cota + Adam Baldwin + hanzao + Equi 4 Software
+--
+--     Permission is hereby granted, free of charge, to any person obtaining a
+--     copy of this software and associated documentation files (the
+--     "Software"), to deal in the Software without restriction, including
+--     without limitation the rights to use, copy, modify, merge, publish,
+--     distribute, sublicense, and/or sell copies of the Software, and to
+--     permit persons to whom the Software is furnished to do so, subject to
+--     the following conditions:
+--
+--     The above copyright notice and this permission notice shall be included
+--     in all copies or substantial portions of the Software.
+--
+--     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+--     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+--     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+--     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+--     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+--     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+--     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+--   ]]
+-- }
+
+-- bit lib implementions
+
+local char, byte, format, rep, sub =
+string.char, string.byte, string.format, string.rep, string.sub
+local bit_or, bit_and, bit_not, bit_xor, bit_rshift, bit_lshift
+
+local ok, bit = pcall(require, 'bit')
+local ok_ffi, ffi = pcall(require, 'ffi')
+if ok then
+    bit_or, bit_and, bit_not, bit_xor, bit_rshift, bit_lshift = bit.bor, bit.band, bit.bnot, bit.bxor, bit.rshift,
+        bit.lshift
+else
+    ok, bit = pcall(require, 'bit32')
+
+    if ok then
+
+        bit_not = bit.bnot
+
+        local tobit = function(n)
+            return n <= 0x7fffffff and n or -(bit_not(n) + 1)
+        end
+
+        local normalize = function(f)
+            return function(a, b) return tobit(f(tobit(a), tobit(b))) end
+        end
+
+        bit_or, bit_and, bit_xor = normalize(bit.bor), normalize(bit.band), normalize(bit.bxor)
+        bit_rshift, bit_lshift = normalize(bit.rshift), normalize(bit.lshift)
+
+    else
+
+        local function tbl2number(tbl)
+            local result = 0
+            local power = 1
+            for i = 1, #tbl do
+                result = result + tbl[i] * power
+                power = power * 2
+            end
+            return result
+        end
+
+        local function expand(t1, t2)
+            local big, small = t1, t2
+            if (#big < #small) then
+                big, small = small, big
+            end
+            -- expand small
+            for i = #small + 1, #big do
+                small[i] = 0
+            end
+        end
+
+        local to_bits -- needs to be declared before bit_not
+
+        bit_not = function(n)
+            local tbl = to_bits(n)
+            local size = math.max(#tbl, 32)
+            for i = 1, size do
+                if (tbl[i] == 1) then
+                    tbl[i] = 0
+                else
+                    tbl[i] = 1
+                end
+            end
+            return tbl2number(tbl)
+        end
+
+        -- defined as local above
+        to_bits = function(n)
+            if (n < 0) then
+                -- negative
+                return to_bits(bit_not(math.abs(n)) + 1)
+            end
+            -- to bits table
+            local tbl = {}
+            local cnt = 1
+            local last
+            while n > 0 do
+                last     = n % 2
+                tbl[cnt] = last
+                n        = (n - last) / 2
+                cnt      = cnt + 1
+            end
+
+            return tbl
+        end
+
+        bit_or = function(m, n)
+            local tbl_m = to_bits(m)
+            local tbl_n = to_bits(n)
+            expand(tbl_m, tbl_n)
+
+            local tbl = {}
+            for i = 1, #tbl_m do
+                if (tbl_m[i] == 0 and tbl_n[i] == 0) then
+                    tbl[i] = 0
+                else
+                    tbl[i] = 1
+                end
+            end
+
+            return tbl2number(tbl)
+        end
+
+        bit_and = function(m, n)
+            local tbl_m = to_bits(m)
+            local tbl_n = to_bits(n)
+            expand(tbl_m, tbl_n)
+
+            local tbl = {}
+            for i = 1, #tbl_m do
+                if (tbl_m[i] == 0 or tbl_n[i] == 0) then
+                    tbl[i] = 0
+                else
+                    tbl[i] = 1
+                end
+            end
+
+            return tbl2number(tbl)
+        end
+
+        bit_xor = function(m, n)
+            local tbl_m = to_bits(m)
+            local tbl_n = to_bits(n)
+            expand(tbl_m, tbl_n)
+
+            local tbl = {}
+            for i = 1, #tbl_m do
+                if (tbl_m[i] ~= tbl_n[i]) then
+                    tbl[i] = 1
+                else
+                    tbl[i] = 0
+                end
+            end
+
+            return tbl2number(tbl)
+        end
+
+        bit_rshift = function(n, bits)
+            local high_bit = 0
+            if (n < 0) then
+                -- negative
+                n = bit_not(math.abs(n)) + 1
+                high_bit = 0x80000000
+            end
+
+            local floor = math.floor
+
+            for i = 1, bits do
+                n = n / 2
+                n = bit_or(floor(n), high_bit)
+            end
+            return floor(n)
+        end
+
+        bit_lshift = function(n, bits)
+            if (n < 0) then
+                -- negative
+                n = bit_not(math.abs(n)) + 1
+            end
+
+            for i = 1, bits do
+                n = n * 2
+            end
+            return bit_and(n, 0xFFFFFFFF)
+        end
+    end
+end
+
+-- convert little-endian 32-bit int to a 4-char string
+local lei2str
+-- function is defined this way to allow full jit compilation (removing UCLO instruction in LuaJIT)
+if ok_ffi then
+    local ct_IntType = ffi.typeof("int[1]")
+    lei2str = function(i) return ffi.string(ct_IntType(i), 4) end
+else
+    lei2str = function(i)
+        local f = function(s) return char(bit_and(bit_rshift(i, s), 255)) end
+        return f(0) .. f(8) .. f(16) .. f(24)
+    end
+end
+
+
+
+-- convert raw string to big-endian int
+local function str2bei(s)
+    local v = 0
+    for i = 1, #s do
+        v = v * 256 + byte(s, i)
+    end
+    return v
+end
+
+-- convert raw string to little-endian int
+local str2lei
+
+if ok_ffi then
+    local ct_constcharptr = ffi.typeof("const char*")
+    local ct_constintptr = ffi.typeof("const int*")
+    str2lei = function(s)
+        local int = ct_constcharptr(s)
+        return ffi.cast(ct_constintptr, int)[0]
+    end
+else
+    str2lei = function(s)
+        local v = 0
+        for i = #s, 1, -1 do
+            v = v * 256 + byte(s, i)
+        end
+        return v
+    end
+end
+
+
+-- cut up a string in little-endian ints of given size
+local function cut_le_str(s)
+    return {
+        str2lei(sub(s, 1, 4)),
+        str2lei(sub(s, 5, 8)),
+        str2lei(sub(s, 9, 12)),
+        str2lei(sub(s, 13, 16)),
+        str2lei(sub(s, 17, 20)),
+        str2lei(sub(s, 21, 24)),
+        str2lei(sub(s, 25, 28)),
+        str2lei(sub(s, 29, 32)),
+        str2lei(sub(s, 33, 36)),
+        str2lei(sub(s, 37, 40)),
+        str2lei(sub(s, 41, 44)),
+        str2lei(sub(s, 45, 48)),
+        str2lei(sub(s, 49, 52)),
+        str2lei(sub(s, 53, 56)),
+        str2lei(sub(s, 57, 60)),
+        str2lei(sub(s, 61, 64)),
+    }
+end
+
+-- An MD5 mplementation in Lua, requires bitlib (hacked to use LuaBit from above, ugh)
+-- 10/02/2001 jcw@equi4.com
+
+local CONSTS = {
+    0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
+    0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
+    0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
+    0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
+    0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
+    0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8,
+    0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
+    0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
+    0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
+    0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
+    0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05,
+    0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
+    0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
+    0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
+    0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
+    0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391,
+    0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476
+}
+
+local f = function(x, y, z) return bit_or(bit_and(x, y), bit_and(-x - 1, z)) end
+local g = function(x, y, z) return bit_or(bit_and(x, z), bit_and(y, -z - 1)) end
+local h = function(x, y, z) return bit_xor(x, bit_xor(y, z)) end
+local i = function(x, y, z) return bit_xor(y, bit_or(x, -z - 1)) end
+local z = function(ff, a, b, c, d, x, s, ac)
+    a = bit_and(a + ff(b, c, d) + x + ac, 0xFFFFFFFF)
+    -- be *very* careful that left shift does not cause rounding!
+    return bit_or(bit_lshift(bit_and(a, bit_rshift(0xFFFFFFFF, s)), s), bit_rshift(a, 32 - s)) + b
+end
+
+local function transform(A, B, C, D, X)
+    local a, b, c, d = A, B, C, D
+    local t = CONSTS
+
+    a = z(f, a, b, c, d, X[0], 7, t[1])
+    d = z(f, d, a, b, c, X[1], 12, t[2])
+    c = z(f, c, d, a, b, X[2], 17, t[3])
+    b = z(f, b, c, d, a, X[3], 22, t[4])
+    a = z(f, a, b, c, d, X[4], 7, t[5])
+    d = z(f, d, a, b, c, X[5], 12, t[6])
+    c = z(f, c, d, a, b, X[6], 17, t[7])
+    b = z(f, b, c, d, a, X[7], 22, t[8])
+    a = z(f, a, b, c, d, X[8], 7, t[9])
+    d = z(f, d, a, b, c, X[9], 12, t[10])
+    c = z(f, c, d, a, b, X[10], 17, t[11])
+    b = z(f, b, c, d, a, X[11], 22, t[12])
+    a = z(f, a, b, c, d, X[12], 7, t[13])
+    d = z(f, d, a, b, c, X[13], 12, t[14])
+    c = z(f, c, d, a, b, X[14], 17, t[15])
+    b = z(f, b, c, d, a, X[15], 22, t[16])
+
+    a = z(g, a, b, c, d, X[1], 5, t[17])
+    d = z(g, d, a, b, c, X[6], 9, t[18])
+    c = z(g, c, d, a, b, X[11], 14, t[19])
+    b = z(g, b, c, d, a, X[0], 20, t[20])
+    a = z(g, a, b, c, d, X[5], 5, t[21])
+    d = z(g, d, a, b, c, X[10], 9, t[22])
+    c = z(g, c, d, a, b, X[15], 14, t[23])
+    b = z(g, b, c, d, a, X[4], 20, t[24])
+    a = z(g, a, b, c, d, X[9], 5, t[25])
+    d = z(g, d, a, b, c, X[14], 9, t[26])
+    c = z(g, c, d, a, b, X[3], 14, t[27])
+    b = z(g, b, c, d, a, X[8], 20, t[28])
+    a = z(g, a, b, c, d, X[13], 5, t[29])
+    d = z(g, d, a, b, c, X[2], 9, t[30])
+    c = z(g, c, d, a, b, X[7], 14, t[31])
+    b = z(g, b, c, d, a, X[12], 20, t[32])
+
+    a = z(h, a, b, c, d, X[5], 4, t[33])
+    d = z(h, d, a, b, c, X[8], 11, t[34])
+    c = z(h, c, d, a, b, X[11], 16, t[35])
+    b = z(h, b, c, d, a, X[14], 23, t[36])
+    a = z(h, a, b, c, d, X[1], 4, t[37])
+    d = z(h, d, a, b, c, X[4], 11, t[38])
+    c = z(h, c, d, a, b, X[7], 16, t[39])
+    b = z(h, b, c, d, a, X[10], 23, t[40])
+    a = z(h, a, b, c, d, X[13], 4, t[41])
+    d = z(h, d, a, b, c, X[0], 11, t[42])
+    c = z(h, c, d, a, b, X[3], 16, t[43])
+    b = z(h, b, c, d, a, X[6], 23, t[44])
+    a = z(h, a, b, c, d, X[9], 4, t[45])
+    d = z(h, d, a, b, c, X[12], 11, t[46])
+    c = z(h, c, d, a, b, X[15], 16, t[47])
+    b = z(h, b, c, d, a, X[2], 23, t[48])
+
+    a = z(i, a, b, c, d, X[0], 6, t[49])
+    d = z(i, d, a, b, c, X[7], 10, t[50])
+    c = z(i, c, d, a, b, X[14], 15, t[51])
+    b = z(i, b, c, d, a, X[5], 21, t[52])
+    a = z(i, a, b, c, d, X[12], 6, t[53])
+    d = z(i, d, a, b, c, X[3], 10, t[54])
+    c = z(i, c, d, a, b, X[10], 15, t[55])
+    b = z(i, b, c, d, a, X[1], 21, t[56])
+    a = z(i, a, b, c, d, X[8], 6, t[57])
+    d = z(i, d, a, b, c, X[15], 10, t[58])
+    c = z(i, c, d, a, b, X[6], 15, t[59])
+    b = z(i, b, c, d, a, X[13], 21, t[60])
+    a = z(i, a, b, c, d, X[4], 6, t[61])
+    d = z(i, d, a, b, c, X[11], 10, t[62])
+    c = z(i, c, d, a, b, X[2], 15, t[63])
+    b = z(i, b, c, d, a, X[9], 21, t[64])
+
+    return bit_and(A + a, 0xFFFFFFFF), bit_and(B + b, 0xFFFFFFFF),
+        bit_and(C + c, 0xFFFFFFFF), bit_and(D + d, 0xFFFFFFFF)
+end
+
+----------------------------------------------------------------
+
+local function md5_update(self, s)
+    self.pos = self.pos + #s
+    s = self.buf .. s
+    for ii = 1, #s - 63, 64 do
+        local X = cut_le_str(sub(s, ii, ii + 63))
+        assert(#X == 16)
+        X[0] = table.remove(X, 1) -- zero based!
+        self.a, self.b, self.c, self.d = transform(self.a, self.b, self.c, self.d, X)
+    end
+    self.buf = sub(s, math.floor(#s / 64) * 64 + 1, #s)
+    return self
+end
+
+local function md5_finish(self)
+    local msgLen = self.pos
+    local padLen = 56 - msgLen % 64
+
+    if msgLen % 64 > 56 then padLen = padLen + 64 end
+
+    if padLen == 0 then padLen = 64 end
+
+    local s = char(128) ..
+        rep(char(0), padLen - 1) .. lei2str(bit_and(8 * msgLen, 0xFFFFFFFF)) .. lei2str(math.floor(msgLen / 0x20000000))
+    md5_update(self, s)
+
+    assert(self.pos % 64 == 0)
+    return lei2str(self.a) .. lei2str(self.b) .. lei2str(self.c) .. lei2str(self.d)
+end
+
+----------------------------------------------------------------
+
+function md5.new()
+    return { a = CONSTS[65], b = CONSTS[66], c = CONSTS[67], d = CONSTS[68],
+        pos = 0,
+        buf = '',
+        update = md5_update,
+        finish = md5_finish }
+end
+
+function md5.tohex(s)
+    return format("%08x%08x%08x%08x", str2bei(sub(s, 1, 4)), str2bei(sub(s, 5, 8)), str2bei(sub(s, 9, 12)),
+        str2bei(sub(s, 13, 16)))
+end
+
+function md5.sum(s)
+    return md5.new():update(s):finish()
+end
+
+function md5.sumhexa(s)
+    return md5.tohex(md5.sum(s))
+end
+
+return md5
diff --git a/lua/Trans/util/test/format.lua b/lua/Trans/util/test/format.lua
deleted file mode 100644
index 12d799b..0000000
--- a/lua/Trans/util/test/format.lua
+++ /dev/null
@@ -1,188 +0,0 @@
-
-
--- local M = {}
--- -- local type_check = require("Trans.util.debug").type_check
---
---
--- -- NOTE :中文字符及占两个字节宽，但是在lua里是3个字节长度
--- -- 为了解决中文字符在lua的长度和neovim显示不一致的问题
--- function string:width()
---     return vim.fn.strdisplaywidth(self)
--- end
---
--- -- 各种风格的基础宽度
--- local style_width = {
---     -- float = require("Trans.conf.window").float.width, -- NOTE : need window parsed conf
---     cursor = 60,
--- }
--- local s_to_b = true -- 从小到大排列
---
--- local m_fields     -- 待格式化的字段
--- local m_indent     -- 每行的行首缩进
--- local m_tot_width     -- 所有字段加起来的长度(不包括缩进和间隔)
--- local m_interval   -- 每个字段的间隔
--- local m_win_width  -- 需要被格式化窗口的高度
--- local m_item_width -- 每个字段的宽度
--- local m_size
---
--- local function caculate_format()
---     local width = m_win_width - m_item_width[1]
---     local cols = 0
---     for i = 2, #m_fields do
---         width = width - m_item_width[i] - m_interval
---         if width < 0 then
---             cols = i - 1
---             break
---         else
---             cols = i
---         end
---     end
---
---     return math.ceil(#m_fields / cols), cols
--- end
---
--- local function format_to_line()
---     local line = m_fields[1]
---     if m_size == 1 then
---         --- Center Align
---         local space = math.floor((m_win_width - m_item_width[1]) / 2)
---         line = (' '):rep(space) .. line
---     else
---         local space = math.floor((m_win_width - m_tot_width) / m_size - 1)
---         for i = 2, m_size do
---             line = line .. (' '):rep(space) .. m_fields[i]
---         end
---     end
---     return line
--- end
---
---
--- local function sort_tables()
---     table.sort(m_item_width, function (a, b)
---         return a > b
---     end)
---
---     table.sort(m_fields, function (a, b)
---         return a:width() > b:width()
---     end)
--- end
---
---
--- local function format_to_multilines()
---     local lines = {}
---     sort_tables()
---
---     --- NOTE ： 计算应该格式化成多少行和列
---     local rows, cols = caculate_format()
---     local rest = #m_fields % cols
---     if rest == 0 then
---         rest = cols
---     end
---
---     local s_width = m_item_width[1] -- 列中最宽的字符串宽度
---     -- NOTE : 第一列不需要加空格
---     for i = 1, rows do
---         local idx = s_to_b and rows - i + 1 or i
---         local space = (' '):rep(s_width - m_item_width[i])
---         lines[idx] = m_fields[i] .. space -- NOTE  由大到小
---     end
---
---     local index = rows + 1                 -- 最宽字符的下标
---     local interval = (' '):rep(m_interval) -- 每个字符串间的间隙
---
---     for j = 2, cols do -- 以列为单位遍历
---         s_width = m_item_width[index]
---         local stop = (j > rest and rows - 1 or rows)
---         for i = 1, stop do
---             local idx   = s_to_b and stop - i + 1 or i            -- 当前操作的行数
---             local item  = index + i - 1                           -- 当前操作的字段数
---             local space = (' '):rep(s_width - m_item_width[item]) -- 对齐空格
---
---             lines[idx] = lines[idx] .. interval .. m_fields[item] .. space -- NOTE  从大到小
---         end
---         index = index + stop -- 更新最宽字符的下标
---     end
---
---     return lines
--- end
---
---
--- local function get_formatted_lines()
---     local lines = {}
---     -- NOTE : 判断能否格式化成一行
---     local line_size = m_tot_width + (#m_fields * m_interval)
---     if line_size > m_win_width then
---         lines = format_to_multilines()
---     else
---         lines[1] = format_to_line()
---     end
---
---     -- NOTE :进行缩进
---     if m_indent > 0 then
---         for i, v in ipairs(lines) do
---             lines[i] = (' '):rep(m_indent) .. v
---         end
---     end
---     return lines
--- end
---
--- ---将组件格式化成相应的vim支持的lines格式
--- ---@param style string 窗口的风格
--- ---@param fields string[] 需要格式化的字段
--- ---@param indent? number 缩进的长度
--- ---@return string[] lines 便于vim.api.nvim_buf_set_lines
--- M.to_lines = function(style, fields, indent)
---
---     local length = 0
---     local width = 0
---     local item_size = {}
---     for i, v in ipairs(fields) do
---         width = v:width()
---         item_size[i] = width
---         length = length + width
---     end
---
---     m_indent = indent or 0
---     m_win_width  = style_width[style] - m_indent
---     m_fields = fields
---     m_tot_width = length
---     m_item_width = item_size
---     m_interval = m_win_width > 50 and 6 or 4
---     m_size = #fields
---
---     return get_formatted_lines()
--- end
---
--- local test = {
---     'isjlk测试dj',
---     '测试一下..',
--- }
---
--- local lines = M.to_lines('cursor', test)
---
--- -- print('===========================================')
--- -- for _, v in ipairs(test) do
--- --     print(v .. '                width:', v:width())
--- -- end
--- -- print('===========================================')
--- -- print('===========================================')
--- -- print('===========================================')
---
--- -- print('type is :' .. type(lines) .. '  size is :' .. #lines[1])
---
--- for _, v in ipairs(test) do
---     print(v:width())
--- end
---
--- -- lines = M.to_lines('cursor', {
--- --     'ajlkasj',
--- --     'jklasjldajjnn测试',
--- --     '测试将安得拉蓝色',
--- --     'cool this',
--- -- }, 4)
---
--- -- for _, v in ipairs(lines) do
--- --     print(v)
--- -- end
--- return M
---
diff --git a/lua/Trans/util/test/is_Chinese.lua b/lua/Trans/util/test/is_Chinese.lua
deleted file mode 100644
index cf15825..0000000
--- a/lua/Trans/util/test/is_Chinese.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-local M = {}
--- local type_check = require("Trans.util.debug").type_check
-
-
----@param str string
-local function is_Chinese(str)
-    for i = 1, #str do
-        if not str:byte(i) >= [[\u4e00]] then
-            return false
-        end
-    end
-    return true
-end
-
-return M
diff --git a/lua/Trans/util/test/query_youdao.lua b/lua/Trans/util/test/query_youdao.lua
deleted file mode 100644
index 8653e25..0000000
--- a/lua/Trans/util/test/query_youdao.lua
+++ /dev/null
@@ -1,71 +0,0 @@
-local M = {}
--- local type_check = require("Trans.util.debug").type_check
-local salt = '96836db9-1e28-4789-b5a6-fb7bb67e1259'
-local appKey = '1858465a8708c121'
-local appPasswd = 'fG0sitfk16nJOlIlycnLPYZn1optxUxL'
-
-local curtime
-local word
-
-local function caculate_input()
-    local input
-    local len = #word
-    if len > 20 then
-        input = word:sub(1, 10) .. len .. word:sub(-10)
-    else
-        input = word
-    end
-    return input
-end
-
-local function caculate_sign()
-    -- sign=sha256(应用ID+input+salt+curtime+应用密钥)；
-    local hash = appKey .. caculate_input() .. salt .. curtime .. appPasswd
-
-    return vim.fn.sha256(hash)
-end
-
-local function test()
-    local query = {
-        q        = word,
-        from     = 'auto',
-        to       = 'zh-CHS',
-        -- dicts    = 'ec',
-        signType = 'v3',
-        appKey   = appKey,
-        salt     = salt,
-        curtime  = curtime,
-        sign     = caculate_sign(),
-    }
-    return query
-end
-
--- curl --data {{'{"name":"bob"}'}} --header {{'Content-Type: application/json'}} {{http://example.com/users/1234}}
-
-local function query_word(q)
-    local ok, curl = pcall(require, 'plenary.curl')
-    if ok then
-        -- TODO 
-    else
-        local field = (
-            [[curl -s --header 'Content-Type: application/x-www-form-urlencoded' https://openapi.youdao.com/api]])
-
-        for k, v in pairs(q) do
-            field = field .. ([[ -d '%s=%s']]):format(k, v)
-        end
-
-        local output = vim.fn.system(field)
-        local tb = vim.fn.json_decode(output)
-        return tb
-    end
-end
-
-M.test = function(query)
-    curtime = tostring(os.time()) -- 更新一下time
-    word = query or 'as'
-    -- local json = vim.fn.json_encode(test())
-    query_word(test())
-    -- vim.pretty_print(vim.fn.json_encode(json))
-end
-
-return M
diff --git a/lua/Trans/util/test/test.lua b/lua/Trans/util/test/test.lua
deleted file mode 100644
index 8d5e8ff..0000000
--- a/lua/Trans/util/test/test.lua
+++ /dev/null
@@ -1,14 +0,0 @@
--- 记录开始时间
-local starttime = os.clock(); --> os.clock()用法
-
-local str = 'test'
-local len = #str
-
-for i = 1, 100000000 do
-    local size = len
-end
-
--- 记录结束时间
-local endtime = os.clock(); --> os.clock()用法
-print(string.format("end time   : %.4f", endtime));
-print(string.format("cost time  : %.4f", endtime - starttime));

From 7a03ccc82a4010577a058516b70bb0905af7ee18 Mon Sep 17 00:00:00 2001
From: JuanZoran <1430359574@qq.com>
Date: Sun, 15 Jan 2023 14:55:48 +0800
Subject: [PATCH 6/9] feat: add window animation option for window close

---
 lua/Trans/README.md       | 22 ++++++++++++++++++++++
 lua/Trans/core/window.lua | 30 +++++++++++++++++++++++++-----
 lua/Trans/init.lua        |  1 +
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/lua/Trans/README.md b/lua/Trans/README.md
index 6e02658..4999dc9 100644
--- a/lua/Trans/README.md
+++ b/lua/Trans/README.md
@@ -1,5 +1,20 @@
 # 字段说明
 
+<!--toc:start-->
+- [字段说明](#字段说明)
+  - [本地](#本地)
+  - [有道](#有道)
+    - [中英](#中英)
+  - [百度](#百度)
+    - [返回结果](#返回结果)
+  - [彩云小译](#彩云小译)
+  - [必应](#必应)
+  - [腾讯翻译君](#腾讯翻译君)
+  - [阿里翻译](#阿里翻译)
+  - [火山翻译](#火山翻译)
+  - [金山词霸](#金山词霸)
+<!--toc:end-->
+
 ## 本地
 - `word`  
 查询的字符串
@@ -105,3 +120,10 @@ dict	string	中英词典资源	返回中文或英文词典资源，包含音标
 
 ## 腾讯翻译君
 
+## 阿里翻译
+
+## 火山翻译
+
+## 金山词霸
+
+## Dictionary
diff --git a/lua/Trans/core/window.lua b/lua/Trans/core/window.lua
index 52d26c6..553f8ea 100644
--- a/lua/Trans/core/window.lua
+++ b/lua/Trans/core/window.lua
@@ -81,20 +81,18 @@ M.load_hover_opts = function()
         { 'InsertEnter', 'CursorMoved', 'BufLeave', }, {
         buffer = 0,
         once = true,
-        callback = function()
-            if api.nvim_win_is_valid(M.id) then
-                api.nvim_win_close(M.id, true)
-            end
-        end,
+        callback = M.close,
     })
     api.nvim_win_set_option(M.id, 'wrap', M.view ~= 'float')
 
     local height = util.get_height(M.bufnr, M.id)
     if M.height > height then
         api.nvim_win_set_height(M.id, height)
+        M.height = height
     end
 end
 
+
 M.load_float_opts = function()
     vim.keymap.set('n', 'q', function()
         if api.nvim_win_is_valid(M.id) then
@@ -110,6 +108,28 @@ M.load_float_opts = function()
 end
 
 
+
+
+M.close = function()
+    if api.nvim_win_is_valid(M.id) then
+        if conf.window.animation then
+            local function narrow()
+                if M.height > 1 then
+                    M.height = M.height - 1
+                    api.nvim_win_set_height(M.id, M.height)
+                    vim.defer_fn(narrow, 13)
+                else
+                    api.nvim_win_close(M.id, true)
+                end
+            end
+            vim.defer_fn(narrow, 10)
+
+        else
+            api.nvim_win_close(M.id, true)
+        end
+    end
+end
+
 M.show = function()
     M.init(M.view or 'float')
     M.load_opts()
diff --git a/lua/Trans/init.lua b/lua/Trans/init.lua
index ca3b821..d4b9702 100644
--- a/lua/Trans/init.lua
+++ b/lua/Trans/init.lua
@@ -8,6 +8,7 @@ M.conf = {
     },
     window = {
         border = 'rounded',
+        animation = true,
         hover = {
             width = 36,
             height = 26,

From 51313663b592fa67454c86dff3a324c01389b34e Mon Sep 17 00:00:00 2001
From: JuanZoran <1430359574@qq.com>
Date: Sun, 15 Jan 2023 15:13:33 +0800
Subject: [PATCH 7/9] =?UTF-8?q?revert:=20=E4=BF=AE=E5=A4=8D=E4=BA=86?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=8A=A8=E7=94=BB=E8=A2=AB=E6=89=93=E6=96=AD?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/Trans/core/window.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lua/Trans/core/window.lua b/lua/Trans/core/window.lua
index 553f8ea..ae0de80 100644
--- a/lua/Trans/core/window.lua
+++ b/lua/Trans/core/window.lua
@@ -119,7 +119,10 @@ M.close = function()
                     api.nvim_win_set_height(M.id, M.height)
                     vim.defer_fn(narrow, 13)
                 else
-                    api.nvim_win_close(M.id, true)
+                    -- Wait animation done
+                    vim.defer_fn(function ()
+                        api.nvim_win_close(M.id, true)
+                    end, 10)
                 end
             end
             vim.defer_fn(narrow, 10)

From 2c57923f6a14b4e9729e5b3cf590c300472d2fe6 Mon Sep 17 00:00:00 2001
From: JuanZoran <1430359574@qq.com>
Date: Mon, 16 Jan 2023 00:27:12 +0800
Subject: [PATCH 8/9] style: modify title style

---
 lua/Trans/core/handler.lua | 6 ++++--
 lua/Trans/core/init.lua    | 1 +
 lua/Trans/core/window.lua  | 7 +++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lua/Trans/core/handler.lua b/lua/Trans/core/handler.lua
index e95e3d9..211ddb0 100644
--- a/lua/Trans/core/handler.lua
+++ b/lua/Trans/core/handler.lua
@@ -57,9 +57,11 @@ end
 
 local function expl(c, text)
     local wrapper = c:text_wrapper()
-    wrapper('', 'TransTitleRound')
+    -- wrapper('', 'TransTitleRound')
+    wrapper('', 'TransTitleRound')
     wrapper(text, 'TransTitle')
-    wrapper('', 'TransTitleRound')
+    -- wrapper('', 'TransTitleRound')
+    wrapper('', 'TransTitleRound')
 end
 
 local indent = '    '
diff --git a/lua/Trans/core/init.lua b/lua/Trans/core/init.lua
index 5f83335..3f80544 100644
--- a/lua/Trans/core/init.lua
+++ b/lua/Trans/core/init.lua
@@ -27,6 +27,7 @@ local function get_word(method)
     if method == 'n' then
         return vim.fn.expand('<cword>')
     elseif method == 'v' then
+        vim.api.nvim_input('<ESC>')
         return get_select()
     elseif method == 'input' then
         -- TODO Use Telescope with fuzzy finder
diff --git a/lua/Trans/core/window.lua b/lua/Trans/core/window.lua
index ae0de80..ebd2a86 100644
--- a/lua/Trans/core/window.lua
+++ b/lua/Trans/core/window.lua
@@ -26,7 +26,9 @@ function M.init(view)
         border    = conf.window.border,
         title     = {
             { '', 'TransTitleRound' },
+            -- { '', 'TransTitleRound' },
             { conf.icon.title .. ' Trans', 'TransTitle' },
+            -- { '', 'TransTitleRound' },
             { '', 'TransTitleRound' },
         },
         title_pos = 'center',
@@ -122,17 +124,18 @@ M.close = function()
                     -- Wait animation done
                     vim.defer_fn(function ()
                         api.nvim_win_close(M.id, true)
-                    end, 10)
+                    end, 15)
                 end
             end
-            vim.defer_fn(narrow, 10)
 
+            narrow()
         else
             api.nvim_win_close(M.id, true)
         end
     end
 end
 
+
 M.show = function()
     M.init(M.view or 'float')
     M.load_opts()

From 0ca9710061b755cd46e25298e96fb4c7cbda97d4 Mon Sep 17 00:00:00 2001
From: JuanZoran <1430359574@qq.com>
Date: Mon, 16 Jan 2023 00:43:17 +0800
Subject: [PATCH 9/9] docs: update README doc

---
 README.md                  | 62 ++++++++++++++++++++++----------------
 lua/Trans/core/handler.lua |  2 +-
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index e5cdf7a..6e33b32 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 # Trans.nvim
+
+<!--toc:start-->
 - [Trans.nvim](#transnvim)
   - [特点](#特点)
   - [屏幕截图](#屏幕截图)
@@ -8,7 +10,8 @@
   - [高亮组](#高亮组)
   - [声明](#声明)
   - [感谢](#感谢)
-- [TODO](#todo)
+  - [TODO](#todo)
+<!--toc:end-->
 
 
 ## 特点
@@ -27,8 +30,9 @@
   - 英文翻译  (不是英译中, 而是用英文解释)
   - 词根
   - etc
+- 舒服的排版和`动画`
 - 支持 `normal`和 `visual`模式
-> 不支持 visual-block mode
+    > 不支持 visual-block mode
   
 - 本地词库单词量: `430w`
   
@@ -63,11 +67,12 @@ use {
         { 'v', 'mm' }, -- 换成其他你想用的key即可
         { 'n', 'mm' },
     },
-    run = 'bash ./install.sh',
+    run = 'bash ./install.sh', -- 自动下载使用的本地词库
+    requires = 'kharji/sqlite.lua',
     config = function()
-        require("Trans").setup {}
-        vim.keymap.set("v", "mm", '<Esc><Cmd>TranslateSelectWord<CR>', { desc = ' Translate' })
-        vim.keymap.set("n", "mm", "<Cmd>TranslateCursorWord<CR>", { desc = ' Translate' })
+        require("Trans").setup {} -- 启动Trans
+        vim.keymap.set({"v", 'n'}, "mm", '<Cmd>Translate<CR>', { desc = ' Translate' }) -- 自动判断virtual 还是 normal 模式
+        vim.keymap.set("n", "mi", "<Cmd>TranslateInput<CR>", { desc = ' Translate' })
     end
 }
 ```
@@ -90,7 +95,6 @@ use {
     > `sudo pacman -S sqlite # Arch`
     > `sudo apt-get install sqlite3 libsqlite3-dev # Ubuntu`
     
-  - `$HOME/.vim/dict` 文件夹是否存在
   > 后续会增加 `healthcheck` 进行检查
 
 
@@ -98,15 +102,16 @@ use {
 ```lua
 require'Trans'.setup {
     view = {
-        input = 'hover',
+        input = 'float',
         n = 'hover',
         v = 'hover',
     },
     window = {
         border = 'rounded',
+        animation = true,
         hover = {
             width = 36,
-            height = 23,
+            height = 26,
         },
         float = {
             width = 0.8,
@@ -121,8 +126,6 @@ require'Trans'.setup {
         'pos',
         'exchange',
         'translation',
-        -- NOTE :如果你想限制某个组件的行数，可以设置max_size
-        -- { 'Definition', max_size = 4 },
         'definition',
         -- },
         -- online = {
@@ -130,14 +133,15 @@ require'Trans'.setup {
         -- },
     },
     icon = {
+        title = ' ', -- 
         star = '',
-        notfound = '',
-        yes = '',
-        no = ''
+        -- notfound = '',
+        -- yes = '',
+        -- no = ''
         -- star = '⭐',
-        -- notfound = '❔',
-        -- yes = '✔️',
-        -- no = '❌'
+        notfound = '❔',
+        yes = '✔️',
+        no = '❌'
     },
     db_path = '$HOME/.vim/dict/ultimate.db',
     -- TODO :
@@ -145,11 +149,11 @@ require'Trans'.setup {
     --     -- TODO
     --     'offline',
     -- }
-    map = {
-        -- TODO
+    keymap = {
+        -- TODO : More action support
         hover = {
-            pageup = '<C-u>',
-            pagedown = '<C-d>',
+            pageup = '[[',
+            pagedown = ']]',
         },
     },
     -- history = {
@@ -185,10 +189,16 @@ 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)           灵感来源
 
-# TODO
-- 多风格样式
+## TODO
 - ~~移动光标自动关闭窗口~~
+- 多风格样式
+- 历史查询结果保存
+- 在线多引擎异步查询
+- 快捷键定义
+- 自动读音
+- `句子翻译` | `中翻英` 的支持
+- 重新录制屏幕截图示例
diff --git a/lua/Trans/core/handler.lua b/lua/Trans/core/handler.lua
index 211ddb0..efd1c66 100644
--- a/lua/Trans/core/handler.lua
+++ b/lua/Trans/core/handler.lua
@@ -135,7 +135,7 @@ M.hover = {
             expl(content, '英文注释')
 
             vim.tbl_map(function(def)
-                def = def:gsub('%s+', '', 1)
+                def = def:gsub('%s+', '', 1) -- TODO :判断是否需要分割空格
                 content:addline(indent .. def, 'TransDefinition')
             end, vim.split(indent .. result.definition, '\n', { plain = true, trimempry = true }))