偷偷支持新的 EmmyEnum

6 files changed, 57 insertions, 33 deletions

diff --git a/server/meta/Lua 5.4/basic.lua b/server/meta/Lua 5.4/basic.lua
index 4651c8b3..d94a3e10 100644
--- a/server/meta/Lua 5.4/basic.lua
+++ b/server/meta/Lua 5.4/basic.lua
@@ -11,7 +11,17 @@ end
 
 ---@overload fun()
 ---@overload fun(opt:string):any
----@param opt string {optional = 'after'} | '"collect"' | '"stop"' | '"restart"' | '"count"' | '"step"' | '"setpause"' | '"setstepmul"' | '"incremental"' | '"generational"' | '"isrunning"'
+---@param opt string {optional = 'after'}
+---| '"collect"'
+---| '"stop"'
+---| '"restart"'
+---| '"count"'
+---| '"step"'
+---| '"setpause"'
+---| '"setstepmul"'
+---| '"incremental"'
+---| '"generational"'
+---| '"isrunning"'
 ---@param arg integer {optional = 'self'}
 ---@return any
 function collectgarbage(opt, arg)
diff --git a/server/src/core/completion.lua b/server/src/core/completion.lua
index 18bf12af..37527ac2 100644
--- a/server/src/core/completion.lua
+++ b/server/src/core/completion.lua
@@ -677,18 +677,18 @@ local function searchEnumAsEmmyParams(vm, source, word, callback, pos, args, fun
         return
     end
 
-    param:eachEnum(function (enum)
-        if matchKey(word, enum) then
-            local strSource = parser:ast(tostring(enum), 'String')
+    param:eachEnum(function (str)
+        if matchKey(word, str) then
+            local strSource = parser:ast(tostring(str), 'String')
             if strSource then
                 if source.type == 'string' then
                     local data = buildTextEdit(source.start, source.finish, strSource[1], source[2])
-                    callback(enum, nil, CompletionItemKind.EnumMember, data)
+                    callback(str, nil, CompletionItemKind.EnumMember, data)
                 else
-                    callback(enum, nil, CompletionItemKind.EnumMember)
+                    callback(str, nil, CompletionItemKind.EnumMember)
                 end
             else
-                callback(enum, nil, CompletionItemKind.EnumMember)
+                callback(str, nil, CompletionItemKind.EnumMember)
             end
         end
     end)
diff --git a/server/src/emmy/manager.lua b/server/src/emmy/manager.lua
index 1be0be94..931c9449 100644
--- a/server/src/emmy/manager.lua
+++ b/server/src/emmy/manager.lua
@@ -136,7 +136,7 @@ function mt:addAlias(source, typeObj)
     local list = self:getClass(aliasName)
     list[source.id] = aliasObj
     for i = 3, #source do
-        aliasObj:addEnum(source[i][1])
+        aliasObj:addEnum(source[i][1][1], source[i].option)
     end
     return aliasObj
 end
@@ -149,14 +149,14 @@ function mt:addParam(source, bind)
         paramObj:bindType(bind)
         self:eachClass(bind:getName(), function (class)
             if class.type == 'emmy.alias' then
-                class:eachEnum(function (enum)
-                    paramObj:addEnum(enum)
+                class:eachEnum(function (enum, option)
+                    paramObj:addEnum(enum, option)
                 end)
             end
         end)
     end
     for i = 3, #source do
-        paramObj:addEnum(source[i][1])
+        paramObj:addEnum(source[i][1][1], source[i].option)
     end
     paramObj:setOption(source.option)
     return paramObj
diff --git a/server/src/emmy/param.lua b/server/src/emmy/param.lua
index 6fd41d5a..65791fd6 100644
--- a/server/src/emmy/param.lua
+++ b/server/src/emmy/param.lua
@@ -37,13 +37,13 @@ function mt:bindGeneric(generic)
     end
 end
 
-function mt:addEnum(str)
-    self._enum[#self._enum+1] = str
+function mt:addEnum(enum, option)
+    self._enum[#self._enum+1] = {enum, option}
 end
 
 function mt:eachEnum(callback)
-    for _, str in ipairs(self._enum) do
-        callback(str)
+    for _, enum in ipairs(self._enum) do
+        callback(enum[1], enum[2])
     end
 end
 
diff --git a/server/src/parser/ast.lua b/server/src/parser/ast.lua
index 0e408c73..e2add23e 100644
--- a/server/src/parser/ast.lua
+++ b/server/src/parser/ast.lua
@@ -1233,20 +1233,7 @@ local Defs = {
             ...
         }
     end,
-    EmmyParam = function (argName, emmyName, options, ...)
-        local option
-        if options then
-            option = {}
-            for _, pair in ipairs(options) do
-                if pair.type == 'pair' then
-                    local key = pair[1]
-                    local value = pair[2]
-                    if key.type == 'name' then
-                        option[key[1]] = value[1]
-                    end
-                end
-            end
-        end
+    EmmyParam = function (argName, emmyName, option, ...)
         local emmy = {
             type = 'emmyParam',
             option = option,
@@ -1332,6 +1319,31 @@ local Defs = {
             [1] = table.concat({...}, ' '),
         }
     end,
+    EmmyOption = function (options)
+        if not options or options == '' then
+            return nil
+        end
+        local option = {}
+        for _, pair in ipairs(options) do
+            if pair.type == 'pair' then
+                local key = pair[1]
+                local value = pair[2]
+                if key.type == 'name' then
+                    option[key[1]] = value[1]
+                end
+            end
+        end
+        return option
+    end,
+    EmmyTypeEnum = function (enum, option)
+        return {
+            type = 'emmyEnum',
+            option = option,
+            start = enum.start,
+            finish = enum.finish,
+            [1] = enum,
+        }
+    end,
 
     -- 捕获错误
     UnknownSymbol = function (start, symbol)
diff --git a/server/src/parser/grammar.lua b/server/src/parser/grammar.lua
index 913b0b25..5a408d90 100644
--- a/server/src/parser/grammar.lua
+++ b/server/src/parser/grammar.lua
@@ -556,12 +556,14 @@ EmmyTypeName    <-  EmmyFunctionType
                 /   EmmyTableType
                 /   EmmyArrayType
                 /   MustEmmyName
-EmmyTypeEnums   <-  %s* '|' %s* String
+EmmyTypeEnum    <-  %s* (%nl %s* '---')? '|' %s* (String EmmyOption)
+                ->  EmmyTypeEnum
 
-EmmyAlias       <-  MustEmmyName %s* EmmyType EmmyTypeEnums*
+EmmyAlias       <-  MustEmmyName %s* EmmyType EmmyTypeEnum*
 
-EmmyParam       <-  MustEmmyName %s* EmmyType %s* EmmyOption %s* EmmyTypeEnums*
-EmmyOption      <-  Table / %nil
+EmmyParam       <-  MustEmmyName %s* EmmyType %s* EmmyOption %s* EmmyTypeEnum*
+EmmyOption      <-  Table?
+                ->  EmmyOption
 
 EmmyReturn      <-  EmmyType