refactor: remove conf.query, use conf.frontend.query
This commit is contained in:
JuanZoran
parent
6def81f2c6
commit
a3b0a21d08
@ -6,7 +6,6 @@
|
||||
return {
|
||||
---@type string the directory for database file and password file
|
||||
dir = require('Trans').relative_path({ 'extra' }, true),
|
||||
query = 'fallback',
|
||||
debug = true,
|
||||
---@type 'default' | 'dracula' | 'tokyonight' global Trans theme [see lua/Trans/style/theme.lua]
|
||||
theme = 'default', -- default | tokyonight | dracula
|
||||
@ -22,8 +21,9 @@ return {
|
||||
---@class TransFrontendOpts
|
||||
---@field keymaps table<string, string>
|
||||
default = {
|
||||
border = 'rounded',
|
||||
title = vim.fn.has('nvim-0.9') == 1 and {
|
||||
query = 'fallback',
|
||||
border = 'rounded',
|
||||
title = vim.fn.has('nvim-0.9') == 1 and {
|
||||
{ '', 'TransTitleRound' },
|
||||
{ ' Trans', 'TransTitle' },
|
||||
{ '', 'TransTitleRound' },
|
||||
@ -35,22 +35,22 @@ return {
|
||||
close = 'slid',
|
||||
interval = 12,
|
||||
},
|
||||
timeout = 2000,
|
||||
timeout = 2000,
|
||||
},
|
||||
---@class TransHoverOpts : TransFrontendOpts
|
||||
hover = {
|
||||
---@type integer Max Width of Hover Window
|
||||
width = 37,
|
||||
width = 37,
|
||||
---@type integer Max Height of Hover Window
|
||||
height = 27,
|
||||
height = 27,
|
||||
---@type string -- see: /lua/Trans/style/spinner
|
||||
spinner = 'dots',
|
||||
---@type string -- TODO :support replace with {{special word}}
|
||||
fallback_message = '{{notfound}} 翻译超时或没有找到相关的翻译',
|
||||
auto_resize = true,
|
||||
-- strict_sentence_width = false,
|
||||
padding = 10, -- padding for hover window width
|
||||
keymaps = {
|
||||
spinner = 'dots',
|
||||
---@type string
|
||||
fallback_message = '{{notfound}} 翻译超时或没有找到相关的翻译',
|
||||
auto_resize = true,
|
||||
unlimit_sentence_width = true,
|
||||
padding = 10, -- padding for hover window width
|
||||
keymaps = {
|
||||
pageup = '[[',
|
||||
pagedown = ']]',
|
||||
pin = '<leader>[',
|
||||
@ -59,13 +59,13 @@ return {
|
||||
-- play = '_', -- Deprecated
|
||||
},
|
||||
---@type string[] auto close events
|
||||
auto_close_events = {
|
||||
auto_close_events = {
|
||||
'InsertEnter',
|
||||
'CursorMoved',
|
||||
'BufLeave',
|
||||
},
|
||||
---@type table<string, string[]> order to display translate result
|
||||
order = {
|
||||
order = {
|
||||
default = {
|
||||
'str',
|
||||
'translation',
|
||||
@ -87,7 +87,7 @@ return {
|
||||
}
|
||||
},
|
||||
---@type table<string, string>
|
||||
icon = {
|
||||
icon = {
|
||||
-- or use emoji
|
||||
list = '●', -- ● | ○ | ◉ | ◯ | ◇ | ◆ | ▪ | ▫ | ⬤ | 🟢 | 🟡 | 🟣 | 🟤 | 🟠| 🟦 | 🟨 | 🟧 | 🟥 | 🟪 | 🟫 | 🟩 | 🟦
|
||||
star = '', -- ⭐ | ✴ | ✳ | ✲ | ✱ | ✰ | ★ | ☆ | 🌟 | 🌠 | 🌙 | 🌛 | 🌜 | 🌟 | 🌠 | 🌌 | 🌙 |
|
||||
|
||||
@ -79,6 +79,7 @@ local function process(opts)
|
||||
local str = opts.str
|
||||
if not str or str == '' then return end
|
||||
|
||||
|
||||
-- Find in cache
|
||||
if Trans.cache[str] then
|
||||
local data = Trans.cache[str]
|
||||
@ -87,7 +88,7 @@ local function process(opts)
|
||||
end
|
||||
|
||||
local data = Trans.data.new(opts)
|
||||
if strategy[Trans.conf.query](data) then
|
||||
if strategy[data.frontend.opts.query](data) then
|
||||
Trans.cache[data.str] = data
|
||||
data.frontend:process(data)
|
||||
else
|
||||
|
||||
@ -19,7 +19,6 @@ end
|
||||
---@field play function @Use tts to play string
|
||||
|
||||
|
||||
|
||||
local separator = vim.loop.os_uname().sysname == "Windows" and "\\" or "/"
|
||||
---@class Trans
|
||||
---@field style table @Style module
|
||||
|
||||
@ -7,6 +7,10 @@ local util = require('Trans').util
|
||||
|
||||
---@class TransItem : TransNode
|
||||
local item_meta = {
|
||||
---@param self TransItem
|
||||
---@param buffer TransBuffer
|
||||
---@param line integer
|
||||
---@param col integer
|
||||
render = function(self, buffer, line, col)
|
||||
if self[2] then
|
||||
buffer:add_highlight(line, self[2], col, col + #self[1])
|
||||
@ -25,7 +29,7 @@ local text_meta = {
|
||||
render = function(self, buffer, line, col)
|
||||
local nodes = self.nodes
|
||||
local step = self.step
|
||||
local len = step and #step or 0
|
||||
local len = step and #step or 0
|
||||
|
||||
for _, node in ipairs(nodes) do
|
||||
node:render(buffer, line, col)
|
||||
@ -48,7 +52,7 @@ end
|
||||
|
||||
|
||||
---@param nodes {[number]: TransNode, step: string?}
|
||||
---@return table
|
||||
---@return TransText
|
||||
local function text(nodes)
|
||||
return setmetatable({
|
||||
[1] = table.concat(util.list_fields(nodes, 1), nodes.step),
|
||||
@ -59,6 +63,7 @@ end
|
||||
|
||||
|
||||
---@param args {[number]: TransNode, width: integer, spin: string?}
|
||||
---@return TransText
|
||||
local function format(args)
|
||||
local width = args.width
|
||||
local spin = args.spin or " "
|
||||
@ -68,11 +73,11 @@ local function format(args)
|
||||
wid = wid + args[i][1]:width()
|
||||
end
|
||||
|
||||
local space = math.max(math.floor((width - wid) / (size - 1)), 0)
|
||||
|
||||
args.step = spin:rep(space)
|
||||
args.width = nil
|
||||
args.spin = nil
|
||||
local space = math.max(math.floor((width - wid) / (size - 1)), 0)
|
||||
args.step = spin:rep(space)
|
||||
args.width = nil
|
||||
args.spin = nil
|
||||
|
||||
---@diagnostic disable-next-line: param-type-mismatch
|
||||
return text(args)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user