feat: implicit object creation

roblox-csharp · Jan 6, 2025 · de944bd · de944bd
1 parent e353c87
commit de944bd
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 9 deletions.
diff --git a/RobloxCS.Luau/AstUtility.cs b/RobloxCS.Luau/AstUtility.cs
@@ -208,6 +208,17 @@ public static Call Bit32Call(string methodName, params Expression[] arguments) =
         public static ArgumentList CreateArgumentList(List<Expression> arguments) =>
             new ArgumentList(arguments.ConvertAll(expression => new Argument(expression)));
 
+        public static SimpleName TypeNameFromSymbol(ITypeSymbol symbol)
+        {
+            if (symbol is INamedTypeSymbol { TypeParameters.Length: > 0 } namedTypeSymbol)
+            {
+                var typeParameters = namedTypeSymbol.TypeParameters.Select(typeParameter => TypeNameFromSymbol(typeParameter).ToString()).ToList();
+                return new GenericName(symbol.Name, typeParameters);
+            }
+
+            return new IdentifierName(symbol.Name);
+        }
+
         /// <summary>
         /// Returns the full name of a C# node's parent.
         /// This method is meant for getting the absolute location of classes, enums, etc.

diff --git a/RobloxCS.Luau/Macros.cs b/RobloxCS.Luau/Macros.cs
@@ -111,13 +111,17 @@ public class Macro(SemanticModel semanticModel)
 
     /// <summary>Takes a C# object creation and expands the macro into a Luau expression</summary>
     /// <returns>The expanded expression of the macro, or null if no macro was applied</returns>
-    public Expression? ObjectCreation(Func<SyntaxNode, Node?> visit, ObjectCreationExpressionSyntax objectCreation) {
+    public Expression? ObjectCreation(Func<SyntaxNode, Node?> visit, BaseObjectCreationExpressionSyntax baseObjectCreation) {
         // generic objects
-        if (objectCreation.Type is GenericNameSyntax genericName) {
-            switch (genericName.Identifier.Text) {
+        var type = (INamedTypeSymbol)(baseObjectCreation is ObjectCreationExpressionSyntax objectCreation
+            ? _semanticModel.GetSymbolInfo(objectCreation.Type)
+            : _semanticModel.GetSymbolInfo(baseObjectCreation)).Symbol!.ContainingSymbol;
+
+        if (type.TypeParameters.Length > 0) {
+            switch (type.Name) {
                 case "List":
                 {
-                    var expressions = objectCreation.Initializer?.Expressions.Select(expression => (Expression)visit(expression)!).ToList();
+                    var expressions = baseObjectCreation.Initializer?.Expressions.Select(expression => (Expression)visit(expression)!).ToList();
                     var table = new TableInitializer(expressions ?? []);
                     table.MarkExpanded(MacroKind.ListConstruction);
 
@@ -128,8 +132,8 @@ public class Macro(SemanticModel semanticModel)
                         var values = new List<Expression>();
                         var keys = new List<Expression>();
 
-                        if (objectCreation.Initializer != null) {
-                            foreach (var expression in objectCreation.Initializer.Expressions)
+                        if (baseObjectCreation.Initializer != null) {
+                            foreach (var expression in baseObjectCreation.Initializer.Expressions)
                             {
                                 switch (expression)
                                 {

diff --git a/RobloxCS/LuauGenerator.cs b/RobloxCS/LuauGenerator.cs
@@ -472,13 +472,21 @@ public override Luau.TableInitializer VisitCollectionExpression(CollectionExpres
 
     public override Luau.Node? VisitImplicitObjectCreationExpression(ImplicitObjectCreationExpressionSyntax node)
     {
-        // TODO
-        return base.VisitImplicitObjectCreationExpression(node);
+        // TODO: handle non-null node.Initializer (prob won't be supported)
+        var classSymbol = (ITypeSymbol)_semanticModel.GetSymbolInfo(node).Symbol!.ContainingSymbol;
+        var name = Luau.AstUtility.TypeNameFromSymbol(classSymbol);
+        var nonGenericName = Luau.AstUtility.GetNonGenericName(name);
+        var argumentList = Visit<Luau.ArgumentList>(node.ArgumentList);
+
+        var callee = new Luau.QualifiedName(nonGenericName, new Luau.IdentifierName("new"));
+        var expandedExpression = _macro.ObjectCreation(Visit, node);
+
+        return expandedExpression ?? new Luau.Call(callee, argumentList);
     }
 
     public override Luau.Expression VisitObjectCreationExpression(ObjectCreationExpressionSyntax node)
     {
-        // TODO: handle null node.Initializer
+        // TODO: handle non-null node.Initializer (prob won't be supported)
         var name = Visit<Luau.Name>(node.Type);
         var nonGenericName = Luau.AstUtility.GetNonGenericName(name);
         var argumentList = Visit<Luau.ArgumentList>(node.ArgumentList);