[X] throw if x:Key isn't a string literal (xamarin#12427)

as reported in xamarin#12425
DancesWithDingo · Oct 19, 2020 · d4cbb4f · d4cbb4f
1 parent b349dd2
commit d4cbb4f
Show file tree

Hide file tree

Showing 24 changed files with 185 additions and 185 deletions.
diff --git a/Xamarin.Forms.Build.Tasks/BuildException.cs b/Xamarin.Forms.Build.Tasks/BuildException.cs
@@ -88,6 +88,7 @@ class BuildExceptionCode
 		public static BuildExceptionCode ResourceMissing = new BuildExceptionCode("XFC0124", nameof(ResourceMissing), "");
 		public static BuildExceptionCode ResourceDictDuplicateKey = new BuildExceptionCode("XFC0125", nameof(ResourceDictDuplicateKey), "");
 		public static BuildExceptionCode ResourceDictMissingKey = new BuildExceptionCode("XFC0126", nameof(ResourceDictMissingKey), "");
+		public static BuildExceptionCode XKeyNotLiteral = new BuildExceptionCode("XFC0127", nameof(XKeyNotLiteral), "");
 
 		public string Code { get; private set; }
 		public string ErrorMessageKey { get; private set; }

diff --git a/Xamarin.Forms.Build.Tasks/ErrorMessages.Designer.cs b/Xamarin.Forms.Build.Tasks/ErrorMessages.Designer.cs
diff --git a/Xamarin.Forms.Build.Tasks/ErrorMessages.resx b/Xamarin.Forms.Build.Tasks/ErrorMessages.resx
@@ -244,5 +244,9 @@
   </data>
   <data name="XStaticSyntax" xml:space="preserve">
     <value>Syntax for x:Static is "[Member=][prefix:]typeName.staticMemberName".</value>
+  </data>  
+  <data name="XKeyNotLiteral" xml:space="preserve">
+    <value>x:Key expects a string literal.</value>
   </data>
+
 </root>
diff --git a/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs b/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
@@ -1429,7 +1429,8 @@ static bool CanAddToResourceDictionary(VariableDefinition parent, TypeReference
 
 			if (node.Properties.ContainsKey(XmlName.xKey))
 			{
-				var key = (node.Properties[XmlName.xKey] as ValueNode).Value as string;
+				var valueNode = node.Properties[XmlName.xKey] as ValueNode ?? throw new BuildException(XKeyNotLiteral, lineInfo, null);
+				var key = (valueNode).Value as string;
 				if (!resourceNamesInUse.TryGetValue(parent, out var names))
 					resourceNamesInUse[parent] = (names = new List<string>());
 				if (names.Contains(key))
@@ -1482,7 +1483,8 @@ static IEnumerable<Instruction> AddToResourceDictionary(VariableDefinition paren
 			if (node.Properties.ContainsKey(XmlName.xKey))
 			{
 				var names = resourceNamesInUse[parent];
-				var key = (node.Properties[XmlName.xKey] as ValueNode).Value as string;
+				var valueNode = node.Properties[XmlName.xKey] as ValueNode ?? throw new BuildException(XKeyNotLiteral, lineInfo, null);
+				var key = (valueNode).Value as string;
 				names.Add(key);
 
 				//				IL_0014:  ldstr "key"

diff --git a/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.cs.xlf b/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.cs.xlf
@@ -162,6 +162,11 @@
         <target state="translated">x:DataType očekává řetězcový literál, značku {{x:Type}} nebo {{x:Nul}l}.</target>
         <note />
       </trans-unit>
+      <trans-unit id="XKeyNotLiteral">
+        <source>x:Key expects a string literal.</source>
+        <target state="new">x:Key expects a string literal.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="XStaticResolution">
         <source>x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}".</source>
         <target state="translated">x:Static: nejde najít veřejné nebo přístupné interní statické pole, statickou vlastnost, konstantu nebo hodnotu výčtu s názvem {0} v typu {1}.</target>

diff --git a/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.de.xlf b/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.de.xlf
@@ -162,6 +162,11 @@
         <target state="translated">x:DataType erwartet ein Zeichenfolgenliteral, ein {{x:Type}}-Markup oder {{x:Nul}l}.</target>
         <note />
       </trans-unit>
+      <trans-unit id="XKeyNotLiteral">
+        <source>x:Key expects a string literal.</source>
+        <target state="new">x:Key expects a string literal.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="XStaticResolution">
         <source>x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}".</source>
         <target state="translated">x:Static: Ein öffentliches – oder zugängliches internes – statisches Feld, eine statische Eigenschaft oder ein const- oder enum-Wert mit dem Namen "{0}" wurde in "{1}" nicht gefunden.</target>

diff --git a/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.es.xlf b/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.es.xlf
@@ -162,6 +162,11 @@
         <target state="translated">x:DataType espera un literal de cadena, una marca {{x:Type}} o {{x:Nul}l}.</target>
         <note />
       </trans-unit>
+      <trans-unit id="XKeyNotLiteral">
+        <source>x:Key expects a string literal.</source>
+        <target state="new">x:Key expects a string literal.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="XStaticResolution">
         <source>x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}".</source>
         <target state="translated">x:Static: no puede encontrar un campo estático público (o interno accesible), una propiedad estática o un valor constante o de enumeración llamados "{0}" en "{1}".</target>

diff --git a/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.fr.xlf b/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.fr.xlf
@@ -162,6 +162,11 @@
         <target state="translated">x:DataType attend un littéral de chaîne, une balise {{x:Type}} ou {{x:Nul}l}.</target>
         <note />
       </trans-unit>
+      <trans-unit id="XKeyNotLiteral">
+        <source>x:Key expects a string literal.</source>
+        <target state="new">x:Key expects a string literal.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="XStaticResolution">
         <source>x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}".</source>
         <target state="translated">x:Static : impossible de localiser un champ statique public (ou interne et accessible), une propriété statique, une valeur const ou une valeur enum portant le nom "{0}" dans "{1}".</target>

