fix: add max_size support and definition need better format

lua/.luarc.json

@@ -8,5 +8,6 @@
         "vim",
         "user_conf",
         "default_conf"
-    ]
+    ],
+    "Lua.workspace.checkThirdParty": false
 }

lua/Trans/api/query.lua

@@ -3,7 +3,7 @@ local _, db = pcall(require, 'sqlite.db')
 if not _ then
     error('Please check out sqlite.lua')
 end
-local type_check = require("Trans.util.debug").type_check
+local type_check = vim.validate
 
 -- INFO : init database
 local path = require("Trans.conf.loader").loaded_conf.base.db_path

lua/Trans/component/content.lua

@@ -1,14 +1,20 @@
 local M = {}
-local type_check = require("Trans.util.debug").type_check
+local type_check = vim.validate
 M.__index = M
 M.lines = {}
 M.highlight = {}
 M.height = 0
 M.width = 0
 M.interval = '    '
+M.opts = {}
 
 
-function M:new()
+
+function M:new(opts)
+    if opts then
+        self.opts = opts
+    end
+
     local content = {}
     setmetatable(content, self)
     return content
@@ -111,26 +117,26 @@ function M:data()
     return lines, highlights
 end
 
-function M:attach(bufnr, winid)
-    local height = vim.api.nvim_win_get_height(winid)
-    local width = vim.api.nvim_win_get_width(winid)
 
-    vim.api.nvim_win_set_height(winid, self.height)
+function M:attach()
+    local height = self.opts.win.height
+    local width = self.opts.win.width
+
     local lines, hls = self:data()
-    vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
+    vim.api.nvim_buf_set_lines(self.opts.bufnr, 0, -1, false, lines)
 
     for line, l_hl in ipairs(hls) do
         for _, hl in ipairs(l_hl) do
-            vim.api.nvim_buf_add_highlight(bufnr, -1, hl.name, line - 1, hl._start, hl._end)
+            vim.api.nvim_buf_add_highlight(self.opts.bufnr, -1, hl.name, line - 1, hl._start, hl._end)
         end
     end
 
     if self.height < height then
-        vim.api.nvim_win_set_height(winid, self.height)
+        vim.api.nvim_win_set_height(self.opts.winid, self.height)
     end
 
     if self.width < width then
-        vim.api.nvim_win_set_width(winid, self.width)
+        vim.api.nvim_win_set_width(self.opts.winid, self.width)
     end
 end
 

lua/Trans/component/highlight.lua

@@ -1,11 +0,0 @@
-local M = {}
-local type_check = require("Trans.util.debug").type_check
-M.__index = M
-
-function M:new()
-    
-end
-
-
-return M
-

lua/Trans/component/offline/Definition.lua

@@ -1,7 +1,68 @@
 local M = {}
 
-M.component = function (field)
+M.component = function (field, max_size)
-    -- TODO 
+    if field.definition and field.definition ~= '' then
+        local ref = {
+            { '英文注释', 'TransRef' }
+        }
+
+        local definitions = {
+            highlight = 'TransDefinition',
+            needformat = true,
+            indent = 4,
+        }
+        local size = 0
+        for defin in vim.gsplit(field.definition, '\n', true) do
+            if defin ~= '' then
+                table.insert(definitions, defin)
+
+                size = size + 1
+                if size == max_size then
+                    break
+                end
+            end
+        end
+
+        return { ref, definitions }
+    end
 end
 
 return M
+
+--[[n a formation of people or things one beside another
+n a mark that is long relative to its width
+n a formation of people or things one behind another
+n a length (straight or curved) without breadth or thickness; the trace of a moving point
+n text consisting of a row of words written across a page or computer screen
+n a single frequency (or very narrow band) of radiation in a spectrum
+n a fortified position (especially one marking the most forward position of troops)
+n a course of reasoning aimed at demonstrating a truth or falsehood; the methodical process of logical reasoning
+n a conductor for transmitting electrical or optical signals or electric power
+n a connected series of events or actions or developments
+n a spatial location defined by a real or imaginary unidimensional extent
+n a slight depression in the smoothness of a surface
+n a pipe used to transport liquids or gases
+n the road consisting of railroad track and roadbed
+n a telephone connection
+n acting in conformity
+n the descendants of one individual
+n something (as a cord or rope) that is long and thin and flexible
+n the principal activity in your life that you do to earn money
+n in games or sports; a mark indicating positions or bounds of the playing area
+n (often plural) a means of communication or access
+n a particular kind of product or merchandise
+n a commercial organization serving as a common carrier
+n space for one line of print (one column wide and 1/14 inch deep) used to measure advertising
+n the maximum credit that a customer is allowed
+n a succession of notes forming a distinctive sequence
+n persuasive but insincere talk that is usually intended to deceive or impress
+n a short personal letter
+n a conceptual separation or distinction
+n mechanical system in a factory whereby an article is conveyed through sites at which successive operations are performed on it
+v be in line with; form a line along
+v cover the interior of
+v make a mark or lines on a surface
+v mark with lines
+v fill plentifully
+v reinforce with fabric
+--]]

