Merge pull request #1757 from riganti/parser-fix

Incorrect child nodes for array initializer fixed
riganti · Jan 6, 2024 · d376126 · d376126
2 parents 80b626f + 63680a2
commit d376126
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Framework/Framework/Compilation/Parser/Binding/Parser/ArrayInitializerExpression.cs b/src/Framework/Framework/Compilation/Parser/Binding/Parser/ArrayInitializerExpression.cs
@@ -14,7 +14,7 @@ public ArrayInitializerExpression(List<BindingParserNode> elementInitializers)
             ElementInitializers = elementInitializers;
         }
 
-        public override IEnumerable<BindingParserNode> EnumerateChildNodes() => base.EnumerateNodes().Concat(ElementInitializers);
+        public override IEnumerable<BindingParserNode> EnumerateChildNodes() => ElementInitializers;
 
         public override string ToDisplayString() => $"[ {(string.Join(", ", ElementInitializers.Select(arg => arg.ToDisplayString())))} ]";
     }

diff --git a/src/Tests/Runtime/ControlTree/DefaultControlTreeResolver/PropertyDirectiveTests.cs b/src/Tests/Runtime/ControlTree/DefaultControlTreeResolver/PropertyDirectiveTests.cs
@@ -43,5 +43,21 @@ @viewModel object
 
             Assert.IsTrue(error.Contains("Cannot assign"), "Expected error about failed assignment into the attribute property.");
         }
+
+        [TestMethod]
+        public void ResolvedTree_PropertyDirectiveArrayInicializer_ResolvedCorrectly()
+        {
+            var root = ParseSource(@$"
+@viewModel object
+@property string a=[, MarkupOptionsAttribute.Required = true");
+
+            var property = root.Directives["property"].SingleOrDefault() as IAbstractPropertyDeclarationDirective;
+
+            var nodes = property.InitializerSyntax.EnumerateChildNodes();
+
+            Assert.IsFalse(nodes.Any(n => n == property.InitializerSyntax));
+
+            Assert.AreEqual(2,nodes.Count());
+        }
     }
 }