diff --git a/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.it.xlf b/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.it.xlf
@@ -162,6 +162,11 @@
         <target state="translated">Con x:DataType è previsto un valore letterale stringa, un markup {{x:Type}} oppure {{x:Nul}l}.</target>
         <note />
       </trans-unit>
+      <trans-unit id="XKeyNotLiteral">
+        <source>x:Key expects a string literal.</source>
+        <target state="new">x:Key expects a string literal.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="XStaticResolution">
         <source>x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}".</source>
         <target state="translated">x:Static: non è possibile trovare un valore di campo statico pubblico o interno accessibile, di proprietà statica, di costante o di enumerazione denominato "{0}" in "{1}".</target>

diff --git a/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.ja.xlf b/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.ja.xlf
@@ -162,6 +162,11 @@
         <target state="translated">x:DataType には、文字列リテラル、{{x:Type}} マークアップ、または {{x:Nul}l} を指定する必要があります。</target>
         <note />
       </trans-unit>
+      <trans-unit id="XKeyNotLiteral">
+        <source>x:Key expects a string literal.</source>
+        <target state="new">x:Key expects a string literal.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="XStaticResolution">
         <source>x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}".</source>
         <target state="translated">x:Static: "{1}" に、"{0}" という名前のパブリックな (またはアクセス可能な内部の) 静的フィールド、静的プロパティ、const、または列挙値が見つかりません。</target>

diff --git a/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.ko.xlf b/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.ko.xlf
@@ -162,6 +162,11 @@
         <target state="translated">x:DataType에는 {{x:Type}} 태그 또는 {{x:Nul}l} 문자열 리터럴이 필요합니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="XKeyNotLiteral">
+        <source>x:Key expects a string literal.</source>
+        <target state="new">x:Key expects a string literal.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="XStaticResolution">
         <source>x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}".</source>
         <target state="translated">x:Static: "{1}"에서 이름이 "{0}"인 public 또는 액세스 가능한 내부 정적 필드, 정적 속성, 상수 또는 열거형 값을 찾을 수 없습니다.</target>

diff --git a/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.pl.xlf b/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.pl.xlf
@@ -162,6 +162,11 @@
         <target state="translated">Argument x:DataType oczekuje literału ciągu, znacznika {{x:Type}} lub {{x:Nul}l}.</target>
         <note />
       </trans-unit>
