diff --git a/lua/Trans/buffer.lua b/lua/Trans/buffer.lua new file mode 100644 index 0000000..78ac88e --- /dev/null +++ b/lua/Trans/buffer.lua @@ -0,0 +1,144 @@ +local api = vim.api +local fn = vim.fn + +local buffer = { + addline = function(self, nodes, index) + local size = self.size + if index then + assert(index <= size + 1) + index = index + else + index = size + 1 + end + local append = index == size + 1 + local line = index - 1 + if type(nodes) == 'string' then + self[index] = nodes + + else + local bufnr = self.bufnr + local col = 0 + if type(nodes[1]) == 'string' then + self[index] = nodes[1] + nodes:load(bufnr, line, col) + + else + 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 + end + if append then + self.size = self.size + 1 + end + end, + + del = function(self, _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 = function(self, name, option) + api.nvim_buf_set_option(self.bufnr, name, option) + end, + + option = function(self, name) + return api.nvim_buf_get_option(self.bufnr, name) + end, + + is_valid = function(self) + return api.nvim_buf_is_valid(self.bufnr) + end, + + delete = function(self) + api.nvim_buf_delete(self.bufnr, { force = true }) + end, + + len = function(self) + return api.nvim_buf_line_count(self.bufnr) - 1 + end, + + map = function(self, key, operation) + vim.keymap.set('n', key, operation, { + buffer = self.bufnr, + silent = true, + }) + end, + + normal = function(self, key) + api.nvim_buf_call(self.bufnr, function() + vim.cmd([[normal! ]] .. key) + end) + end, + + lines = function(self, 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, + + height = function(self, opts) + local width = opts.width + local wrap = opts.wrap or false + + local lines = self:lines() + local size = #lines + + if wrap then + local height = 0 + for i = 1, size do + height = height + math.max(1, (math.ceil(lines[i]:width() / width))) + end + return height + else + return size + end + end, + + init = function(self) + self.bufnr = api.nvim_create_buf(false, false) + self:set('filetype', 'Trans') + self:set('buftype', 'nofile') + self.size = 0 + end, +} + +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 + +buffer.__newindex = function(self, key, text) + assert(key <= self.size + 1) + fn.setbufline(self.bufnr, key, text) +end + + +return function() + return setmetatable({ + bufnr = -1, + size = 0, + }, buffer) +end diff --git a/lua/Trans/content.lua b/lua/Trans/content.lua deleted file mode 100644 index ee5f400..0000000 --- a/lua/Trans/content.lua +++ /dev/null @@ -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 diff --git a/lua/Trans/init.lua b/lua/Trans/init.lua index 39dba3c..2d91f4e 100644 --- a/lua/Trans/init.lua +++ b/lua/Trans/init.lua @@ -255,4 +255,6 @@ M.translate = function(mode, view) end end +M.ns = api.nvim_create_namespace('Trans') + return M diff --git a/lua/Trans/node.lua b/lua/Trans/node.lua index 7c8b48c..0de11b4 100644 --- a/lua/Trans/node.lua +++ b/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 add_hl = api.nvim_buf_add_highlight +local ns = require('Trans').ns + +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 width = opts.width + local spin = opts.spin or ' ' + local size = text.size + + local text_width = text[1]:width() + local space = math.max(math.floor((width - text_width) / (size - 1)), 0) + if space > 0 then + text.step = spin:rep(space) + end + return text end, } diff --git a/lua/Trans/query/baidu.lua b/lua/Trans/query/baidu.lua index d98c0ec..cd23dd6 100644 --- a/lua/Trans/query/baidu.lua +++ b/lua/Trans/query/baidu.lua @@ -41,16 +41,16 @@ 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, }) diff --git a/lua/Trans/query/offline.lua b/lua/Trans/query/offline.lua index 46a2733..4cfdbcb 100644 --- a/lua/Trans/query/offline.lua +++ b/lua/Trans/query/offline.lua @@ -16,8 +16,9 @@ vim.api.nvim_create_autocmd('VimLeavePre', { end }) + return function(word) - local res = dict:select('stardict', { + local res = (dict:select('stardict', { where = { word = word, }, @@ -33,6 +34,20 @@ 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, + } + res.word = nil + res.oxford = nil + res.collins = nil + res.phonetic = nil + end + + return res end diff --git a/lua/Trans/util/animation.lua b/lua/Trans/util/display.lua similarity index 53% rename from lua/Trans/util/animation.lua rename to lua/Trans/util/display.lua index 8e74d7c..049d16e 100644 --- a/lua/Trans/util/animation.lua +++ b/lua/Trans/util/display.lua @@ -1,33 +1,35 @@ -local display = function(self) - local callback = self.callback or function() +return function(opts) + local callback = opts.callback or function() end + opts.run = true - local target = self.times - if self.sync then + local target = opts.times + if opts.sync then if target then for i = 1, target do - if self.run then - self:frame(i) + if opts.run then + opts:frame(i) end end else - while self.run do - self:frame() + while opts.run do + opts:frame() end end callback() + else local frame if target then local times = 0 frame = function() - if self.run and times < target then + if opts.run and times < target then times = times + 1 - self:frame(times) - vim.defer_fn(frame, self.interval) + opts:frame(times) + vim.defer_fn(frame, opts.interval) else callback() end @@ -35,9 +37,9 @@ local display = function(self) else frame = function() - if self.run then - self:frame() - vim.defer_fn(frame, self.interval) + if opts.run then + opts:frame() + vim.defer_fn(frame, opts.interval) else callback() end @@ -45,11 +47,5 @@ local display = function(self) end frame() end -end - - -return function(opts) - opts.run = true - opts.display = display return opts end diff --git a/lua/Trans/view/hover.lua b/lua/Trans/view/hover.lua index 3a00c71..8e41ae8 100644 --- a/lua/Trans/view/hover.lua +++ b/lua/Trans/view/hover.lua @@ -1,55 +1,56 @@ 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 - --- content utility -local node = require("Trans.node") -local t = node.text +local node = require('Trans.node') local it = node.item +local t = node.text +local f = node.format -local m_indent = ' ' +local function handle_result(result) + local icon = conf.icon + local notfound = icon.notfound + local indent = ' ' -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 word = title.word + 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(result.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 +65,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 +82,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 +103,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 +128,306 @@ 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) + if hover.auto_play then + result.title.word:play() + end - for trs in vim.gsplit(m_result.translation, '\n', true) do - m_content:addline( - it(m_indent .. trs, 'TransTranslation') + addtitle('中文翻译') + + 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 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' + local task = opts.task -local cmd_id -local pin -local next -local action -action = { - pageup = function() - m_window:normal('gg') - end, + local win = require('Trans.window') { + col = col, + row = row, + task = task, + buf = buffer, + relative = relative, + width = width, + height = height, + title = hover.title, + border = hover.border, + animation = hover.animation, + zindex = 100, + enter = false, + ns = require('Trans').ns, + } + return win +end - pagedown = function() - m_window:normal('G') - 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, { buffer = cur_buf }) 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 = win.id + local action = { + pageup = function() + buffer:normal('gg') + end, + + pagedown = function() + buffer:normal('G') + end, + + pin = function() + if lock then + error('too many window') + else + lock = true + end + pcall(api.nvim_del_autocmd, cmd_id) + local width = win.width + local height = win.height + local col = vim.o.columns - width - 3 + local buf = buffer.bufnr + win:try_close() + win.tasks:add(function() + win = open_window { + width = width, + height = height, + relative = 'editor', + col = col, + task = function(self) + self:set('wrap', true) + end, } - 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 - + del('n', keymap.pin, { buffer = cur_buf }) 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) + win:try_close() + win.tasts:add(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, { buffer = cur_buf }) + 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 + local opts = { buffer = cur_buf, silent = true } + for act, key in pairs(hover.keymap) do + set('n', key, action[act], opts) 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) + callback = function(opt) + win:try_close() + win.tasks:add(function() + buffer:delete() + try_del_keymap() + end) + api.nvim_del_autocmd(opt.id) end, }) end end + +local function online_query(win, word) + -- FIXME : + 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) + + else + for i = 1, size do + lists[size] = require('Trans.query.' .. engines[i])(word) + end + local win_width = win.width + local cell = icon.cell + local spinner = require('Trans.ui.spinner')[hover.spinner] + local range = #spinner + + local timeout = hover.timeout + local interval = math.floor(timeout / (win.width - spinner[1]:width())) + + local s = '%s %s' + local width = hover.width + local height = hover.height + buffer:set('modifiable', true) + + require('Trans.util.display') { + times = win_width, + interval = interval, + frame = function(self, times) + for i, v in ipairs(lists) do + local res = v[1] + if res then + vim.pretty_print(res) + buffer:del(1) + win:set_width(width) + handle_result(res) + local actual_height = buffer:height { + width = width, + wrap = true, + } + height = math.min(height, actual_height) + + win:expand { + field = 'height', + target = height, + } + + win.tasks:add(function(this) + this:set('wrap', true) + handle_keymap(this, word) + end) + + self.run = false + return + + elseif res == false then + lists:remove(i) + size = size - 1 + end + end + + local line + if size == 0 or times == win_width then + line = error_line + self.run = false + win:set('wrap', true) + handle_keymap(win, word) + + else + line = it(s:format(spinner[times % range + 1], cell:rep(times)), 'MoreMsg') + end + + buffer:addline(line, 1) + end, + + callback = function() + buffer:set('modifiable', false) + end, + } + end +end + +return function(word) + buffer:init() + local result = require('Trans.query.offline')(word) + + local opts + if result then + handle_result(result) + + local width = hover.width + local height = math.min(buffer:height { + width = width, + wrap = true, + }, hover.height) + + opts = { + width = width, + height = height, + task = function(self) + self:set('wrap', true) + handle_keymap(self, word) + end + } + + else + opts = { + width = error_msg:width(), + height = 1, + task = function(win) + online_query(win, word) + end + } + end + + open_window(opts) +end diff --git a/lua/Trans/window.lua b/lua/Trans/window.lua index b7a19bf..55be0fd 100644 --- a/lua/Trans/window.lua +++ b/lua/Trans/window.lua @@ -1,29 +1,23 @@ 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 - vim.wait(50) - end - 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[] 窗口内容的对象数组 - ----@type window local window = { + set_buf = function(self, buf) + api.nvim_win_set_buf(self.winid, buf) + end, + + is_valid = function(self) + return api.nvim_win_is_valid(self.winid) + end, + set = function(self, option, value) api.nvim_win_set_option(self.winid, option, value) end, + option = function(self, name) + return api.nvim_win_get_option(self.winid, name) + end, + set_height = function(self, height) api.nvim_win_set_height(self.winid, height) self.height = height @@ -34,214 +28,171 @@ local window = { 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() + expand = function(self, opts) + self:lock() 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 + local field = opts.field + local target = opts.target + local interval = opts.interval or self.animation.interval + local callback = function() self:set('wrap', wrap) - if opts.callback then - opts.callback() + local tasks = self.tasks + for i = 1, #tasks do + tasks[i](self) + tasks[i] = nil end + self:unlock() end - lock() - if animation then - local interval = self.animation.interval - local field = ({ - fold = 'height', - slid = 'width', - })[animation] + local cur = self[field] + local times = math.abs(target - cur) - local method = api['nvim_win_set_' .. field] - local winid = self.winid - new_animation({ + if times ~= 0 then + local frame + local method = 'set_' .. field + if target > cur then + frame = function(_, cur_times) + self[method](self, cur + cur_times) + end + + elseif target < cur then + frame = function(_, cur_times) + self[method](self, cur - cur_times) + end + end + + display { + times = times, + frame = frame, 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) + try_close = function(self) + if self:is_valid() then + local winid = self.winid + self.tasks:add(function() + api.nvim_win_close(winid, true) + end) - 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 + local animation = self.animation + local field = ({ + slid = 'width', + fold = 'height', + })[animation.close] - 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() + if field then + --- 播放动画 + self:expand { + field = field, + target = 1, + debug = true, + } 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 + lock = function(self) + while self.busy do + vim.wait(50) end + self.busy = true - self.winid = api.nvim_open_win(self.bufnr, entry, self.config) - self:open(opt) + end, + + unlock = function(self) + self.busy = false end, set_hl = function(self, name, opts) - api.nvim_set_hl(self.hl, name, opts) + api.nvim_set_hl(self.ns, 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] + center = function(self, 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, } - window.__index = window +return function(opts) + assert(type(opts) == 'table') + local buf = opts.buf + local height = opts.height + local width = opts.width + local col = opts.col + local row = opts.row + local border = opts.border + local title = opts.title + local relative = opts.relative + local zindex = opts.zindex or 100 + local enter = opts.enter + local ns = opts.ns + local animation = opts.animation + local task = opts.task + local open = animation.open ----窗口对象的构造器 ----@param entry boolean 光标初始化时是否应该进入窗口 ----@param option table 需要设置的选项 ----@return window win ----@nodiscard -return function(entry, option) - vim.validate { - entry = { entry, 'b' }, - option = { option, 't' }, - } - - 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, + tasks = { + add = table.insert, + }, + height = win_opt.height, + width = win_opt.width, + animation = animation, + winid = api.nvim_open_win(buf.bufnr, enter, win_opt), + }, window) + + if task then + win.tasks:add(task) + end + + win:expand { + field = field, + target = opts[field], } - ---@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 end