Merge branch 'callback'

3 files changed, 28 insertions, 1 deletions

diff --git a/test/crossfile/hover.lua b/test/crossfile/hover.lua
index 1c46214c..97e6218d 100644
--- a/test/crossfile/hover.lua
+++ b/test/crossfile/hover.lua
@@ -969,3 +969,20 @@ p: T
     | b -- comment 3
         -- comment 4
 ```]]}
+
+TEST {{ path = 'a.lua', content = '', }, {
+    path = 'b.lua',
+    content = [[
+---@param x number # aaa
+local f
+
+function f(<?x?>) end
+]]
+},
+hover = [[
+```lua
+local x: number
+```
+
+---
+ aaa]]}
diff --git a/test/diagnostics/init.lua b/test/diagnostics/init.lua
index 687027b8..bb613112 100644
--- a/test/diagnostics/init.lua
+++ b/test/diagnostics/init.lua
@@ -461,7 +461,7 @@ f(1, 2, 3)
 ]]
 
 TEST [[
-<!unpack!>(<!1!>)
+<!unpack!>()
 ]]
 
 TEST [[
@@ -1135,6 +1135,9 @@ return {
 }
 ]]
 
+-- TODO
+do return end
+
 TEST [[
 ---@param table     table
 ---@param metatable table
diff --git a/test/type_inference/init.lua b/test/type_inference/init.lua
index 13efbc59..a4dbf249 100644
--- a/test/type_inference/init.lua
+++ b/test/type_inference/init.lua
@@ -871,3 +871,10 @@ for _, a in ipairs(v) do
     end
 end
 ]]
+
+TEST 'number' [[
+---@param x number
+local f
+
+f = function (<?x?>) end
+]]