Support array tipes as viewmodels

riganti · Oct 12, 2023 · d5bfe0c · d5bfe0c
1 parent a8aea52
commit d5bfe0c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/Framework/Framework/Compilation/Parser/Binding/Parser/BindingParser.cs b/src/Framework/Framework/Compilation/Parser/Binding/Parser/BindingParser.cs
@@ -120,7 +120,11 @@ public BindingParserNode ReadPropertyDirectiveValue()
         public BindingParserNode ReadDirectiveTypeName()
         {
             var startIndex = CurrentIndex;
-            var typeName = ReadNamespaceOrTypeName();
+
+            var typeName = TryReadTypeReference(out var resultType)
+                ? resultType
+                : new ActualTypeReferenceBindingParserNode(new SimpleNameBindingParserNode(""));
+
             if (PeekType() == BindingTokenType.Comma)
             {
                 Read();

diff --git a/src/Tests/Parser/Binding/BindingParserTests.cs b/src/Tests/Parser/Binding/BindingParserTests.cs
@@ -829,6 +829,35 @@ public void BindingParser_GenericExpression_MemberAccessInsteadOfType_Invalid()
                 .As<IdentifierNameBindingParserNode>().Name == "");
         }
 
+        [TestMethod]
+        [DataRow("Domain.Company.Product.DotVVM.Feature.Type[], Domain.Company.Product")]
+        [DataRow("Domain.Company.Product.DotVVM.Feature.Type[], Product")]
+        [DataRow("Domain.Company.Product.DotVVM.Feature.Type<string>[], Domain.Company.Product")]
+        [DataRow("Domain.Company.Product.DotVVM.Feature.Type<string>[], Product")]
+        public void BindingParser_ArrayType_AssemblyQualifiedName_ValidAssemblyName(string binding)
+        {
+            var parser = bindingParserNodeFactory.SetupParser(binding);
+            var node = parser.ReadDirectiveTypeName() as AssemblyQualifiedNameBindingParserNode;
+            Assert.IsNotNull(node, "expected qualified name node.");
+
+            var array = node.TypeName as ArrayTypeReferenceBindingParserNode;
+
+            Assert.IsNotNull(array, "Expected array type reference");
+            Assert.IsFalse(node.AssemblyName.HasNodeErrors);
+        }
+
+        [TestMethod]
+        [DataRow("Domain.Company.Product.DotVVM.Feature.Type[]")]
+        [DataRow("Domain.Company.Product.DotVVM.Feature.Type<string>[]")]
+        public void BindingParser_ArrayType_ValidAssemblyName(string binding)
+        {
+            var parser = bindingParserNodeFactory.SetupParser(binding);
+            var array = parser.ReadDirectiveTypeName() as ArrayTypeReferenceBindingParserNode;
+
+            Assert.IsNotNull(array, "Expected array type reference");
+            Assert.IsFalse(array.HasNodeErrors);
+        }
+
         [TestMethod]
         [DataRow("Domain.Company.Product.DotVVM.Feature.Type, Domain.Company.Product")]
         [DataRow("Domain.Company.Product.DotVVM.Feature.Type, Product")]