---@param的自动完成过滤掉self

2 files changed, 41 insertions, 5 deletions

diff --git a/server/src/core/completion.lua b/server/src/core/completion.lua
index 3daf71d5..bf9b8d84 100644
--- a/server/src/core/completion.lua
+++ b/server/src/core/completion.lua
@@ -465,21 +465,29 @@ local function searchEmmyFunctionParam(vm, source, word, callback)
         local list = {}
         local args = {}
         for i, arg in ipairs(func.args) do
-            args[i] = arg.name
-            if i == 1 then
-                list[i] = ('%s any'):format(arg.name)
+            if func:getObject() and i == 1 then
+                goto NEXT
+            end
+            args[#args+1] = arg.name
+            if #list == 0 then
+                list[#list+1] = ('%s any'):format(arg.name)
             else
-                list[i] = ('---@param %s any'):format(arg.name)
+                list[#list+1] = ('---@param %s any'):format(arg.name)
             end
+            :: NEXT ::
         end
         callback(('%s'):format(table.concat(args, ', ')), nil, CompletionItemKind.Snippet, {
             insertText = table.concat(list, '\n')
         })
     end
-    for _, arg in ipairs(func.args) do
+    for i, arg in ipairs(func.args) do
+        if func:getObject() and i == 1 then
+            goto NEXT
+        end
         if matchKey(word, arg.name) then
             callback(arg.name, nil, CompletionItemKind.Interface)
         end
+        :: NEXT ::
     end
 end
 
diff --git a/server/test/completion/init.lua b/server/test/completion/init.lua
index eb30d9a0..6a3b6f29 100644
--- a/server/test/completion/init.lua
+++ b/server/test/completion/init.lua
@@ -872,6 +872,34 @@ a any
 }
 
 TEST [[
+---@param $
+function mt:f(a, b, c)
+end
+]]
+{
+    {
+        label = 'a, b, c',
+        kind = CompletionItemKind.Snippet,
+        insertText = [[
+a any
+---@param b any
+---@param c any]]
+    },
+    {
+        label = 'a',
+        kind = CompletionItemKind.Interface,
+    },
+    {
+        label = 'b',
+        kind = CompletionItemKind.Interface,
+    },
+    {
+        label = 'c',
+        kind = CompletionItemKind.Interface,
+    },
+}
+
+TEST [[
 ---@param xyz Class
 ---@param xxx Class
 function f(x$)