chore: 改变了一些函数调用

lua/Trans/core/content.lua

@@ -1,9 +1,9 @@
 local M = {}
 M.__index = M
 
-
 M.get_width = vim.fn.strwidth
 
+
 ---@alias block table add_hl(key, hl_name)
 ---返回分配的块状区域, e_col 设置为-1则为末尾
 ---@param s_row integer 起始行

lua/Trans/core/handler.lua

@@ -145,4 +145,53 @@ M.hover = {
     end,
 }
 
+M.process = function(view, result)
+    local conf = require('Trans').conf
+    local content = require('Trans.core.content'):new(conf.window[view].width)
+    if result then
+        if view == 'hover' then
+            vim.tbl_map(function(handle)
+                M.hover[handle](result, content)
+            end, conf.order)
+
+        elseif view == 'float' then
+            -- TODO :
+
+        else
+            error('unknown view ' .. view)
+        end
+    else
+        M[view].failed(content)
+    end
+    return content
+end
+
+
+
+--- TODO :Content Handler for float view
+M.float = {
+    title = function(result, content)
+
+    end,
+    tag = function(result, content)
+
+    end,
+    pos = function(result, content)
+
+    end,
+    exchange = function(result, content)
+
+    end,
+    translation = function(result, content)
+
+    end,
+    definition = function(result, content)
+
+    end,
+    faild = function(result, content)
+
+    end,
+}
+
+
 return M

lua/Trans/core/init.lua

@@ -3,7 +3,6 @@ local conf = require('Trans').conf
 local api = require('Trans.api')
 local win = require('Trans.core.window')
 local handler = require('Trans.core.handler')
-local c = require('Trans.core.content')
 
 
 local function get_select()
@@ -20,35 +19,32 @@ local function get_select()
     return table.concat(lines, '')
 end
 
+local function get_word(method)
+    if method == 'n' then
+        return vim.fn.expand('<cword>')
+    elseif method == 'v' then
+        return get_select()
+    elseif method == 'input' then
+        -- TODO Use Telescope with fuzzy finder
+        ---@diagnostic disable-next-line: param-type-mismatch
+        return vim.fn.input('请输入您要查询的单词: ')
+    elseif method == 'last' then
+        return win.show()
+    else
+        error('unknown method' .. method)
+    end
+end
+
 M.translate = function(method, view)
     method = method or vim.api.nvim_get_mode().mode
     view = view or conf.view[method]
-    local word
+    local word = get_word(method)
-    if method == 'v' then
+    if word then
-        ---@diagnostic disable-next-line: param-type-mismatch
-        word = vim.fn.input('请输入您要查询的单词: ') -- TODO Use Telescope with fuzzy finder
-    elseif method == 'n' then
-        word = vim.fn.expand('<cword>')
-    elseif method == 'input' then
-        word = get_select()
-    elseif method == 'last' then
-        return win.show()
-    end
-
         win.init(view)
         local result = api.query('offline', word)
-    local content = c:new(win.width)
+        local content = handler.process(view, result)
-    local hd = handler[view]
-
-    if result then
-        for i = 1, #conf.order do
-            hd[conf.order[i]](result, content)
-        end
-
-    else
-        hd.failed(content)
-    end
         win.draw(content)
+    end
 end
 
 

lua/Trans/core/window.lua

@@ -42,7 +42,7 @@ function M.init(view)
         opts.col = 2
     end
 
-    M.id = api.nvim_open_win(M.bufnr, M.float, opts)
+    M.id = api.nvim_open_win(M.bufnr, is_float, opts)
 end
 
 M.draw = function(content)
@@ -57,22 +57,15 @@ M.draw = function(content)
         end
     end
     M.load_opts()
-    if content.len == 1 then
-        api.nvim_win_set_width(M.id, content.get_width(content.lines[1]))
-    end
 end
 
 
 M.load_opts = function()
     api.nvim_buf_set_option(M.bufnr, 'modifiable', false)
     api.nvim_buf_set_option(M.bufnr, 'filetype', 'Trans')
-    api.nvim_win_set_option(M.id, 'winhl', ('Normal:Trans%sWin,FloatBorder:Trans%sBorder'):format(M.view, M.view))
+    api.nvim_win_set_option(M.id, 'winhl', 'Normal:TransWin,FloatBorder:TransBorder')
-    local height = util.get_height(M.bufnr, M.id)
     M['load_' .. M.view .. '_opts']()
 
-    if M.height > height then
-        api.nvim_win_set_height(M.id, height)
-    end
 end
 
 
@@ -94,7 +87,12 @@ M.load_hover_opts = function()
             end
         end,
     })
-    api.nvim_win_set_option(M.id, 'wrap', not M.float)
+    api.nvim_win_set_option(M.id, 'wrap', M.view ~= 'float')
+
+    local height = util.get_height(M.bufnr, M.id)
+    if M.height > height then
+        api.nvim_win_set_height(M.id, height)
+    end
 end
 
 M.load_float_opts = function()

lua/Trans/setup.lua

@@ -48,10 +48,10 @@ local highlights = {
     TransDefinition = {
         link = 'Moremsg',
     },
-    TransHoverWin = {
+    TransWin = {
         link = 'Normal',
     },
-    TransHoverBorder = {
+    TransBorder = {
         link = 'FloatBorder',
     },
     TransCollins = {