From ee7e3b028ff3f4c9bd396ecd775e825688a9bb49 Mon Sep 17 00:00:00 2001 From: JuanZoran <1430359574@qq.com> Date: Fri, 17 Mar 2023 08:15:10 +0800 Subject: [PATCH] fix: fix miss ',' and better youdao web format style --- README.md | 3 ++ lua/Trans/.clocignore | 3 +- lua/Trans/core/conf.lua | 1 + lua/Trans/frontend/hover/offline.lua | 64 ++++++++++++++-------------- lua/Trans/frontend/hover/youdao.lua | 12 ++++-- lua/Trans/util/display.lua | 48 --------------------- 6 files changed, 47 insertions(+), 84 deletions(-) delete mode 100644 lua/Trans/util/display.lua diff --git a/README.md b/README.md index fb7271c..1093ca3 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,9 @@ - [待办 (画大饼)](#待办-画大饼) +### 注意: 当前分支目前没有发布, README.md的描述并不准确, 遇到问题请切换到 `main`分支或者联系我 + + ## 特点 - 使用纯 lua 编写, 速度极快 diff --git a/lua/Trans/.clocignore b/lua/Trans/.clocignore index 10a888a..4787c9e 100644 --- a/lua/Trans/.clocignore +++ b/lua/Trans/.clocignore @@ -1,5 +1,6 @@ ./README.md ./util/md5.lua ./util/base64.lua -./util/bak_init.lua ./test +./util/bing_node.lua +./style diff --git a/lua/Trans/core/conf.lua b/lua/Trans/core/conf.lua index 871a88a..0ff3a76 100644 --- a/lua/Trans/core/conf.lua +++ b/lua/Trans/core/conf.lua @@ -95,6 +95,7 @@ return { ---@type table icon = { -- or use emoji + list = '●', -- ● | ○ | ◉ | ◯ | ◇ | ◆ | ▪ | ▫ | ⬤ | ⬛ | ⬜ | ◻ | ◼ | ◾ | ◽ | ▣ | ▤ | ▥ | ▦ | ▧ | ▨ | ▩ | ▪ | ▫ | ▬ | ▭ | ▮ | ▯ | ◌ | ◍ | ◎ | ● | ◐ | ◑ | ◒ | ◓ | ◔ | ◕ | ◖ | ◗ | ◘ | ◙ | ◚ | ◛ | ◜ | ◝ | ◞ | ◟ | ◠ | ◡ | ◢ | ◣ | ◤ | ◥ | ◦ | ◧ | ◨ | ◩ | ◪ | ◫ | ◬ | ◭ | ◮ | ◯ | ◰ | ◱ | ◲ | ◳ | ◴ | ◵ | ◶ | ◷ | ◸ | ◹ | ◺ | ◻ | ◼ | ◽ | ◾ | ◿ | ☀ | ☁ | ☂ | ☃ | ☄ | ★ | ☆ | ☇ | ☈ | ☉ | ☊ | ☋ | ☌ | ☍ | ☎ | ☏ | ☐ | ☑ | ☒ | ☓ | ☔ | ☕ | ☖ | ☗ | ☘ | ☙ | ☚ | ☛ | ☜ | ☝ | ☞ | ☟ | ☠ | ☡ | ☢ | ☣ | ☤ | ☥ | ☦ | ☧ | ☨ | ☩ | ☪ | ☫ | ☬ | ☭ | ☮ | ☯ | ☰ | ☱ | ☲ | ☳ | ☴ | ☵ | ☶ | ☷ | ☸ | ☹ | ☺ | ☻ | ☼ | ☽ | ☾ | ☿ | ♀ | ♂ | ♁ | ♂ | ♃ | ♄ | ♅ | ♆ | ♇ | ♈ | ♉ | ♊ | ♋ | ♌ | ♍ | ♎ | ♏ | ♐ | ♑ | ♒ | ♓ | ♔ | ♕ | star = '', -- ⭐ notfound = ' ', -- ❔ yes = '✔', -- ✔️ diff --git a/lua/Trans/frontend/hover/offline.lua b/lua/Trans/frontend/hover/offline.lua index 4e3361b..919395b 100644 --- a/lua/Trans/frontend/hover/offline.lua +++ b/lua/Trans/frontend/hover/offline.lua @@ -5,6 +5,38 @@ local interval = (' '):rep(4) ---@type TransHoverRenderer local M = {} +function M.title(hover, result) + local title = result.title + if not title then return end + if type(title) == 'string' then + hover.buffer:setline(it(title, 'TransWord')) + return + end + + + local icon = hover.opts.icon + + local word = title.word + local oxford = title.oxford + local collins = title.collins + local phonetic = title.phonetic + + hover.buffer:setline(f { + width = hover.opts.width, + text = t { + it(word, 'TransWord'), + t { + it('['), + it((phonetic and phonetic ~= '') and phonetic or icon.notfound, 'TransPhonetic'), + it(']') + }, + + it(collins and icon.star:rep(collins) or icon.notfound, 'TransCollins'), + it(oxford == 1 and icon.yes or icon.no) + }, + }) +end + function M.tag(hover, result) local tag = result.tag if not tag then return end @@ -58,36 +90,4 @@ function M.pos(hover, result) buffer:setline('') end -function M.title(hover, result) - local title = result.title - if not title then return end - if type(title) == 'string' then - hover.buffer:setline(it(title, 'TransWord')) - return - end - - - local icon = hover.opts.icon - - local word = title.word - local oxford = title.oxford - local collins = title.collins - local phonetic = title.phonetic - - hover.buffer:setline(f { - width = hover.opts.width, - text = t { - it(word, 'TransWord'), - t { - it('['), - it((phonetic and phonetic ~= '') and phonetic or icon.notfound, 'TransPhonetic'), - it(']') - }, - - it(collins and icon.star:rep(collins) or icon.notfound, 'TransCollins'), - it(oxford == 1 and icon.yes or icon.no) - }, - }) -end - return M diff --git a/lua/Trans/frontend/hover/youdao.lua b/lua/Trans/frontend/hover/youdao.lua index 998cfa6..09eb1a5 100644 --- a/lua/Trans/frontend/hover/youdao.lua +++ b/lua/Trans/frontend/hover/youdao.lua @@ -10,17 +10,23 @@ function M.web(hover, result) local buffer = hover.buffer buffer:setline(co('网络释义')) + local indent = interval .. interval .. hover.opts.icon.list .. ' ' for _, w in ipairs(result.web) do buffer:setline(it( - --- TODO :Better format style - interval .. w.key .. interval .. table.concat(w.value, ' | '), + interval .. w.key, 'TransWeb' )) + + for _, v in ipairs(w.value) do + buffer:setline(it( + indent .. v, + 'TransWeb' + )) + end end buffer:setline('') end - function M.explains(hover, result) local explains = result.explains if not explains then return end diff --git a/lua/Trans/util/display.lua b/lua/Trans/util/display.lua deleted file mode 100644 index b740f73..0000000 --- a/lua/Trans/util/display.lua +++ /dev/null @@ -1,48 +0,0 @@ -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