feat: add more bugs

README.md

@@ -30,7 +30,7 @@
 - 支持 `normal`和 `visual`模式
 > 不支持 visual-block mode
   
-- 词库单词量: `43w`
+- 本地词库单词量: `430w`
   
 ## 屏幕截图
 ![ScreenShot](./screenshot.gif)

lua/Trans/component/content.lua

@@ -12,14 +12,12 @@ function M:new()
     return content
 end
 
-
-
 -- NOTE :
 -- local items = {
 --     -- style1: string 不需要单独设置高亮的情况
---     'text', 
+--     'text',
 --     -- style2: string[] 需要设置高亮，第二个名称为高亮组
---     {'text2', 'highlight name'}, 
+--     {'text2', 'highlight name'},
 -- }
 
 -- local opts = {
@@ -28,7 +26,7 @@ end
 --     indent = 4 -- integer 该行的应该在开头的缩进
 --     interval = 4 -- integer 该行组件的间隔
 -- }
-function M:insert_items_to_line(items)
+function M:insert(items)
     type_check {
         items = { items, 'table' },
     }
@@ -57,7 +55,6 @@ function M:insert_items_to_line(items)
     self.lines[self.size] = line
 end
 
-
 ---Usage:
 ---     local buffer_id
 ---     local lines, highlights = M:lines()
@@ -93,7 +90,8 @@ function M:lines()
             for i = 2, #l do
                 line = line .. l.space .. l[i]
                 if hl[i] then
