3 files changed, 53 insertions, 18 deletions
diff --git a/server/src/matcher/hover.lua b/server/src/matcher/hover.lua
index de2eeffb..99e09e46 100644
--- a/server/src/matcher/hover.lua
+++ b/server/src/matcher/hover.lua
@@ -369,11 +369,18 @@ local function getValueHover(name, valueType, result, source, lib)
         value = result.value.value and ('%q'):format(result.value.value)
     end
 
+    local tp = result.type
+    if tp == 'field' then
+        if result.parent.value.ENV then
+            tp = 'global'
+        end
+    end
+
     local text
     if value == nil then
-        text = ('%s %s'):format(valueType, name)
+        text = ('%s %s: %s'):format(tp, name, valueType)
     else
-        text = ('%s %s = %s'):format(valueType, name, value)
+        text = ('%s %s: %s = %s'):format(tp, name, valueType, value)
     end
     return {
         label = text,
diff --git a/server/test/definition/method.lua b/server/test/definition/method.lua
index 5e90177b..7db4b56d 100644
--- a/server/test/definition/method.lua
+++ b/server/test/definition/method.lua
@@ -111,3 +111,31 @@ end
 local obj = sm({}, mt)
 obj:<?method1?>()
 ]]
+
+-- TODO 更换 meta__index 的实现
+-- 表和__index之间不共享child
+-- 编译完成后进行后处理，如果某个field只有读取操作，则将值链接到meta表中
+
+--TEST [[
+--local mt = {}
+--function mt:<!x!>()
+--end
+--
+--local obj = setmetatable({}, {__index = mt})
+--function obj:x()
+--end
+--
+--mt:<?x?>()
+--]]
+--
+--TEST [[
+--local mt = {}
+--function mt:x()
+--end
+--
+--local obj = setmetatable({}, {__index = mt})
+--function obj:<!x!>()
+--end
+--
+--obj:<?x?>()
+--]]
diff --git a/server/test/hover/init.lua b/server/test/hover/init.lua
index 18a5e299..ceaca791 100644
--- a/server/test/hover/init.lua
+++ b/server/test/hover/init.lua
@@ -89,24 +89,24 @@ obj.<?xxx?>()
 TEST [[
 local <?x?> = 1
 ]]
-"number x = 1"
+"local x: number = 1"
 
 TEST [[
 <?x?> = 1
 ]]
-"number x = 1"
+"global x: number = 1"
 
 TEST [[
 local t = {}
 t.<?x?> = 1
 ]]
-"number t.x = 1"
+"field t.x: number = 1"
 
 TEST [[
 t = {}
 t.<?x?> = 1
 ]]
-"number t.x = 1"
+"field t.x: number = 1"
 
 TEST [[
 local mt = {}
@@ -114,7 +114,7 @@ mt.__name = 'class'
 
 local <?obj?> = setmetatable({}, mt)
 ]]
-"*class obj"
+"local obj: *class"
 
 TEST [[
 local mt = {}
@@ -123,7 +123,7 @@ mt.__index = mt
 
 local <?obj?> = setmetatable({}, mt)
 ]]
-"*class obj"
+"local obj: *class"
 
 TEST [[
 local mt = {}
@@ -132,7 +132,7 @@ mt.__index = mt
 
 local <?obj?> = setmetatable({}, mt)
 ]]
-"*class obj"
+"local obj: *class"
 
 TEST [[
 local mt = {}
@@ -141,13 +141,13 @@ mt.__index = mt
 
 local <?obj?> = setmetatable({}, mt)
 ]]
-"*class obj"
+"local obj: *class"
 
 TEST[[
 local fs = require 'bee.filesystem'
 local <?root?> = fs.current_path()
 ]]
-"*bee::filesystem root"
+"local root: *bee::filesystem"
 
 TEST[[
 ('xx'):<?yy?>()
@@ -157,13 +157,13 @@ TEST[[
 TEST [[
 local <?v?> = collectgarbage()
 ]]
-"any v"
+"local v: any"
 
 TEST [[
 local type
 w2l:get_default()[<?type?>]
 ]]
-"any type"
+"local type: any"
 
 TEST [[
 <?load?>()
@@ -224,13 +224,13 @@ function mt:add(a: any, b: any)
 TEST [[
 local <?t?> = - 1000
 ]]
-[[number t = -1000]]
+[[local t: number = -1000]]
 
 TEST [[
 for <?c?> in io.lines() do
 end
 ]]
-[[string c]]
+[[local c: string]]
 
 TEST [[
 local function f()
@@ -238,19 +238,19 @@ local function f()
 end
 local <?n?> = f()
 ]]
-[[any n]]
+[[local n: any]]
 
 TEST [[
 local <?n?> = table.unpack(t)
 ]]
-[[any n]]
+[[local n: any]]
 
 TEST [[
 local <?n?>
 table.pack(n)
 ]]
 [[
-any n
+local n: any
 ]]
 
 TEST [[