From 04d7a6252af7500ae92ee4f85d1d7e144a5e54d0 Mon Sep 17 00:00:00 2001 From: JuanZoran <1430359574@qq.com> Date: Thu, 26 Jan 2023 13:18:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?docs:=20add=20lazy.nvim=20=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dc076d3..a839be1 100644 --- a/README.md +++ b/README.md @@ -64,8 +64,7 @@ https://user-images.githubusercontent.com/107862700/213752097-2eee026a-ddee-4531 - sqlite3: 数据库 -由于目前本人只使用 `Packer.nvim` 作为包管理插件, 所以这里以Packer为例: -**考虑将以下代码复制到的Packer Startup中:** +- `Packer.nvim`示例 ```lua use { 'JuanZoran/Trans.nvim' @@ -99,6 +98,24 @@ use { } ``` +- `lazy.nvim`示例 +```lua + { + "JuanZoran/Trans.nvim", + keys = { + -- 可以换成其他你想映射的键 + { 'mm', mode = { 'n', 'x' }, 'Translate', desc = ' Translate' }, + + -- 目前这个功能的视窗还没有做好，可以在配置里将view.i改成hover + { 'mi', 'TranslateInput', desc = ' Translate From Input' }, + }, + dependencies = { 'kkharji/sqlite.lua', lazy = true }, + opts = { + -- your configuration there + } + } +``` + **注意事项**: - `install.sh` - 使用了 `wget`下载词库, 安装请确保你的环境变量中存在wget From 68f1c0f114693ee974b7122c876717c6fdd9ec3a Mon Sep 17 00:00:00 2001 From: JuanZoran <1430359574@qq.com> Date: Thu, 26 Jan 2023 20:28:19 +0800 Subject: [PATCH 2/3] refactor: add node file for utility --- install.sh | 17 +++------------ lua/Trans/content.lua | 45 +------------------------------------- lua/Trans/node.lua | 47 ++++++++++++++++++++++++++++++++++++++++ lua/Trans/view/float.lua | 20 +++++++++-------- lua/Trans/view/hover.lua | 47 ++++++++++++++++------------------------ lua/Trans/window.lua | 25 --------------------- 6 files changed, 81 insertions(+), 120 deletions(-) create mode 100644 lua/Trans/node.lua diff --git a/install.sh b/install.sh index 41ebbf9..94d0570 100755 --- a/install.sh +++ b/install.sh @@ -1,22 +1,11 @@ #!/usr/bin/env bash set -e -if [[ -d "$HOME/.vim" ]]; then - if [[ -d "$HOME/.vim/dict" && -f "$HOME/.vim/dict/ultimate.db" ]]; then - echo 'db has been installed' - exit 0 - fi -else - echo '$HOME/.vim not exist' - exit 1 -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 - +unzip /tmp/dict.zip -d "$HOME/.vim/dict" && rm -rf /tmp/dict.zip uNames=`uname -s` osName=${uNames: 0: 4} diff --git a/lua/Trans/content.lua b/lua/Trans/content.lua index c37aa8a..c0a961c 100644 --- a/lua/Trans/content.lua +++ b/lua/Trans/content.lua @@ -1,28 +1,5 @@ local api = vim.api - -local item_meta = { - load_hl = function(self, content, line, col) - if self.hl then - content:newhl { - name = self.hl, - line = line, - _start = col, - _end = col + #self.text, - } - end - end -} - -local text_meta = { - load_hl = function(self, content, line, col) - for _, item in ipairs(self.items) do - item:load_hl(content, line, col) - col = col + #item.text - end - end, -} - local format_meta = { load_hl = function(self, content, line, col) local space = self.space @@ -94,26 +71,6 @@ local content = { end end, - item_wrap = function(text, hl) - return setmetatable({ - text = text, - hl = hl, - }, { __index = item_meta }) - end, - - text_wrap = function(...) - local items = { ... } - local strs = {} - - for i, item in ipairs(items) do - strs[i] = item.text - end - - return setmetatable({ - text = table.concat(strs), - items = items, - }, { __index = text_meta }) - end, format = function(self, ...) local nodes = { ... } @@ -141,7 +98,7 @@ local content = { local space = bit.rshift(self.window.width - item.text:width(), 1) item.text = (' '):rep(space) .. item.text local load_hl = item.load_hl - item.load_hl = function (this, content, line, col) + item.load_hl = function(this, content, line, col) load_hl(this, content, line, col + space) end diff --git a/lua/Trans/node.lua b/lua/Trans/node.lua new file mode 100644 index 0000000..33d5b99 --- /dev/null +++ b/lua/Trans/node.lua @@ -0,0 +1,47 @@ +-- NOTE : 设置content的node +local item_meta = { + load_hl = function(self, content, line, col) + if self.hl then + content:newhl { + name = self.hl, + line = line, + _start = col, + _end = col + #self.text, + } + end + end +} + +local text_meta = { + load_hl = function(self, content, line, col) + for _, item in ipairs(self.items) do + item:load_hl(content, line, col) + col = col + #item.text + end + end, +} + + +return { + item = function(text, hl) + return setmetatable({ + text = text, + hl = hl, + }, { __index = item_meta }) + end, + + + text = function(...) + local items = { ... } + local strs = {} + + for i, item in ipairs(items) do + strs[i] = item.text + end + + return setmetatable({ + text = table.concat(strs), + items = items, + }, { __index = text_meta }) + end, +} diff --git a/lua/Trans/view/float.lua b/lua/Trans/view/float.lua index 44862c8..8cf0c7e 100644 --- a/lua/Trans/view/float.lua +++ b/lua/Trans/view/float.lua @@ -9,6 +9,11 @@ local engine_map = { ['有道'] = 'youdao', } +local node = require("Trans.node") +local t = node.text +local it = node.item + + local function set_tag_hl(name, status) local hl = conf.float.tag[status] m_window:set_hl(name, { @@ -25,13 +30,10 @@ local function set_title() local title = m_window.contents[1] local github = ' https://github.com/JuanZoran/Trans.nvim' - local item = title.item_wrap - title:addline( - title:center(item(github, '@text.uri')) + title:center(it(github, '@text.uri')) ) - local text = title.text_wrap local format = '%s(%d)' for i, engine_ch in ipairs(conf.float.engine) do local engine_us = engine_map[engine_ch] @@ -39,10 +41,10 @@ local function set_title() local round = engine_us .. 'round' title:addline( - text( - item('', round), - item(format:format(engine_ch, i), engine_us), - item('', round) + t( + it('', round), + it(format:format(engine_ch, i), engine_us), + it('', round) ) ) end @@ -56,7 +58,7 @@ local action = { local function process() - + -- TODO : end return function(word) diff --git a/lua/Trans/view/hover.lua b/lua/Trans/view/hover.lua index 5fde976..ca2a6fb 100644 --- a/lua/Trans/view/hover.lua +++ b/lua/Trans/view/hover.lua @@ -5,18 +5,15 @@ local m_window local m_result local m_content -- content utility -local text -local item +local node = require("Trans.node") +local t = node.text +local it = node.item local m_indent = ' ' local title = function(str) m_content:addline( - text( - item('', 'TransTitleRound'), - item(str, 'TransTitle'), - item('', 'TransTitleRound') - ) + t(it('', 'TransTitleRound'), it(str, 'TransTitle'), it('', 'TransTitleRound')) ) end @@ -31,14 +28,14 @@ local process = { m_content:addline( m_content:format( - item(m_result.word, 'TransWord'), - text( - item('['), - item(exist(m_result.phonetic) and m_result.phonetic or icon.notfound, 'TransPhonetic'), - item(']') + it(m_result.word, 'TransWord'), + t( + it('['), + it(exist(m_result.phonetic) and m_result.phonetic or icon.notfound, 'TransPhonetic'), + it(']') ), - item(m_result.collins and icon.star:rep(m_result.collins) or icon.notfound, 'TransCollins'), - item(m_result.oxford == 1 and icon.yes or icon.no) + 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, @@ -68,7 +65,7 @@ local process = { for i = 1, size, 3 do m_content:addline( - item( + it( m_indent .. tags[i] .. (tags[i + 1] and interval .. tags[i + 1] .. @@ -102,7 +99,7 @@ local process = { } for pos in vim.gsplit(m_result.pos, '/', true) do m_content:addline( - item(m_indent .. pos_map[pos:sub(1, 1)] .. pos:sub(3) .. '%', 'TransPos') + it(m_indent .. pos_map[pos:sub(1, 1)] .. pos:sub(3) .. '%', 'TransPos') ) end @@ -129,7 +126,7 @@ local process = { for exc in vim.gsplit(m_result.exchange, '/', true) do m_content:addline( - item(m_indent .. exchange_map[exc:sub(1, 1)] .. interval .. exc:sub(3), 'TransExchange') + it(m_indent .. exchange_map[exc:sub(1, 1)] .. interval .. exc:sub(3), 'TransExchange') ) end @@ -142,7 +139,7 @@ local process = { for trs in vim.gsplit(m_result.translation, '\n', true) do m_content:addline( - item(m_indent .. trs, 'TransTranslation') + it(m_indent .. trs, 'TransTranslation') ) end @@ -156,7 +153,7 @@ local process = { for def in vim.gsplit(m_result.definition, '\n', true) do def = def:gsub('^%s+', '', 1) -- TODO :判断是否需要分割空格 m_content:addline( - item(m_indent .. def, 'TransDefinition') + it(m_indent .. def, 'TransDefinition') ) end @@ -166,7 +163,7 @@ local process = { failed = function() m_content:addline( - item(conf.icon.notfound .. m_indent .. '没有找到相关的翻译', 'TransFailed') + it(conf.icon.notfound .. m_indent .. '没有找到相关的翻译', 'TransFailed') ) m_window:set_width(m_content.lines[1]:width()) @@ -275,18 +272,13 @@ return function(word) height = hover.height, title = hover.title, border = hover.border, - col = 2, - row = 2, + col = 1, + row = 1, }) m_window.animation = hover.animation m_content = m_window.contents[1] - if not text then - text = m_content.text_wrap - item = m_content.item_wrap - end - if m_result then if hover.auto_play then action.play() end @@ -312,7 +304,6 @@ return function(word) m_window:set('wrap', true) end) - -- Auto Close cmd_id = api.nvim_create_autocmd( hover.auto_close_events, { diff --git a/lua/Trans/window.lua b/lua/Trans/window.lua index c544ef4..4630ad2 100644 --- a/lua/Trans/window.lua +++ b/lua/Trans/window.lua @@ -15,51 +15,29 @@ end ---@type window local window = { - ---设置窗口的选项 - ---@param self table 需要设置的window - ---@param option string 待设置的选项名 - ---@param value any 选项的值 set = function(self, option, value) api.nvim_win_set_option(self.winid, option, value) end, - ---设置窗口的高度 - ---@param self table 窗口类 - ---@param height integer 设置的高度 set_height = function(self, height) api.nvim_win_set_height(self.winid, height) self.height = height end, - ---设置窗口的宽度 - ---@param self table 窗口对象 - ---@param width integer 设置的宽度 set_width = function(self, width) api.nvim_win_set_width(self.winid, width) self.width = width end, - ---设置窗口对应的buffer - ---@param self table 同set类似 - ---@param option string - ---@param value any bufset = function(self, option, value) api.nvim_buf_set_option(self.bufnr, option, value) end, - ---查看**窗口**的选项 - ---@param self table 窗口对象 - ---@param name string 选项名 - ---@return any 对应的值 ---@nodiscard option = function(self, name) return api.nvim_win_get_option(self.winid, name) end, - ---设置当前窗口内的键映射, **需要光标在该窗口内** - ---@param self table 窗口对象 - ---@param key string 映射的键位 - ---@param operation any 执行的操作 map = function(self, key, operation) vim.keymap.set('n', key, operation, { buffer = self.bufnr, @@ -67,9 +45,6 @@ local window = { }) end, - ---查看窗口是否是打开状态 - ---@param self table window对象 - ---@return boolean ---@nodiscard is_open = function(self) return self.winid > 0 and api.nvim_win_is_valid(self.winid) From 110e49cf1ad2cbbddb77b653368935cfd5070670 Mon Sep 17 00:00:00 2001 From: JuanZoran <1430359574@qq.com> Date: Thu, 26 Jan 2023 22:40:23 +0800 Subject: [PATCH 3/3] fix: fix title confilict --- lua/Trans/init.lua | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lua/Trans/init.lua b/lua/Trans/init.lua index 9ebf9db..661c684 100644 --- a/lua/Trans/init.lua +++ b/lua/Trans/init.lua @@ -1,5 +1,12 @@ local M = {} + +local title = vim.fn.has('nvim-0.9') and{ + { '', 'TransTitleRound' }, + { ' Trans', 'TransTitle' }, + { '', 'TransTitleRound' }, + } or ' Trans' + M.conf = { view = { i = 'float', @@ -10,11 +17,7 @@ M.conf = { width = 37, height = 27, border = 'rounded', - title = { - { '', 'TransTitleRound' }, - { ' Trans', 'TransTitle' }, - { '', 'TransTitleRound' }, - }, + title = title, keymap = { -- TODO : pageup = '[[',