Fix alias completion, Fix continue additional text

CppCXY · Aug 12, 2024 · a374dc8 · a374dc8
1 parent 592efcc
commit a374dc8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/EmmyLua.LanguageServer/Completion/CompleteProvider/AliasAndEnumProvider.cs b/EmmyLua.LanguageServer/Completion/CompleteProvider/AliasAndEnumProvider.cs
@@ -148,19 +148,20 @@ private void AddAggregateTypeCompletion(LuaAggregateType aggregateType, Complete
                     detail = string.Join("\n", details.Select(d => d.RepresentText.Trim('#', '@')));
                 }
 
-                if (literalType is { IsString: true, String: { } stringLiteral })
+                if (literalType is { IsString: true, String: { Value: { } label } stringLiteral })
                 {
-                    var label = stringLiteral.RepresentText;
                     // compact emmylua old alias
-                    if (declaration.Type is LuaStringLiteralType stringLiteralType
-                        && (stringLiteralType.Content.StartsWith('\'') || stringLiteralType.Content.StartsWith('"')))
-                    {
-                        label = stringLiteralType.Content;
-                    }
+                    label = label.Trim('\'', '\"');
 
                     if (context.TriggerToken is not LuaStringToken)
                     {
-                        label = $"\"{label}\"";
+                        var quote = "\'";
+                        if (stringLiteral.RepresentText.StartsWith('\"'))
+                        {
+                            quote = "\"";
+                        }
+
+                        label = $"{quote}{label}{quote}";
                     }
 
                     context.Add(new CompletionItem

diff --git a/EmmyLua.LanguageServer/Completion/CompleteProvider/GlobalProvider.cs b/EmmyLua.LanguageServer/Completion/CompleteProvider/GlobalProvider.cs
@@ -10,14 +10,6 @@ public void AddCompletion(CompleteContext context)
         {
             AddGlobalCompletion(context);
         }
-        // else if (context.TriggerToken is LuaWhitespaceToken)
-        // {
-        //     AddGlobalCompletion(context);
-        // }
-        // else if (context.TriggerToken is { Kind: LuaTokenKind.TkEndOfLine })
-        // {
-        //     AddGlobalCompletion(context);
-        // }
     }
 
     private void AddGlobalCompletion(CompleteContext context)

diff --git a/EmmyLua.LanguageServer/Completion/CompleteProvider/KeywordsProvider.cs b/EmmyLua.LanguageServer/Completion/CompleteProvider/KeywordsProvider.cs
@@ -63,6 +63,11 @@ private void ContinueCompletion(CompleteContext context)
             var blockIndentText = string.Empty;
             if (loopStat.FirstChild<LuaBlockSyntax>()?.StatList.LastOrDefault() is { } lastStat)
             {
+                if (lastStat is LuaLabelStatSyntax { Name.Text: "continue"})
+                {
+                    return null;
+                }
+
                 var indentToken = lastStat.GetPrevSibling();
                 if (indentToken is LuaWhitespaceToken
                     {