tqcq/Trans.nvim
0
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

fix: 取消了回调的设计, 修复了部分bug

Browse Source 
将回调的接口换成了run的函数接口, 修复了在线查询, 自动命令, 窗口显示的bug
This commit is contained in:
JuanZoran 2023-02-03 15:27:00 +08:00
parent 8b8879b2cd
commit 6f75ba057b
9 changed files with 284 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install.sh
View File

@ -12,7 +12,7 @@ wget https://github.com/skywind3000/ECDICT-ultimate/releases/download/1.0.0/ecdi
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` uNames=$(uname -s)
osName=${uNames: 0: 4} osName=${uNames: 0: 4}
if [ "$osName" != "Linux" ];then if [ "$osName" != "Linux" ];then
cd ./tts/ && npm install cd ./tts/ && npm install

17
lua/Trans/buffer.lua
View File

@ -42,6 +42,11 @@ local buffer = {
end end
end, end,
wipe = function(self)
api.nvim_buf_set_lines(self.bufnr, 0, -1, false, {})
self.size = 0
end,
del = function(self, _start, _end) del = function(self, _start, _end)
if not _start then if not _start then
fn.deletebufline(self.bufnr, '$') fn.deletebufline(self.bufnr, '$')
@ -91,14 +96,10 @@ local buffer = {
return api.nvim_buf_get_lines(self.bufnr, i, j, false) return api.nvim_buf_get_lines(self.bufnr, i, j, false)
end, end,
height = function(self, opts) height = function(self, width)
local width = opts.width local size = self.size
local wrap = opts.wrap or false if width then
local lines = self:lines()
local lines = self:lines()
local size = #lines
if wrap then
local height = 0 local height = 0
for i = 1, size do for i = 1, size do
height = height + math.max(1, (math.ceil(lines[i]:width() / width))) height = height + math.max(1, (math.ceil(lines[i]:width() / width)))

15
lua/Trans/init.lua
View File

@ -2,12 +2,21 @@ local M = {}
local api = vim.api local api = vim.api
local fn = vim.fn local fn = vim.fn
local title = fn.has('nvim-0.9') == 1 and { local win_title = fn.has('nvim-0.9') == 1 and {
{ '', 'TransTitleRound' }, { '', 'TransTitleRound' },
{ ' Trans', 'TransTitle' }, { ' Trans', 'TransTitle' },
{ '', 'TransTitleRound' }, { '', 'TransTitleRound' },
} or nil } or nil
-- local title = {
-- "████████╗██████╗ █████╗ ███╗ ██╗███████╗",
-- "╚══██╔══╝██╔══██╗██╔══██╗████╗ ██║██╔════╝",
-- " ██║ ██████╔╝███████║██╔██╗ ██║███████╗",
-- " ██║ ██╔══██╗██╔══██║██║╚██╗██║╚════██║",
-- " ██║ ██║ ██║██║ ██║██║ ╚████║███████║",
-- " ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═══╝╚══════╝",
--}
string.width = api.nvim_strwidth string.width = api.nvim_strwidth
string.isEn = function(self) string.isEn = function(self)
@ -41,7 +50,7 @@ M.conf = {
width = 37, width = 37,
height = 27, height = 27,
border = 'rounded', border = 'rounded',
title = title, title = win_title,
keymap = { keymap = {
pageup = '[[', pageup = '[[',
pagedown = ']]', pagedown = ']]',
@ -71,7 +80,7 @@ M.conf = {
width = 0.8, width = 0.8,
height = 0.8, height = 0.8,
border = 'rounded', border = 'rounded',
title = title, title = win_title,
keymap = { keymap = {
quit = 'q', quit = 'q',
}, },

6
lua/Trans/node.lua
View File

@ -59,12 +59,12 @@ return {
format = function(opts) format = function(opts)
local text = opts.text local text = opts.text
local size = text.size
local width = opts.width local width = opts.width
local spin = opts.spin or ' ' local spin = opts.spin or ' '
local size = text.size
local text_width = text[1]:width() local wid = text[1]:width()
local space = math.max(math.floor((width - text_width) / (size - 1)), 0) local space = math.max(math.floor((width - wid) / (size - 1)), 0)
if space > 0 then if space > 0 then
text.step = spin:rep(space) text.step = spin:rep(space)
end end

39
lua/Trans/query/youdao.lua
View File

@ -1,24 +1,20 @@
local youdao = require("Trans").conf.engine.youdao local youdao = require("Trans").conf.engine.youdao
local appKey = youdao.appKey
local appPasswd = youdao.appPasswd
local uri = 'https://openapi.youdao.com/api' local uri = 'https://openapi.youdao.com/api'
local salt = tostring(math.random(bit.rshift(1, 5))) local salt = tostring(math.random(bit.lshift(1, 15)))
local appid = youdao.appid
local appPasswd = youdao.appPasswd
local ok, curl = pcall(require, 'plenary.curl')
if not ok then
error('plenary not found')
end
local post = require('Trans.util.curl').POST
local function get_field(word) local function get_field(word)
-- local to = isEn and 'zh-'
local len = #word local len = #word
local curtime = tostring(os.time()) local curtime = tostring(os.time())
local input = len > 20 and local input = len > 20 and
word:sub(1, 10) .. len .. word:sub(-10) or word word:sub(1, 10) .. len .. word:sub(-10) or word
-- sign=sha256(应用ID+input+salt+curtime+应用密钥)； -- sign=sha256(应用ID+input+salt+curtime+应用密钥)；
local hash = appKey .. input .. salt .. curtime .. appPasswd local hash = appid .. input .. salt .. curtime .. appPasswd
local sign = vim.fn.sha256(hash) local sign = vim.fn.sha256(hash)
return { return {
@ -26,7 +22,7 @@ local function get_field(word)
from = 'auto', from = 'auto',
to = 'zh-CHS', to = 'zh-CHS',
signType = 'v3', signType = 'v3',
appKey = appKey, appKey = appid,
salt = salt, salt = salt,
curtime = curtime, curtime = curtime,
sign = sign, sign = sign,
@ -35,14 +31,15 @@ end
return function(word) return function(word)
-- return result -- return result
local field = get_field(word) -- local field = get_field(word)
local output = curl.post(uri, { -- local output = post(uri, {
body = field, -- body = field,
}) -- })
if output.exit == 0 and output.status == 200 then
local result = vim.fn.json_decode(output.body) -- if output.exit == 0 and output.status == 200 then
if result and result.errorCode == 0 then -- local result = vim.fn.json_decode(output.body)
--- TODO : -- if result and result.errorCode == 0 then
end -- --- TODO :
end -- end
-- end
end end

77
lua/Trans/util/display.lua
View File

@ -1,51 +1,48 @@
return function(opts) return function(opts)
local callback = opts.callback or function()
end
opts.run = true
local target = opts.times local target = opts.times
if opts.sync then opts.run = target ~= 0
if target then
for i = 1, target do
if opts.run then
opts:frame(i)
end
end
else ---@type function[]
while opts.run do local tasks = {}
opts:frame() 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
end end
callback()
else else
local frame frame = function()
if target then if opts.run then
local times = 0 opts:frame()
frame = function() vim.defer_fn(frame, opts.interval)
if opts.run and times < target then else
times = times + 1 do_task()
opts:frame(times)
vim.defer_fn(frame, opts.interval)
else
callback()
end
end
else
frame = function()
if opts.run then
opts:frame()
vim.defer_fn(frame, opts.interval)
else
callback()
end
end end
end end
frame()
end end
return opts frame()
---任务句柄, 如果任务结束了则立即执行, 否则立即执行
---@param task function
return function(task)
if opts.run then
tasks[#tasks + 1] = task
else
task()
end
end
end end

154
lua/Trans/view/float.lua
View File

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

201
lua/Trans/view/hover.lua
View File

@ -14,6 +14,12 @@ local function handle_result(result)
local notfound = icon.notfound local notfound = icon.notfound
local indent = ' ' local indent = ' '
local word = result.title.word
if hover.auto_play then
string.play(word:isEn() and word or result.definition)
end
local addtitle = function(title) local addtitle = function(title)
buffer:addline { buffer:addline {
it('', 'TransTitleRound'), it('', 'TransTitleRound'),
@ -24,13 +30,12 @@ local function handle_result(result)
local process = { local process = {
title = function(title) title = function(title)
local word = title.word
local oxford = title.oxford local oxford = title.oxford
local collins = title.collins local collins = title.collins
local phonetic = title.phonetic local phonetic = title.phonetic
if not phonetic and not collins and not oxford then if not phonetic and not collins and not oxford then
buffer:addline(it(result.word, 'TransWord')) buffer:addline(it(word, 'TransWord'))
else else
buffer:addline(f { buffer:addline(f {
@ -138,10 +143,6 @@ local function handle_result(result)
end, end,
translation = function(translation) translation = function(translation)
if hover.auto_play then
result.title.word:play()
end
addtitle('中文翻译') addtitle('中文翻译')
for trs in vim.gsplit(translation, '\n', true) do for trs in vim.gsplit(translation, '\n', true) do
@ -178,18 +179,17 @@ local function handle_result(result)
end end
local function open_window(opts) local function open_window(opts)
opts = opts or {} opts = opts or {}
local col = opts.col or 1 local col = opts.col or 1
local row = opts.row or 1 local row = opts.row or 1
local width = opts.width or hover.width local width = opts.width or hover.width
local height = opts.height or hover.height local height = opts.height or hover.height
local relative = opts.relative or 'cursor' local relative = opts.relative or 'cursor'
local task = opts.task
local win = require('Trans.window') { return require('Trans.window') {
col = col, col = col,
row = row, row = row,
task = task,
buf = buffer, buf = buffer,
relative = relative, relative = relative,
width = width, width = width,
@ -197,11 +197,10 @@ local function open_window(opts)
title = hover.title, title = hover.title,
border = hover.border, border = hover.border,
animation = hover.animation, animation = hover.animation,
zindex = 100, zindex = 80,
enter = false, enter = false,
ns = require('Trans').ns, ns = require('Trans').ns,
} }
return win
end end
local function handle_keymap(win, word) local function handle_keymap(win, word)
@ -210,13 +209,13 @@ local function handle_keymap(win, word)
local del = vim.keymap.del local del = vim.keymap.del
local function try_del_keymap() local function try_del_keymap()
for _, key in pairs(keymap) do for _, key in pairs(keymap) do
pcall(del, 'n', key, { buffer = cur_buf }) pcall(del, 'n', key)
end end
end end
local lock = false local lock = false
local cmd_id local cmd_id
local next = win.id local next
local action = { local action = {
pageup = function() pageup = function()
buffer:normal('gg') buffer:normal('gg')
@ -228,7 +227,7 @@ local function handle_keymap(win, word)
pin = function() pin = function()
if lock then if lock then
error('too many window') error('请先关闭窗口')
else else
lock = true lock = true
end end
@ -237,19 +236,22 @@ local function handle_keymap(win, word)
local height = win.height local height = win.height
local col = vim.o.columns - width - 3 local col = vim.o.columns - width - 3
local buf = buffer.bufnr local buf = buffer.bufnr
win:try_close() local run = win:try_close()
win.tasks:add(function() run(function()
win = open_window { local w, r = open_window {
width = width, width = width,
height = height, height = height,
relative = 'editor', relative = 'editor',
col = col, col = col,
task = function(self)
self:set('wrap', true)
end,
} }
del('n', keymap.pin, { buffer = cur_buf }) next = w.winid
win = w
r(function()
w:set('wrap', true)
end)
del('n', keymap.pin)
api.nvim_create_autocmd('BufWipeOut', { api.nvim_create_autocmd('BufWipeOut', {
callback = function(opt) callback = function(opt)
if opt.buf == buf or opt.buf == cur_buf then if opt.buf == buf or opt.buf == cur_buf then
@ -263,8 +265,8 @@ local function handle_keymap(win, word)
close = function() close = function()
pcall(api.nvim_del_autocmd, cmd_id) pcall(api.nvim_del_autocmd, cmd_id)
win:try_close() local run = win:try_close()
win.tasts:add(function() run(function()
buffer:delete() buffer:delete()
end) end)
try_del_keymap() try_del_keymap()
@ -276,7 +278,7 @@ local function handle_keymap(win, word)
api.nvim_set_current_win(next) api.nvim_set_current_win(next)
next = prev next = prev
else else
del('n', keymap.toggle_entry, { buffer = cur_buf }) del('n', keymap.toggle_entry)
end end
end, end,
@ -286,31 +288,21 @@ local function handle_keymap(win, word)
end end
end, end,
} }
local set = vim.keymap.set local set = vim.keymap.set
local opts = { buffer = cur_buf, silent = true }
for act, key in pairs(hover.keymap) do for act, key in pairs(hover.keymap) do
set('n', key, action[act], opts) set('n', key, action[act])
end end
if hover.auto_close_events then if hover.auto_close_events then
cmd_id = api.nvim_create_autocmd( cmd_id = api.nvim_create_autocmd(
hover.auto_close_events, { hover.auto_close_events, {
buffer = 0, buffer = 0,
callback = function(opt) callback = action.close,
win:try_close()
win.tasks:add(function()
buffer:delete()
try_del_keymap()
end)
api.nvim_del_autocmd(opt.id)
end,
}) })
end end
end end
local function online_query(win, word) local function online_query(win, word)
-- FIXME :
local lists = { local lists = {
remove = table.remove remove = table.remove
} }
@ -318,116 +310,93 @@ local function online_query(win, word)
local size = #engines local size = #engines
local icon = conf.icon local icon = conf.icon
local error_line = it(error_msg, 'TransFailed') local error_line = it(error_msg, 'TransFailed')
if size == 0 then if size == 0 then
buffer:addline(error_line) buffer:addline(error_line)
else else
for i = 1, size do for i = 1, size do
lists[size] = require('Trans.query.' .. engines[i])(word) lists[size] = require('Trans.query.' .. engines[i])(word)
end end
local cell = icon.cell
local timeout = hover.timeout
local spinner = require('Trans.ui.spinner')[hover.spinner]
local range = #spinner
local interval = math.floor(timeout / (win.width - spinner[1]:width()))
local win_width = win.width local 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 s = '%s %s'
local width = hover.width local width = hover.width
local height = hover.height local height = hover.height
buffer:set('modifiable', true) local function waitting_result(self, times)
for i = 1, size do
local res = lists[i][1]
if res then
buffer:wipe()
win:set_width(width)
handle_result(res)
local actual_height = buffer:height(width)
height = math.min(height, actual_height)
require('Trans.util.display') { win:expand {
field = 'height',
target = height,
}
self.run = false
return
elseif res == false then
lists:remove(i)
size = size - 1
end
end
if size == 0 or times == win_width then
buffer:addline(error_line, 1)
self.run = false
else
buffer:addline(it(s:format(spinner[times % range + 1], cell:rep(times)), 'MoreMsg'), 1)
end
end
buffer:set('modifiable', true)
local run = require('Trans.util.display') {
times = win_width, times = win_width,
interval = interval, interval = interval,
frame = function(self, times) frame = waitting_result,
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,
} }
run(function()
buffer:set('modifiable', false)
end)
end end
end end
---处理不同hover模式的窗口
---@param word string 待查询的单词
return function(word) return function(word)
buffer:init() buffer:init()
local result = require('Trans.query.offline')(word) local result = require('Trans.query.offline')(word)
local opts
if result then if result then
handle_result(result) handle_result(result)
local width = hover.width local width = hover.width
local height = math.min(buffer:height { local win, run = open_window {
width = width, width = width,
wrap = true, height = math.min(buffer:height(width), hover.height)
}, hover.height)
opts = {
width = width,
height = height,
task = function(self)
self:set('wrap', true)
handle_keymap(self, word)
end
} }
run(function()
win:set('wrap', true)
handle_keymap(win, word)
end)
else else
opts = { local win, run = open_window {
width = error_msg:width(), width = error_msg:width(),
height = 1, height = 1,
task = function(win)
online_query(win, word)
end
} }
end
open_window(opts) run(function()
win:set('wrap', true)
handle_keymap(win, word)
online_query(win, word)
end)
end
end end

106
lua/Trans/window.lua
View File

@ -30,71 +30,52 @@ local window = {
expand = function(self, opts) expand = function(self, opts)
self:lock() self:lock()
local field = opts.field
local target = opts.target
local cur = self[field]
local times = math.abs(target - cur)
local wrap = self:option('wrap') local wrap = self:option('wrap')
self:set('wrap', false) self:set('wrap', false)
local field = opts.field
local target = opts.target
local interval = opts.interval or self.animation.interval local interval = opts.interval or self.animation.interval
local callback = function() local method = 'set_' .. field
local frame = target > cur and function(_, cur_times)
self[method](self, cur + cur_times)
end or function(_, cur_times)
self[method](self, cur - cur_times)
end
local run = display {
times = times,
frame = frame,
interval = interval,
}
run(function()
self:set('wrap', wrap) self:set('wrap', wrap)
local tasks = self.tasks
for i = 1, #tasks do
tasks[i](self)
tasks[i] = nil
end
self:unlock() self:unlock()
end end)
return run
local cur = self[field]
local times = math.abs(target - cur)
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,
callback = callback,
}
else
callback()
end
end, end,
try_close = function(self) try_close = function(self)
if self:is_valid() then if self:is_valid() then
local winid = self.winid local winid = self.winid
self.tasks:add(function()
api.nvim_win_close(winid, true)
end)
local animation = self.animation
local field = ({ local field = ({
slid = 'width', slid = 'width',
fold = 'height', fold = 'height',
})[animation.close] })[self.animation.close]
if field then --- 播放动画
--- 播放动画 local run = self:expand {
self:expand { field = field,
field = field, target = 1,
target = 1, }
debug = true, run(function()
} api.nvim_win_close(winid, true)
end end)
return run
end end
end, end,
@ -125,6 +106,10 @@ local window = {
} }
window.__index = window window.__index = window
---window的构造函数
---@param opts table
---@return table
---@return function
return function(opts) return function(opts)
assert(type(opts) == 'table') assert(type(opts) == 'table')
local buf = opts.buf local buf = opts.buf
@ -139,7 +124,6 @@ return function(opts)
local enter = opts.enter local enter = opts.enter
local ns = opts.ns local ns = opts.ns
local animation = opts.animation local animation = opts.animation
local task = opts.task
local open = animation.open local open = animation.open
@ -173,26 +157,18 @@ return function(opts)
local win = setmetatable({ local win = setmetatable({
buf = buf, buf = buf,
ns = ns, ns = ns,
tasks = {
add = table.insert,
},
height = win_opt.height, height = win_opt.height,
width = win_opt.width, width = win_opt.width,
animation = animation, animation = animation,
winid = api.nvim_open_win(buf.bufnr, enter, win_opt), winid = api.nvim_open_win(buf.bufnr, enter, win_opt),
}, window) }, window)
if task then
win.tasks:add(task)
end
win:expand {
field = field,
target = opts[field],
}
api.nvim_win_set_hl_ns(win.winid, win.ns) api.nvim_win_set_hl_ns(win.winid, win.ns)
win:set_hl('Normal', { link = 'TransWin' }) win:set_hl('Normal', { link = 'TransWin' })
win:set_hl('FloatBorder', { link = 'TransBorder' }) win:set_hl('FloatBorder', { link = 'TransBorder' })
return win
return win, win:expand {
field = field,
target = opts[field],
}
end end