+      <trans-unit id="XKeyNotLiteral">
+        <source>x:Key expects a string literal.</source>
+        <target state="new">x:Key expects a string literal.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="XStaticResolution">
         <source>x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}".</source>
         <target state="translated">x:Static: nie można odnaleźć publicznego — lub dostępnego wewnętrznie — pola statycznego, właściwości statycznej, stałej lub wartości wyliczenia o nazwie „{0}” w typie „{1}”.</target>

diff --git a/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.pt-BR.xlf b/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.pt-BR.xlf
@@ -162,6 +162,11 @@
         <target state="translated">O x:DataType espera um literal de cadeia de caracteres, uma marcação {{x:Type}} ou um {{x:Nul}l}.</target>
         <note />
       </trans-unit>
+      <trans-unit id="XKeyNotLiteral">
+        <source>x:Key expects a string literal.</source>
+        <target state="new">x:Key expects a string literal.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="XStaticResolution">
         <source>x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}".</source>
         <target state="translated">O x:Static: não pôde encontrar um campo estático, uma propriedade estática, um valor const ou enumerado público (ou interno acessível) denominado "{0}" em "{1}".</target>

diff --git a/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.ru.xlf b/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.ru.xlf
@@ -162,6 +162,11 @@
         <target state="translated">x:DataType ожидает строковый литерал, разметку {{x:Type}} или {{x:Nul}l}.</target>
         <note />
       </trans-unit>
+      <trans-unit id="XKeyNotLiteral">
+        <source>x:Key expects a string literal.</source>
+        <target state="new">x:Key expects a string literal.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="XStaticResolution">
         <source>x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}".</source>
         <target state="translated">x:Static: не удается найти статическое поле, статическое свойство, константу или значение перечисления с именем "{0}" в "{1}", которые являлись бы открытыми или были бы доступны внутренне.</target>

diff --git a/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.tr.xlf b/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.tr.xlf
@@ -162,6 +162,11 @@
         <target state="translated">x:DataType için bir dize sabit değeri, {{x:Type}} işaretlemesi veya {{x:Nul}l} bekleniyor.</target>
         <note />
       </trans-unit>
+      <trans-unit id="XKeyNotLiteral">
+        <source>x:Key expects a string literal.</source>
+        <target state="new">x:Key expects a string literal.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="XStaticResolution">
         <source>x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}".</source>
         <target state="translated">x:Static: "{1}" içinde "{0}" adlı genel -- veya erişilebilir, dahili -- statik alan, statik özellik, sabit veya sabit listesi değeri bulunamıyor.</target>

diff --git a/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.zh-Hans.xlf b/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.zh-Hans.xlf
@@ -162,6 +162,11 @@
         <target state="translated">x:DataType 需要字符串文本、{{x:Type}} 标记或 {{x:Nul}l}。</target>
         <note />
       </trans-unit>
+      <trans-unit id="XKeyNotLiteral">
+        <source>x:Key expects a string literal.</source>
+        <target state="new">x:Key expects a string literal.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="XStaticResolution">
         <source>x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}".</source>
         <target state="translated">x:Static: 在“{1}”中找不到公共(或可访问的内部)静态字段、静态属性、常量或枚举值“{0}”。</target>

diff --git a/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.zh-Hant.xlf b/Xamarin.Forms.Build.Tasks/xlf/ErrorMessages.zh-Hant.xlf
@@ -162,6 +162,11 @@
         <target state="translated">x:DataType 需要字串常值、{{x:Type}} 標記或 {{x:Nul}l}。</target>
         <note />
       </trans-unit>
+      <trans-unit id="XKeyNotLiteral">
+        <source>x:Key expects a string literal.</source>
+        <target state="new">x:Key expects a string literal.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="XStaticResolution">
         <source>x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}".</source>
         <target state="translated">x:Static: 在 "{1}" 中找不到名為 "{0}" 的公用 (或可存取內部) 靜態欄位、靜態屬性、常數或列舉值。</target>

