fix: VisitConditionalAccessExpression being defined twice

roblox-csharp · Jan 10, 2025 · 311036c · 311036c
1 parent 4284556
commit 311036c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/RobloxCS.Luau/Macros.cs b/RobloxCS.Luau/Macros.cs
@@ -315,6 +315,20 @@ private static bool DictionaryMethod(Func<SyntaxNode, Node?> visit, MemberAccess
                 expanded = new Assignment(new ElementAccess(self, key), value);
                 break;
             }
+            case "ContainsKey": {
+                var arguments = (ArgumentList)visit(invocation.ArgumentList)!;
+                var self = (Expression)visit(memberAccess.Expression)!;
+                var key = arguments.Arguments.First().Expression;
+
+                expanded = new BinaryOperator(new ElementAccess(self, key), "~=", AstUtility.Nil());
+                break;
+            }
+            case "Clear": {
+                    var self = (Expression)visit(memberAccess.Expression)!;
+
+                    expanded = new Call(new QualifiedName(new IdentifierName("table"), new IdentifierName("clear")), new ArgumentList([new Argument(self)]));
+                    break;
+                }
         }
 
         expanded?.MarkExpanded(MacroKind.DictionaryMethod);

diff --git a/RobloxCS/LuauGenerator.cs b/RobloxCS/LuauGenerator.cs
@@ -725,10 +725,6 @@ public override Luau.Node VisitPostfixUnaryExpression(PostfixUnaryExpressionSynt
         return new Luau.UnaryOperator(mappedOperator, operand);
     }
 
-    public override Luau.BinaryOperator VisitConditionalAccessExpression(ConditionalAccessExpressionSyntax node) {
-        return new Luau.BinaryOperator(new Luau.BinaryOperator(Visit<Luau.Expression>(node.Expression), "~=", Luau.AstUtility.Nil()), "and", Visit<Luau.Expression>(node.WhenNotNull));
-    }
-
     public override Luau.Call VisitSwitchExpression(SwitchExpressionSyntax node) {
         var statements = new List<Luau.Statement>();
         var createTempVariable = node.GoverningExpression is not IdentifierNameSyntax && node.GoverningExpression is not LiteralExpressionSyntax;