From 5a84b95301603b1f188460e9c20c45a60ec69c7b Mon Sep 17 00:00:00 2001
From: JuanZoran <1430359574@qq.com>
Date: Mon, 16 Jan 2023 12:10:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E7=A9=BA=E7=99=BD=E7=AC=A6=E5=8F=B7=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                  |  9 +++++----
 lua/Trans/api/query.lua    | 29 +++++++++++++----------------
 lua/Trans/core/content.lua |  9 +++++----
 lua/Trans/core/handler.lua |  2 +-
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 6e33b32..3599452 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,7 @@ use {
     keys = {
         { 'v', 'mm' }, -- 换成其他你想用的key即可
         { 'n', 'mm' },
+        { 'n', 'mi' },
     },
     run = 'bash ./install.sh', -- 自动下载使用的本地词库
     requires = 'kharji/sqlite.lua',
@@ -133,11 +134,11 @@ require'Trans'.setup {
         -- },
     },
     icon = {
-        title = ' ', -- 
+        title = ' ', --  
         star = '',
-        -- notfound = '',
-        -- yes = '',
-        -- no = ''
+        -- notfound = ' ',
+        -- yes = ' ',
+        -- no = ' '
         -- star = '⭐',
         notfound = '❔',
         yes = '✔️',
diff --git a/lua/Trans/api/query.lua b/lua/Trans/api/query.lua
index bee4c5f..7d002a2 100644
--- a/lua/Trans/api/query.lua
+++ b/lua/Trans/api/query.lua
@@ -8,26 +8,23 @@ end
 local path = require('Trans').conf.db_path
 local dict = db:open(path)
 
-local query_fields = {
-    'word',
-    'phonetic',
-    'definition',
-    'translation',
-    'pos',
-    'collins',
-    'oxford',
-    'tag',
-    'exchange',
-}
-
-
 local routes = {
     offline = function(word)
         local res = dict:select('stardict', {
             where = {
                 word = word,
             },
-            keys = query_fields,
+            keys = {
+                'word',
+                'phonetic',
+                'definition',
+                'translation',
+                'pos',
+                'collins',
+                'oxford',
+                'tag',
+                'exchange',
+            },
         })
         return res[1]
     end,
@@ -49,8 +46,8 @@ vim.api.nvim_create_autocmd('VimLeavePre', {
 M.query = function(engine, word)
     -- TODO : more opts
     vim.validate {
-        word = {word, 's'},
-        engine = {word, 's'},
+        word = { word, 's' },
+        engine = { word, 's' },
     }
 
     return routes[engine](word)
diff --git a/lua/Trans/core/content.lua b/lua/Trans/core/content.lua
index c9e3a33..48f1e92 100644
--- a/lua/Trans/core/content.lua
+++ b/lua/Trans/core/content.lua
@@ -49,6 +49,7 @@ function M:alloc_block(s_row, s_col, height, width)
     })
 end
 
+
 function M:alloc_items()
     local items = {}
     local width = 0 -- 所有item的总width
@@ -62,20 +63,19 @@ function M:alloc_items()
         end,
 
         load = function()
-            self.len = self.len + 1
+            local l = self.len + 1
             local space = math.floor((self.width - width) / (size - 1))
             assert(space > 0)
             local interval = (' '):rep(space)
             local value = ''
             local function load_item(index)
                 if items[index][2] then
-                    table.insert(self.highlights[self.len], {
+                    table.insert(self.highlights[l], {
                         name = items[index][2],
                         _start = #value,
                         _end = #value + #items[index][1],
                     })
                 end
-
                 value = value .. items[index][1]
             end
 
@@ -85,7 +85,8 @@ function M:alloc_items()
                 load_item(i)
             end
 
-            self.lines[self.len] = value
+            self.lines[l] = value
+            self.len = l
         end
     }
 end
diff --git a/lua/Trans/core/handler.lua b/lua/Trans/core/handler.lua
index efd1c66..5aaa148 100644
--- a/lua/Trans/core/handler.lua
+++ b/lua/Trans/core/handler.lua
@@ -135,7 +135,7 @@ M.hover = {
             expl(content, '英文注释')
 
             vim.tbl_map(function(def)
-                def = def:gsub('%s+', '', 1) -- TODO :判断是否需要分割空格
+                def = def:gsub('^%s+', '', 1) -- TODO :判断是否需要分割空格
                 content:addline(indent .. def, 'TransDefinition')
             end, vim.split(indent .. result.definition, '\n', { plain = true, trimempry = true }))