diff --git a/Xamarin.Forms.Xaml.UnitTests/SetStyleIdFromXName.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/SetStyleIdFromXName.xaml.cs
@@ -6,11 +6,7 @@ namespace Xamarin.Forms.Xaml.UnitTests
 {
 	public partial class SetStyleIdFromXName : ContentPage
 	{
-		public SetStyleIdFromXName()
-		{
-			InitializeComponent();
-		}
-
+		public SetStyleIdFromXName() => InitializeComponent();
 		public SetStyleIdFromXName(bool useCompiledXaml)
 		{
 			//this stub will be replaced at compile time
@@ -19,17 +15,8 @@ public SetStyleIdFromXName(bool useCompiledXaml)
 		[TestFixture]
 		public class Tests
 		{
-			[SetUp]
-			public void Setup()
-			{
-				Device.PlatformServices = new MockPlatformServices();
-			}
-
-			[TearDown]
-			public void TearDown()
-			{
-				Device.PlatformServices = null;
-			}
+			[SetUp] public void Setup() => Device.PlatformServices = new MockPlatformServices();
+			[TearDown] public void TearDown() => Device.PlatformServices = null;
 
 			[TestCase(false), TestCase(true)]
 			public void SetStyleId(bool useCompiledXaml)

diff --git a/Xamarin.Forms.Xaml.UnitTests/XStaticException.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/XStaticException.xaml.cs
@@ -29,23 +29,8 @@ public class Tests
 			// - An enumeration value
 			// All other cases should throw
 
-			[SetUp]
-			public void Setup()
-			{
-				Device.PlatformServices = new MockPlatformServices();
-
-				//there's a test not resetting the values correctly, but can't find which one...
-#pragma warning disable 0618
-				Xamarin.Forms.Internals.ResourceLoader.ExceptionHandler = null;
-				Xamarin.Forms.Xaml.Internals.XamlLoader.DoNotThrowOnExceptions = false;
-#pragma warning restore 0618
-			}
-
-			[TearDown]
-			public void TearDown()
-			{
-				Device.PlatformServices = null;
-			}
+			[SetUp] public void Setup() => Device.PlatformServices = new MockPlatformServices();
+			[TearDown] public void TearDown() => Device.PlatformServices = null;
 
 			[TestCase(false)]
 			[TestCase(true)]

diff --git a/Xamarin.Forms.Xaml.UnitTests/XamlLoaderGetXamlForTypeTests.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/XamlLoaderGetXamlForTypeTests.xaml.cs
@@ -30,6 +30,20 @@ public void SetUp()
 #pragma warning restore 0618
 			}
 
+			[TearDown]
+			public void TearDown()
+			{
+				Device.PlatformServices = null;
+				XamlLoader.FallbackTypeResolver = null;
+				XamlLoader.ValueCreatedCallback = null;
+				XamlLoader.InstantiationFailedCallback = null;
+#pragma warning disable 0618
+				Xamarin.Forms.Internals.ResourceLoader.ExceptionHandler = null;
+				Xamarin.Forms.Xaml.Internals.XamlLoader.DoNotThrowOnExceptions = false;
+#pragma warning restore 0618
+
+			}
+
 			[TestCase(false)]
 			[TestCase(true)]
 			public void XamlContentIsReplaced(bool useCompiledXaml)

diff --git a/Xamarin.Forms.Xaml.UnitTests/xKeyLiteral.xaml b/Xamarin.Forms.Xaml.UnitTests/xKeyLiteral.xaml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="Xamarin.Forms.Xaml.UnitTests.xKeyLiteral">
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <Color x:Key="{x:Type Grid}">#96d1ff</Color>
+        </ResourceDictionary>
+    </ContentPage.Resources>
+</ContentPage>
diff --git a/Xamarin.Forms.Xaml.UnitTests/xKeyLiteral.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/xKeyLiteral.xaml.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using Xamarin.Forms;
+using Xamarin.Forms.Build.Tasks;
+using Xamarin.Forms.Core.UnitTests;
+
+namespace Xamarin.Forms.Xaml.UnitTests
+{
+	[XamlCompilation(XamlCompilationOptions.Skip)]
+	public partial class xKeyLiteral : ContentPage
+	{
+		public xKeyLiteral() => InitializeComponent();
+		public xKeyLiteral(bool useCompiledXaml)
+		{
+			//this stub will be replaced at compile time
+		}
+
+		[TestFixture]
+		class Tests
+		{
+			[SetUp] public void Setup() => Device.PlatformServices = new MockPlatformServices();
+			[TearDown] public void TearDown() => Device.PlatformServices = null;
+
+			[Test]
+			//this requirement might change, see https://github.com/xamarin/Xamarin.Forms/issues/12425
+			public void xKeyRequireStringLiteral([Values(false, true)] bool useCompiledXaml)
+			{
+				if (useCompiledXaml)
+					Assert.Throws<BuildException>(() => MockCompiler.Compile(typeof(xKeyLiteral)));
+				else
+					Assert.Throws<XamlParseException>(() => new xKeyLiteral(useCompiledXaml));
+			}
+		}
+	}
+}
diff --git a/Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs b/Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs
@@ -46,9 +46,8 @@ public void Visit(ValueNode node, INode parentNode)
 			if (!Values.TryGetValue(parentNode, out var source) && Context.ExceptionHandler != null)
 				return;
 
-			XmlName propertyName;
 
-			if (TryGetPropertyName(node, parentNode, out propertyName))
+			if (TryGetPropertyName(node, parentNode, out XmlName propertyName))
 			{
 				if (TrySetRuntimeName(propertyName, source, value, node))
 					return;
@@ -82,8 +81,7 @@ public void Visit(MarkupNode node, INode parentNode)
 
 		public void Visit(ElementNode node, INode parentNode)
 		{
-			XmlName propertyName;
-			if (TryGetPropertyName(node, parentNode, out propertyName) && propertyName == XmlName._CreateContent)
+			if (TryGetPropertyName(node, parentNode, out XmlName propertyName) && propertyName == XmlName._CreateContent)
 			{
 				var s0 = Values[parentNode];
 				if (s0 is ElementTemplate)
@@ -97,8 +95,7 @@ public void Visit(ElementNode node, INode parentNode)
 			propertyName = XmlName.Empty;
 
 			//Simplify ListNodes with single elements
-			var pList = parentNode as ListNode;
-			if (pList != null && pList.CollectionItems.Count == 1)
+			if (parentNode is ListNode pList && pList.CollectionItems.Count == 1)
 			{
 				propertyName = pList.XmlName;
 				parentNode = parentNode.Parent;
@@ -127,7 +124,15 @@ public void Visit(ElementNode node, INode parentNode)
 				ProvideValue(ref value, node, source, XmlName.Empty);
 				string contentProperty;
 				Exception xpe = null;
-				var xKey = node.Properties.ContainsKey(XmlName.xKey) ? ((ValueNode)node.Properties[XmlName.xKey]).Value as string : null;
+
+				string xKey = null;
+				if (xpe == null && node.Properties.ContainsKey(XmlName.xKey))
+				{
+					if ((node.Properties[XmlName.xKey] is ValueNode valueNode))
+						xKey = valueNode.Value as string;
+					if (xKey == null)
+						xpe = new XamlParseException("x:Key expects a string literal.", node as IXmlLineInfo);
+				}
 
 				//ResourceDictionary
 				if (xpe == null && TryAddToResourceDictionary(source as ResourceDictionary, value, xKey, node, out xpe))
@@ -168,10 +173,17 @@ public void Visit(ElementNode node, INode parentNode)
 				if (Skips.Contains(parentList.XmlName))
 					return;
 				Exception xpe = null;
-				var xKey = node.Properties.ContainsKey(XmlName.xKey) ? ((ValueNode)node.Properties[XmlName.xKey]).Value as string : null;
+				string xKey = null;
+				if (xpe == null && node.Properties.ContainsKey(XmlName.xKey))
+				{
+					if ((node.Properties[XmlName.xKey] is ValueNode valueNode))
+						xKey = valueNode.Value as string;
+					if (xKey == null)
+						xpe = new XamlParseException("x:Key expects a string literal.", node as IXmlLineInfo);
+				}
 
 				var collection = GetPropertyValue(source, parentList.XmlName, Context.RootElement, parentList, out _, out _) as IEnumerable;
-				if (collection == null)
+				if (xpe == null && collection == null)
 					xpe = new XamlParseException($"Property {parentList.XmlName.LocalName} is null or is not IEnumerable", node);
 
 				if (xpe == null && TryAddToResourceDictionary(collection as ResourceDictionary, value, xKey, node, out xpe))