add key attribute for enum

CppCXY · Aug 6, 2024 · 592efcc · 592efcc
1 parent 5387b32
commit 592efcc
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,6 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 9.0.x
-        pre-release: true
     - name: Build-General
       if: matrix.target != 'linux-musl-x64'
       run: dotnet publish EmmyLua.LanguageServer -r ${{ matrix.target }} -c Release -o ${{ github.workspace }}/artifact/ --sc /p:DebugType=None

diff --git a/EmmyLua.LanguageServer/Completion/CompleteProvider/AliasAndEnumProvider.cs b/EmmyLua.LanguageServer/Completion/CompleteProvider/AliasAndEnumProvider.cs
@@ -111,14 +111,28 @@ private void AddEnumParamCompletion(TypeInfo typeInfo, CompleteContext context)
         {
             return;
         }
-
-        foreach (var field in typeInfo.Declarations.Values)
+
+        if (typeInfo.KeyEnum)
+        {
+            foreach (var field in typeInfo.Declarations.Values)
+            {
+                context.Add(new CompletionItem
+                {
+                    Label = field.Name,
+                    Kind = CompletionItemKind.EnumMember,
+                });
+            }
+        }
+        else
         {
-            context.Add(new CompletionItem
+            foreach (var field in typeInfo.Declarations.Values)
             {
-                Label = field.Name,
-                Kind = CompletionItemKind.EnumMember,
-            });
+                context.Add(new CompletionItem
+                {
+                    Label = $"{typeInfo.Name}.{field.Name}",
+                    Kind = CompletionItemKind.EnumMember,
+                });
+            }
         }
     }
 

diff --git a/EmmyLua/CodeAnalysis/Compilation/Analyzer/DeclarationAnalyzer/DeclarationAnalyzer.cs b/EmmyLua/CodeAnalysis/Compilation/Analyzer/DeclarationAnalyzer/DeclarationAnalyzer.cs
@@ -22,6 +22,6 @@ public override void Analyze(AnalyzeContext analyzeContext)
             var attachDeclarationAnalyzer = new AttachDeclarationAnalyzer(declarationContext, searchContext);
             attachDeclarationAnalyzer.Analyze();
         }
-        compilation.TypeManager.BuildSubTypes();
+        Compilation.TypeManager.BuildSubTypes();
     }
 }
diff --git a/...a/CodeAnalysis/Compilation/Analyzer/DeclarationAnalyzer/DeclarationWalker/TagDocWalker.cs b/...a/CodeAnalysis/Compilation/Analyzer/DeclarationAnalyzer/DeclarationWalker/TagDocWalker.cs
@@ -319,6 +319,16 @@ private LuaTypeAttribute GetAttribute(LuaDocTagNamedTypeSyntax tagNamedTypeSynta
                             attribute |= LuaTypeAttribute.Exact;
                             break;
                         }
+                        case "global":
+                        {
+                            attribute |= LuaTypeAttribute.Global;
+                            break;
+                        }
+                        case "key":
+                        {
+                            attribute |= LuaTypeAttribute.Key;
+                            break;
+                        }
                     }
                 }
             }

diff --git a/EmmyLua/CodeAnalysis/Type/LuaTypeAttribute.cs b/EmmyLua/CodeAnalysis/Type/LuaTypeAttribute.cs
@@ -7,4 +7,5 @@ public enum LuaTypeAttribute
     Partial = 0x01,
     Exact = 0x02,
     Global = 0x04,
+    Key = 0x08,
 }
diff --git a/EmmyLua/CodeAnalysis/Type/Manager/TypeInfo/TypeInfo.cs b/EmmyLua/CodeAnalysis/Type/Manager/TypeInfo/TypeInfo.cs
@@ -83,6 +83,8 @@ public record struct OverloadStub(LuaDocumentId DocumentId, LuaMethodType Method
 
     public bool Global => Attribute.HasFlag(LuaTypeAttribute.Global);
 
+    public bool KeyEnum => Attribute.HasFlag(LuaTypeAttribute.Key);
+
     public bool RemovePartial(LuaDocumentId documentId, LuaTypeManager typeManager)
     {
         var removeAll = true;