lua/Trans/component/offline/Exchange.lua

@@ -1,7 +1,45 @@
 local M = {}
 
-M.component = function (field)
+local exchange_map = {
-    -- TODO 
+    p = '过去式',
+    d = '过去分词',
+    i = '现在分词',
+    r = '形容词比较级',
+    t = '形容词最高级',
+    s = '名词复数形式',
+    f = '第三人称单数',
+    ['0'] = '词根',
+    ['1'] = '词根的变化形式',
+    ['3'] = '第三人称单数',
+}
+
+M.component = function(field)
+    -- TODO
+    if field.exchange and field.exchange ~= '' then
+        local ref = {
+            { '词型变化', 'TransRef' },
+        }
+        local exchanges = {
+            needformat = true,
+            highlight = 'TransExchange',
+            indent = 4,
+            emptyline = true,
+        }
+
+        for _exchange in vim.gsplit(field.exchange, '/', true) do
+            local prefix = exchange_map[_exchange:sub(1, 1)]
+            if prefix then
+                local exchange = prefix .. _exchange:sub(2)
+                -- local exchange = exchange_map[_exchange:sub(1, 1)] .. _exchange:sub(2)
+                table.insert(exchanges, exchange)
+
+            else
+                error('add exchange_map for [' .. _exchange .. ']')
+            end
+        end
+
+        return { ref, exchanges }
+    end
 end
 
 return M

lua/Trans/component/offline/Pos.lua

@@ -1,7 +1,20 @@
 local M = {}
 
-M.component = function (field)
+M.component = function(field)
-    -- TODO 
+    -- TODO
+    if field.pos and field.pos ~= '' then
+        local ref = {
+            { '词性:', 'TransRef' },
+        }
+        local pos = {
+            { field.pos },
+            highlight = 'TransPos',
+            indent = 4,
+            emptyline = true,
+        }
+
+        return { ref, pos }
+    end
 end
 
 return M

lua/Trans/component/offline/Tag.lua

@@ -25,17 +25,16 @@ M.component = function(field)
             needformat = true,
             highlight = 'TransTag',
             indent = 4,
+            emptyline = true,
         }
 
         for _tag in vim.gsplit(field.tag, ' ', true) do
-            if _tag ~= '' then
+            local tag = tag_map[_tag]
-                local tag = tag_map[_tag]
 
-                if tag then
+            if tag then
-                    table.insert(tags, tag)
+                table.insert(tags, tag)
-                else
+            else
-                    error('add tag_map for [' .. _tag .. ']')
+                error('add tag_map for [' .. _tag .. ']')
-                end
             end
         end
 

lua/Trans/component/offline/Translation.lua

@@ -1,7 +1,23 @@
 local M = {}
 
-M.component = function (field)
+M.component = function(field)
-    -- TODO 
+    if field.translation then
+        local ref = {
+            { '中文翻译', 'TransRef' }
+        }
+
+        local translations = {
+            highlight = 'TransTranslation',
+            indent = 4,
+            emptyline = true,
+            needformat = true,
+        }
+        for trans in vim.gsplit(field.translation, '\n', true) do
+            table.insert(translations, trans)
+        end
+
+        return { ref, translations }
+    end
 end
 
 return M

lua/Trans/conf/default.lua

