Fixed Issue #44: The ending TextLocation of an ArrayCreateExpression

is incorrect when the array is initialized with zero elements
icsharpcode · Apr 24, 2012 · 6f1325d · 6f1325d
1 parent 6a45cef
commit 6f1325d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs b/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
@@ -2850,7 +2850,7 @@ public override object Visit (ArrayCreation arrayCreationExpression)
 					next = next.Next;
 				}
 
-				if (arrayCreationExpression.Initializers != null && arrayCreationExpression.Initializers.Count != 0) {
+				if (arrayCreationExpression.Initializers != null) {
 					var initLocation = LocationsBag.GetLocations (arrayCreationExpression.Initializers);
 					ArrayInitializerExpression initializer = new ArrayInitializerExpression ();
 

diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/ArrayCreateExpressionTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/ArrayCreateExpressionTests.cs
@@ -146,7 +146,18 @@ public void AssignmentInArrayInitializer()
 						}
 					}});
 		}
-
+
+		[Test]
+		public void EmptyArrayCreation()
+		{
+			var ace = ParseUtilCSharp.ParseExpression<ArrayCreateExpression>("new [] { }");
+			Assert.AreEqual(new Role[] {
+			                	Roles.LBrace,
+			                	Roles.RBrace
+			                }, ace.Initializer.Children.Select(c => c.Role).ToArray());
+		}
+
+
 		[Test, Ignore("Parser bug")]
 		public void ArrayInitializerWithCommaAtEnd()
 		{