-                    table.insert(highlight, { name = hl[i], _start = #line - #l[i], _end = #line })
+                    local _end = #line
+                    table.insert(highlight, { name = hl[i], _start = _end - #l[i], _end = _end })
                 end
             end
         end

lua/Trans/component/init.lua

@@ -1,8 +0,0 @@
-local M = {}
-local order = require('Trans.conf.loader').loaded_conf.order
-
-M._ = function (query_)
-    
-end
-
-return M

lua/Trans/component/window.lua

@@ -1,12 +0,0 @@
-local M = {}
-local type_check = require("Trans.util.debug").type_check
-
-
--- vim.pretty_print(vim.lsp.util._make_floating_popup_size)
-
-local v = [=[
-    local test = {{
-    }}
-]=]
-print(v)
-return M

lua/Trans/conf/base.lua

@@ -1,17 +1,12 @@
 local M = {}
-
+ 
 local buf_opts = {
-    filetype = 'Trans'
 }
 
 local buf = vim.api.nvim_create_buf(false, true)
-for k, v in pairs(buf_opts) do
-    vim.api.nvim_buf_set_option(buf, k, v)
-end
 
 M.buf = buf
 
-M.group = vim.api.nvim_create_augroup('Trans', { clear = true })
-
+M.augroup = vim.api.nvim_create_augroup('Trans', { clear = true })
 
 return M

lua/Trans/conf/default.lua

@@ -15,8 +15,8 @@ M.conf = {
             },
             float = {
                 border = 'rounded',
-                width = 0.8,
-                height = 0.9,
+                width = 0.9,
+                height = 0.8,
             },
             -- NOTE :如果你想限制某个组件的行数，可以设置 (名称与order相同)
             -- Example:
@@ -91,6 +91,7 @@ M.conf = {
         },
         engine = {
             -- TODO
+            'local',
         }
     },
     -- map = {

lua/Trans/conf/loader.lua

@@ -40,8 +40,22 @@ end
 M.load_conf = function(conf)
     user_conf    = conf or {}
     default_conf = require("Trans.conf.default").conf
+    if user_conf.style and user_conf.window then
+    end
+
     pre_process()
     M.loaded_conf = vim.tbl_deep_extend('force', default_conf, user_conf)
+    local width = M.loaded_conf.style.window.cursor.float.width
+    local height = M.loaded_conf.style.window.cursor.float.height
+
+    if width > 0 and width <= 1 then
+        M.loaded_conf.style.window.cursor.float.width = math.floor(width * vim.o.columns)
+    end
+
+    if height > 0 and height <= 1 then
+        M.loaded_conf.style.window.cursor.float.height = math.floor(height * (vim.o.lines - vim.o.cmdheight))
+    end
+
     user_conf = nil
     default_conf = nil
 end

lua/Trans/core/README.md

@@ -53,7 +53,7 @@
     - `history`
 
 - 查询引擎(engine): `string | table`
-    - `local` 本地的数据库
+    - `offline` 离线的数据库
     - `youcao` 有道api
     - `baidu` 百度api
     - `google` 谷歌api
@@ -81,7 +81,7 @@ vim.keymap.set('n', 'mi', function ()
     require('Trans').translate({
         method = 'input', -- 不填则自动判断mode获取查询的单词
         engine = { -- 异步查询所有的引擎, 按照列表
-            'local',
+            'offline',
             'youdao',
             'baidu'
         },

lua/Trans/core/content.lua

@@ -1,19 +0,0 @@
-local M = {}
-local type_check = require("Trans.util.debug").type_check
-
-local offline_dir = debug.getinfo(1, "S").source:sub(2):match('.*Trans') .. '/component/offline'
-
-M.to_content = function(query_res)
-    type_check {
-        query_res = { query_res, 'table' }
-    }
-    local content = {}
-    for file in vim.fs.dir(offline_dir) do
-        local res = require("Trans.component.offline." .. file:gsub('.lua', '')).to_content(query_res)
-        assert(res)
-        table.insert(content, res)
-    end
-    return content
-end
-
-return M

lua/Trans/core/init.lua

@@ -0,0 +1,7 @@
+local M = {}
+
+M.process = require('Trans.core.process')
+M.query = require('Trans.core.query')
+M.show_win = require('Trans.core.show_win')
+
+return M

lua/Trans/core/process.lua

@@ -0,0 +1,22 @@
+local type_check = require("Trans.util.debug").type_check
+local format = require("Trans.util.format")
+
+
+-- NOTE : 将请求得到的字段进行处理
+-- local offline_dir = debug.getinfo(1, "S").source:sub(2):match('.*Trans') .. '/component/offline'
+local function process (opts)
+    type_check {
+        opts = { opts, 'table' }
+    }
+    local content = require('Trans.component.content'):new()
+
+    for _, v in ipairs(opts.order) do
+        local component = format.format(opts.win_style, require("Trans.component" .. opts.engine .. v))
+        content:insert(component)
+    end
+
+    return content:lines()
+end
+
+
+return process

lua/Trans/core/show_win.lua

@@ -0,0 +1,53 @@
+local type_check = require("Trans.util.debug").type_check
+
+local buf_opts = {
+    filetype = 'Trans',
+    modifiable = false,
+}
+
+-- local win_opts = {
+--     winhl = 'Normal:TransWinNormal, FloatBorder:TransWinBorder'
+-- }
+
+local function caculate_format(height, width)
+    local col = math.floor((vim.o.lines - height - vim.o.cmdheight) / 2)
+    local row = math.floor((vim.o.columns - width) / 2)
+    return row, col
+end
+
+local function show_win(opts)
+    type_check {
+        opts = { opts, 'table' },
+        win = { opts.win, 'table' },
+        highlight = { opts.highlight, 'table', true },
+    }
+
+    local bufnr = vim.api.nvim_create_buf(false, true)
+    for k, v in pairs(buf_opts) do
+        vim.api.nvim_buf_set_option(bufnr, k, v)
+    end
+
+    local is_float = opts.style == 'float'
+    local win_opts = {
+        relative = opts.style == 'float' and 'editor' or 'cursor',
+        width = opts.width,
+        height = opts.height,
+        style = 'minimal',
+        border = 'rounded',
+        title = 'Trans',
+        title_pos = 'center',
+        focusable = true,
+        zindex = 100,
+    }
+    if is_float then
+        win_opts.row, win_opts.col = caculate_format(win_opts.height, win_opts.width)
+    else
+        win_opts.row = 2
+        win_opts.col = 2
+    end
+    local winid = vim.api.nvim_open_win(bufnr, is_float, win_opts)
+
+    return bufnr, winid
+end
+
+return show_win

lua/Trans/init.lua

@@ -2,8 +2,6 @@ local M = {}
 
 M.setup = require('Trans.conf.loader').load_conf
 
-M.translate = require('Tran.wrapper.translate')
-
-
+M.translate = require('Tran.core.translate')
 
 return M

lua/Trans/util/format.lua

@@ -1,4 +1,3 @@
----@diagnostic disable: undefined-global
 local M = {}
 local type_check = require("Trans.util.debug").type_check
 
@@ -8,12 +7,6 @@ function string:width()
     return vim.fn.strdisplaywidth(self)
 end
 
--- 各种风格的基础宽度
-local style_width = {
-    float = require("Trans.conf.window").float.width, -- NOTE : need window parsed conf
-    cursor = require("Trans.conf.window").cursor.width,
-    -- cursor = 50
-}
 
 local s_to_b = true -- 从小到大排列
 
@@ -136,20 +129,17 @@ end
 
 
 -- EXAMPLE : 返回的形式
-local lines = {
-    { items, opts },
-    { items, opts },
-    { items, opts },
-    -- items: string[]
-    -- opts {
-    --     highlight
-    --     indent
-    -- }
-}
+-- local lines = {
+--     { items, opts },
+--     { items, opts },
+--     { items, opts },
+--     -- items: string[]
+--     -- opts {
+--     --     highlight
+--     --     indent
+--     -- }
+-- }
 
-local function format_stuff(stuff)
-
-end
 
 ---@alias formatted_items table
 ---将组件格式化成相应的vim支持的lines格式
@@ -184,8 +174,6 @@ end
 
 
 
-
-
 ---合并多个数组, 第一个数组将会被使用
 ---@param ... string[] 需要被合并的数组
 ---@return table res   合并后的数组

lua/Trans/window/content.lua

@@ -1,18 +0,0 @@
-local M = {}
-
---[[
-content = {
-    lines = {}          ---@type string[]
-    highlight = {}
-}
---]]
----@param contents string[]
-M.set = function (win, contents)
-    vim.validate {
-        contents = { contents, 'table' },
-    }
-    -- TODO 
-end
-
-
-return M

lua/Trans/window/display.lua

@@ -1,29 +0,0 @@
-local M = {}
-local api = vim.api
-local util = require("Trans.window.util")
-M.buf = util.init_buf()
-
---- 浮动窗口的风格
----@param conf table 自定义配置
-M.show_float_win = function(conf)
-    vim.validate {
-        conf = { conf, 'table' },
-    }
-    local opts = util.get_float_opts(conf)
-    local win = api.nvim_open_win(M.buf, true, opts)
-    return win
-end
-
-M.show_cursor_win = function(conf)
-    vim.validate {
-        conf = { conf, 'table' },
-    }
-    local opts = util.get_cursor_opts(conf)
-    local win = api.nvim_open_win(M.buf, true, opts)
-    return win
-end
-
--- TODO <++> more window style
-
-
-return M

lua/Trans/wrapper/translate.lua

@@ -1,9 +1,9 @@
 local type_check = require("Trans.util.debug").type_check
-
-local window = require("Trans.conf.window")
 -- Default conf
+local conf = require("Trans.conf.loader").loaded_conf
 local core = require("Trasn.core")
 
+
 local function get_opts(opts)
     local default_conf = {
         method = vim.api.nvim_get_mode(),
@@ -11,17 +11,28 @@ local function get_opts(opts)
             'local',
             -- TODO : other engine
         },
-        win = window.cursor_win,
+        win = {
+            style = 'cursor',
+            width = conf.window.cursor.width,
+            height = conf.window.cursor.height
+        },
     }
 
-    -- TODO :process win height and width
     if type(opts.engine) == 'string' then
         opts.engine = { opts.engine }
     end
 
     if opts.win then
-        opts.win = window.process(opts.win)
+        local width, height = opts.win.width, opts.win.height
+        if width and width > 0 and width <= 1 then
+            opts.win.width = math.floor(vim.o.columns * width)
+        end
+
+        if height and height > 0 and height <= 1 then
+            opts.win.height = math.floor(vim.o.lines * opts.win.height)
+        end
     end
+
     return vim.tbl_extend('force', default_conf, opts)
 end
 
@@ -29,24 +40,28 @@ local function translate(opts)
     type_check {
         opts = { opts, 'table' }
     }
+
+    --- TODO : 异步请求
+    -- NOTE : 这里只处理了本地的请求
     opts = get_opts(opts or {})
-
-
     local field = core.query(opts)
 
-    opts = {
+    local proc_opts = {
         field = field,
+        order = conf.order['offline'],
+        engine = 'offline',
+        win_style = opts.win.style,
     }
 
-    local content = core.process(opts)
+    local content, highlight = core.process(proc_opts)
 
-    opts = {
-        style = opts.style,
-        height = opts.height,
-        width = opts.width,
+    local win_opts = {
+        win = opts.win,
         content = content,
+        highlight = highlight,
     }
-    core.show(opts)
+
+    core.show_win(win_opts)
 end
 
 return translate