@@ -10,8 +10,8 @@ M.conf = {
         window = {
             cursor = {
                 border = 'rounded',
-                width = 40,
+                width = 50,
-                height = 20,
+                height = 50,
             },
             float = {
                 border = 'rounded',
@@ -33,10 +33,10 @@ M.conf = {
             'Pos',
             'Exchange',
             'Translation',
-            'Definition',
+            -- { 'Definition', max_size = 4 },
         },
         -- online = {
-        --     -- TODO 
+        --     -- TODO
         -- },
     },
     ui = {
@@ -46,7 +46,7 @@ M.conf = {
                 bold = true,
             },
             TransPhonetic = {
-                fg = '#8b949e',
+                link = 'Linenr'
             },
             TransRef = {
                 fg = '#75beff',
@@ -65,7 +65,8 @@ M.conf = {
                 link = 'TransWord',
             },
             TransDefinition = {
-                fg = '#bc8cff',
+                -- fg = '#bc8cff',
+                link = 'Moremsg',
             },
             TransCursorWin = {
                 link = 'Normal',
@@ -93,14 +94,14 @@ M.conf = {
         auto_close = true,
         engine = {
             -- TODO
-            'local',
+            'offline',
         }
     },
     -- map = {
     --     -- TODO
     -- },
     -- history = {
-    --     -- TOOD 
+    --     -- TOOD
     -- }
 
     -- TODO  add online translate engine

lua/Trans/conf/loader.lua

@@ -45,16 +45,11 @@ M.load_conf = function(conf)
 
     pre_process()
     M.loaded_conf = vim.tbl_deep_extend('force', default_conf, user_conf)
-    local width = M.loaded_conf.style.window.float.width
+    local win = M.loaded_conf.style.window
-    local height = M.loaded_conf.style.window.float.height
+    assert(win.float.height <= 1 and win.float.height > 0 and win.cursor.height > 1, win.cursor.width > 1)
 
-    if width > 0 and width <= 1 then
+    win.float.width = math.floor(win.float.width * vim.o.columns)
-        M.loaded_conf.style.window.float.width = math.floor(width * vim.o.columns)
+    win.float.height = math.floor(win.float.height * (vim.o.lines - vim.o.cmdheight))
-    end
-
-    if height > 0 and height <= 1 then
-        M.loaded_conf.style.window.float.height = math.floor(height * (vim.o.lines - vim.o.cmdheight))
-    end
 
     user_conf = nil
     default_conf = nil

lua/Trans/core/process.lua

@@ -1,4 +1,4 @@
-local type_check = require("Trans.util.debug").type_check
+local type_check = vim.validate
 
 -- NOTE :中文字符及占两个字节宽，但是在lua里是3个字节长度
 -- 为了解决中文字符在lua的长度和neovim显示不一致的问题
@@ -8,11 +8,15 @@ local function format(win_width, items)
     local size = #items
     local tot_width = 0
 
+    if items.indent then
+        win_width = win_width - items.indent
+    end
+
     for i = 1, size do
         if type(items[i]) == 'string' then
             items[i] = { items[i] }
         end
-        tot_width = tot_width + get_width(items[i][1]) + 4
+        tot_width = tot_width + #items[i][1] + 4
     end
 
 
@@ -23,22 +27,38 @@ local function format(win_width, items)
 
         -- 行内字符串按照宽度排序
         table.sort(items, function(a, b)
-            return get_width(a[1]) > get_width(b[1])
+            return #a[1] > #b[1]
         end)
 
         local cols = 1
-        win_width = win_width - get_width(items[1][1])
+        win_width = win_width - #items[1][1]
+
         while win_width > 0 and cols < size do
             cols = cols + 1
-            win_width = win_width - get_width(items[cols][1]) + 4
+            win_width = win_width - #items[cols][1] + 4
         end
-        cols = cols - 1
+        if cols > 1 then
+            cols = cols - 1
+        end
+
+        if cols == 1 then -- 只能放在一行时就对齐了
+            for i = size, 1, -1 do
+                lines[i] = {
+                    items[i][1],
+                    highlight = items.highlight,
+                    indent = items.indent,
+                }
+            end
+            return lines, true
+        end
+
 
         local rows = math.ceil(size / cols)
         local rest = size % cols
         if rest == 0 then
             rest = cols
         end
+
         local max_width = get_width(items[1][1])
         local index = 1 -- 当前操作的字符串下标
         for i = rows, 1, -1 do -- 当前操作的行号
@@ -48,6 +68,10 @@ local function format(win_width, items)
             }
 
             local item = items[index]
+            -- if not item then
+            --     error('item nil ' .. tostring(index) .. '   rows:' .. tostring(rows) .. vim.inspect(items) )
+            -- end
+
             item[1] = item[1] .. (' '):rep(max_width - get_width(item[1]))
             lines[i][1] = items[index]
             index = index + 1
@@ -69,9 +93,8 @@ local function format(win_width, items)
         end
 
         return lines, true
-    else
-        return items
     end
+    return items
 end
 
 local function process(opts)
@@ -88,11 +111,16 @@ local function process(opts)
         vim.api.nvim_buf_set_lines(opts.bufnr, 0, -1, false, lines)
         vim.api.nvim_win_set_height(opts.winid, 1)
         vim.api.nvim_win_set_width(opts.winid, get_width(lines[1]))
-
     else
-        local content = require('Trans.component.content'):new()
+        local content = require('Trans.component.content'):new(opts)
         for _, v in ipairs(opts.order) do
-            local component = require("Trans.component." .. 'offline' --[[ opts.engine ]] .. '.' .. v).component(opts.field)
+            local component
+            if type(v) == 'table' then
+                component = require("Trans.component." .. 'offline' --[[ opts.engine ]] .. '.' .. v[1]).component(opts.field
+                    , v.max_size)
+            else
+                component = require("Trans.component." .. 'offline' --[[ opts.engine ]] .. '.' .. v).component(opts.field)
+            end
             if component then
                 for _, items in ipairs(component) do
 
@@ -105,23 +133,25 @@ local function process(opts)
                         else
                             content:insert(formatted_items)
                         end
-
                     else
                         content:insert(items)
                     end
 
+                    if items.emptyline then
+                        content:insert({ '' })
+                    end
                 end
             end
 
         end
 
-        content:attach(opts.bufnr, opts.winid)
+        content:attach()
-
     end
 
     vim.api.nvim_buf_set_option(opts.bufnr, 'modifiable', false)
     vim.api.nvim_buf_set_option(opts.bufnr, 'filetype', 'Trans')
 
+    vim.api.nvim_win_set_option(opts.winid, 'wrap', true)
     vim.api.nvim_win_set_option(opts.winid, 'winhl', 'Normal:TransCursorWin,FloatBorder:TransCursorBorder')
     if opts.win.style == 'cursor' then
         vim.api.nvim_create_autocmd(

lua/Trans/core/query.lua

@@ -1,4 +1,4 @@
-local type_check = require("Trans.util.debug").type_check
+local type_check = vim.validate
 local query = require("Trans.api").query
 
 local function get_select()

lua/Trans/core/translate.lua

@@ -59,6 +59,7 @@ local function create_win(win)
     local bufnr = vim.api.nvim_create_buf(false, true)
 
     local is_float = win.style == 'float'
+
     local win_opts = {
         relative = is_float and 'editor' or 'cursor',
         width = win.width,
@@ -79,8 +80,8 @@ local function create_win(win)
         win_opts.col = 2
     end
 
-    local winid = vim.api.nvim_open_win(bufnr, is_float, win_opts)
 
+    local winid = vim.api.nvim_open_win(bufnr, is_float, win_opts)
     return bufnr, winid
 end
 

lua/Trans/setup.lua

@@ -5,14 +5,14 @@ end
 vim.api.nvim_create_user_command('Translate', function ()
     require("Trans").translate()
 end, {
-    desc = '翻译单词',
+    desc = '  单词翻译',
 })
 
 vim.api.nvim_create_user_command('TranslateInput', function ()
     require("Trans").translate {
         method = 'input',
     }
-end, {desc = '翻译单词'})
+end, {desc = '  搜索翻译'})
 
 -- TODO 
 -- vim.api.nvim_create_user_command('TranslateHistory', require("Trans.core").query_input, {

lua/Trans/util/debug.lua

@@ -1,32 +0,0 @@
-local M = {}
-
--- INFO : get loaded debug conf
-local type_check = true
-
-M.type_check = function (types)
-    if type_check then
-        vim.validate(types)
-    end
-end
-
--- local function dedent(lines)
---     local ind_size = math.huge
---     for i, _ in ipairs(lines) do
---         local i1, i2 = lines[i]:find("^%s*[^%s]")
---         if i1 and i2 < ind_size then
---             ind_size = i2
---         end
---     end
---     for i, _ in ipairs(lines) do
---         lines[i] = lines[i]:sub(ind_size, -1)
---     end
--- end
---
--- function M.dedent(s)
---     local lst = vim.split(s, "\n")
---     dedent(lst)
---     return table.concat(lst, "\n")
--- end
-
-
-return M