Don't crash when XAML namespace cannot be resolved (refs #282)

dnSpyEx · Jan 11, 2024 · 474a6af · 474a6af
1 parent e6c047e
commit 474a6af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/Extensions/dnSpy.BamlDecompiler/Xaml/XamlProperty.cs b/Extensions/dnSpy.BamlDecompiler/Xaml/XamlProperty.cs
@@ -151,15 +151,7 @@ public string ToMarkupExtensionName(XamlContext ctx, XElement parent, bool isFul
 				return XmlConvert.EncodeLocalName(PropertyName);
 
 			var sb = new StringBuilder();
-			if (DeclaringType.Namespace != parent.GetDefaultNamespace()) {
-				var prefix = parent.GetPrefixOfNamespace(DeclaringType.Namespace);
-				if (!string.IsNullOrEmpty(prefix)) {
-					sb.Append(prefix);
-					sb.Append(':');
-				}
-			}
-
-			DeclaringType.TypeName.AppendEncodedName(sb);
+			DeclaringType.AppendMarkupExtensionName(sb, parent);
 			sb.Append('.');
 			sb.Append(XmlConvert.EncodeLocalName(PropertyName));
 			return sb.ToString();

diff --git a/Extensions/dnSpy.BamlDecompiler/Xaml/XamlType.cs b/Extensions/dnSpy.BamlDecompiler/Xaml/XamlType.cs
@@ -101,17 +101,19 @@ public XName ToXName(XamlContext ctx) {
 
 		public string ToMarkupExtensionName(XamlContext ctx, XElement elem) {
 			ResolveNamespace(elem, ctx);
+			return AppendMarkupExtensionName(new StringBuilder(), elem).ToString();
+		}
 
-			var sb = new StringBuilder();
-			if (Namespace != elem.GetDefaultNamespace()) {
+		public StringBuilder AppendMarkupExtensionName(StringBuilder sb, XElement elem) {
+			if (Namespace is not null && Namespace != elem.GetDefaultNamespace()) {
 				var prefix = elem.GetPrefixOfNamespace(Namespace);
 				if (!string.IsNullOrEmpty(prefix)) {
 					sb.Append(prefix);
 					sb.Append(':');
 				}
 			}
 
-			return TypeName.AppendEncodedName(sb).ToString();
+			return TypeName.AppendEncodedName(sb);
 		}
 
 		public override string ToString() => TypeName;