Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/ExpressiveSharp.Generator/Emitter/ExpressionTreeEmitter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1228,8 +1228,9 @@ private string EmitObjectCreation(IObjectCreationOperation creation)
}
else
{
var bindingsExpr = string.Join(", ", bindingVars);
AppendLine($"var {resultVar} = {Expr}.MemberInit({newVar}, {bindingsExpr});");
AppendLine(bindingVars.Count == 0
? $"var {resultVar} = {Expr}.MemberInit({newVar});"
: $"var {resultVar} = {Expr}.MemberInit({newVar}, {string.Join(", ", bindingVars)});");
Comment on lines +1231 to +1233
}
}
else
Expand Down Expand Up @@ -1385,8 +1386,9 @@ private string EmitArrayCreation(IArrayCreationOperation arrayCreate)
elementVars.Add(EmitOperation(element));
}

var elementsExpr = string.Join(", ", elementVars);
AppendLine($"var {resultVar} = {Expr}.NewArrayInit(typeof({elementTypeFqn}), {elementsExpr});");
AppendLine(elementVars.Count == 0
? $"var {resultVar} = {Expr}.NewArrayInit(typeof({elementTypeFqn}));"
: $"var {resultVar} = {Expr}.NewArrayInit(typeof({elementTypeFqn}), {string.Join(", ", elementVars)});");
}
else
{
Expand All @@ -1396,8 +1398,9 @@ private string EmitArrayCreation(IArrayCreationOperation arrayCreate)
dimVars.Add(EmitOperation(dim));
}

var dimsExpr = string.Join(", ", dimVars);
AppendLine($"var {resultVar} = {Expr}.NewArrayBounds(typeof({elementTypeFqn}), {dimsExpr});");
AppendLine(dimVars.Count == 0
? $"var {resultVar} = {Expr}.NewArrayBounds(typeof({elementTypeFqn}));"
: $"var {resultVar} = {Expr}.NewArrayBounds(typeof({elementTypeFqn}), {string.Join(", ", dimVars)});");
}

return resultVar;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,23 @@ class C {

return Verifier.Verify(result.GeneratedTrees[0].ToString());
}

[TestMethod]
public void EmptyArrayInitializer_GeneratedCodeCompiles()
{
var compilation = CreateCompilation(
"""
namespace Foo {
class C {
[Expressive]
public static int[] Empty() => new int[] { };
}
}
""");

var result = RunExpressiveGenerator(compilation);

Assert.AreEqual(1, result.GeneratedTrees.Length);
Assert.IsFalse(result.Diagnostics.Any(d => d.Severity == Microsoft.CodeAnalysis.DiagnosticSeverity.Error));
Comment on lines +174 to +175
}
}
Loading