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

feat: start to support float view style and add some configuration

Browse Source
This commit is contained in:
JuanZoran 2023-01-19 23:22:46 +08:00
parent e80e6efbc8
commit 373a1e4914
4 changed files with 118 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lua/Trans/init.lua
View File

@ -14,9 +14,7 @@ M.conf = {
border = 'rounded',
title = {
{ '', 'TransTitleRound' },
-- { '', 'TransTitleRound' },
{ ' Trans', 'TransTitle' },
-- { '', 'TransTitleRound' },
{ '', 'TransTitleRound' },
},
},
@ -26,9 +24,7 @@ M.conf = {
border = 'rounded',
title = {
{ '', 'TransTitleRound' },
-- { '', 'TransTitleRound' },
{ ' Trans', 'TransTitle' },
-- { '', 'TransTitleRound' },
{ '', 'TransTitleRound' },
},
},
@ -61,7 +57,7 @@ M.conf = {
},
db_path = '$HOME/.vim/dict/ultimate.db',
keymap = {
-- TODO
-- TODO :
hover = {
pageup = '[[',
pagedown = ']]',
@ -97,6 +93,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)
M.translate = require('Trans.translate')
require("Trans.setup")
end

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

@ -1,43 +1,23 @@
-- local function generate_opts(view)
-- -- TODO :
-- vim.validate {
-- view = { view, 's' },
-- }
-- local hover = conf.hover
-- local float = conf.float
-- local title_pos = 'center'
-- local title = {
-- { '', 'TransTitleRound' },
-- -- { '', 'TransTitleRound' },
-- { conf.icon.title .. ' Trans', 'TransTitle' },
-- -- { '', 'TransTitleRound' },
-- { '', 'TransTitleRound' },
-- }
--
-- return ({
-- hover = {
-- relative = 'cursor',
-- width = hover.width,
-- height = hover.height,
-- border = hover.border,
-- title = title,
-- title_pos = title_pos,
-- focusable = false,
-- zindex = 100,
-- col = 2,
-- row = 2,
-- },
-- float = {
-- relative = 'editor',
-- width = float.width,
-- height = float.height,
-- border = float.border,
-- title = title,
-- title_pos = title_pos,
-- focusable = false,
-- zindex = 75,
-- row = math.floor((vim.o.lines - float.height) / 2),
-- col = math.floor((vim.o.columns - float.width) / 2),
-- },
-- })[view]
-- end
local conf = require('Trans').conf
local m_window
local m_result
return function(word)
-- TODO :online query
m_result = require('Trans.query.offline')(word)
m_window = require('Trans.window')
local float = conf.window.float
float.row = math.floor((vim.o.lines - float.height) / 2)
float.col = math.floor((vim.o.columns - float.width) / 2)
float.relative = 'editor'
-- 创建窗口
m_window.init(true, float)
m_window.center('https:github.com/JuanZoran/Trans.nvim', '@text.uri') -- only show color with treesiter
m_window.draw()
m_window.map('q', function ()
m_window.try_close(9)
end)
end

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

@ -172,7 +172,17 @@ local process = {
}
local function handle(word)
local action = {
pageup = function()
m_window.normal('gg')
end,
pagedown = function()
m_window.normal('G')
end,
}
return function (word)
vim.validate {
word = { word, 's' },
}
@ -185,7 +195,6 @@ local function handle(word)
hover.row = 2
m_window.init(false, hover)
if m_result then
for _, field in ipairs(conf.order) do
process[field]()
@ -197,15 +206,22 @@ local function handle(word)
m_window.draw()
-- Auto Close
vim.api.nvim_create_autocmd(
{ 'InsertEnter', 'CursorMoved', 'BufLeave', }, {
{ --[[ 'InsertEnter', ]] 'CursorMoved', 'BufLeave', }, {
buffer = 0,
once = true,
callback = m_window.try_close,
callback = function ()
m_window.try_close(13) -- NOTE :maybe can be passed by uesr
end,
})
m_window.set('wrap', true)
m_window.adjust()
end
return handle
for act, key in pairs(conf.keymap.hover) do
vim.keymap.set('n', key, function()
if m_window.is_open() then
action[act]()
end
end)
end
end

102
lua/Trans/window.lua
View File

@ -1,24 +1,24 @@
local M = {}
local api = vim.api
-- local conf = require('Trans').conf
--- =================== Window Attributes ================================
-- M.height --> 窗口的高度
-- M.size --> 窗口的行数
-- M.width --> 窗口的宽度
-- M.winid --> 窗口的handle
-- M.bufnr --> 窗口对应的buffer的handle
M.bufnr = api.nvim_create_buf(false, true)
M.hl = api.nvim_create_namespace('TransWinHl')
-- M.<++> --> <++>
local M = {
height = 0, -- 窗口的当前的高度
size = 0, -- 窗口的行数
width = 0, -- 窗口的当前的宽度
lines = {},
highlights = {},
winid = -1, -- 窗口的handle
bufnr = -1, -- 窗口对应的buffer的handle
hl = api.nvim_create_namespace('TransWinHl'),
}
api.nvim_buf_set_option(M.bufnr, 'filetype', 'Trans')
-- M.<++> --> <++>
function string:width()
---@diagnostic disable-next-line: param-type-mismatch
return vim.fn.strwidth(self)
end
--- =================== Load Window Options ================================
--- =================== Load Window Options ================================
M.init = function(entry, opts)
vim.validate {
entry = { entry, 'b' },
@ -44,8 +44,11 @@ M.init = function(entry, opts)
M.height = opt.height
M.width = opt.width
M.bufnr = api.nvim_create_buf(false, true)
M.winid = api.nvim_open_win(M.bufnr, entry, opt)
M.set('winhl', 'Normal:TransWin,FloatBorder:TransBorder')
M.bufset('bufhidden', 'wipe')
M.bufset('filetype', 'Trans')
M.wipe()
end
@ -62,7 +65,6 @@ M.draw = function()
-- vim.pretty_print(M.highlights)
end
---清空window的数据
M.wipe = function()
M.size = 0
@ -75,18 +77,22 @@ M.is_open = function()
return M.winid > 0 and api.nvim_win_is_valid(M.winid)
end
M.try_close = function()
---安全的关闭窗口
---@param interval integer 窗口关闭动画的间隔
M.try_close = function(interval)
if M.is_open() then
local function narrow()
if M.height > 1 then
M.height = M.height - 1
api.nvim_win_set_height(M.winid, M.height)
vim.defer_fn(narrow, 13)
vim.defer_fn(narrow, interval)
else
-- Wait animation done
vim.defer_fn(function()
api.nvim_win_close(M.winid, true)
end, 15)
M.winid = -1
end, interval + 2)
end
end
@ -124,6 +130,8 @@ M.adjust = function()
end
end
---- ============ Utility functions ============
---设置窗口选项
---@param option string 需要设置的窗口
---@param value any 需要设置的值
@ -131,7 +139,6 @@ M.set = function(option, value)
api.nvim_win_set_option(M.winid, option, value)
end
---设置窗口对应buffer的选项
---@param option string 需要设置的窗口
---@param value any 需要设置的值
@ -140,11 +147,25 @@ M.bufset = function(option, value)
end
M.normal = function(key)
api.nvim_buf_call(M.bufnr, function()
vim.cmd([[normal! ]] .. key)
end)
end
---设置该窗口的本地的键映射(都为normal模式)
---@param key string 映射的键
---@param operation any 执行的操作
M.map = function(key, operation)
-- api.nvim_buf_set_keymap(M.bufnr, 'n', key, operation, { silent = true, noremap = true, })
vim.keymap.set('n', key, operation, {
silent = true,
buffer = M.bufnr,
})
end
--- =================== Window lines ================================
M.lines = {}
---- ============ Utility functions ============
local function insert_line(text)
vim.validate {
text = { text, 's' },
@ -154,9 +175,6 @@ local function insert_line(text)
M.lines[M.size] = text
end
local function current_line_index()
return M.size - 1
end
---向窗口中添加新行
---@param newline string 待添加的新行
@ -167,13 +185,33 @@ M.addline = function(newline, opt)
if type(opt) == 'string' then
table.insert(M.highlights, {
name = opt,
line = current_line_index(), -- NOTE : 高亮的行号是以0为第一行
line = M.size - 1, -- NOTE : 高亮的行号是以0为第一行
_start = 0,
_end = -1,
})
elseif type(opt) == 'table' then
-- TODO :
error('TODO')
-- elseif type(opt) == 'table' then
-- -- TODO :
-- error('TODO')
end
end
---添加一行新的内容并居中
---@param text string 需要居中的文本
---@param highlight? string 可选的高亮组
M.center = function(text, highlight)
vim.validate {
text = { text, 's' }
}
local space = math.floor((M.width - text:width()) / 2)
local interval = (' '):rep(space)
insert_line(interval .. text)
if highlight then
table.insert(M.highlights, {
name = highlight,
line = M.size - 1,
_start = space,
_end = space + #text,
})
end
end
@ -202,7 +240,7 @@ M.line_wrap = function()
if item[2] then
table.insert(M.highlights, {
name = item[2],
line = current_line_index() + 1,
line = M.size, -- NOTE : 此时还没插入新行, size ==> 行号(zero index)
_start = #value,
_end = #value + #item[1],
})
@ -222,6 +260,7 @@ M.line_wrap = function()
end
M.text_wrap = function()
insert_line('')
local l = M.size
@ -232,7 +271,7 @@ M.text_wrap = function()
local _end = _start + #text
table.insert(M.highlights, {
name = highlight,
line = current_line_index(),
line = M.size - 1,
_start = _start,
_end = _end,
})
@ -243,9 +282,8 @@ M.text_wrap = function()
end
--- =================== Window Highlights ================================
M.highlights = {}
--- =================== Window Highlights ================================
--- TODO : add helpful function for highlights
return M