#2718: Move XAML files that have an x:Class declaration next to their…

… C# counterparts when using WholeProjectDecompiler.

ILSpy.BamlDecompiler/BamlDecompilationResult.cs

@@ -20,16 +20,21 @@
 using System.Linq;
 using System.Xml.Linq;
 
+using ICSharpCode.Decompiler.TypeSystem;
+
 namespace ILSpy.BamlDecompiler
 {
 	public class BamlDecompilationResult
 	{
 		public XDocument Xaml { get; }
 		public List<string> AssemblyReferences { get; }
 
-		public BamlDecompilationResult(XDocument xaml, IEnumerable<string> assemblyReferences)
+		public FullTypeName? TypeName { get; }
+
+		public BamlDecompilationResult(XDocument xaml, FullTypeName? typeName, IEnumerable<string> assemblyReferences)
 		{
 			this.Xaml = xaml;
+			this.TypeName = typeName;
 			this.AssemblyReferences = assemblyReferences.ToList();
 		}
 	}

ILSpy.BamlDecompiler/BamlResourceNodeFactory.cs

@@ -20,6 +20,7 @@
 using System.ComponentModel.Composition;
 using System.IO;
 
+using ICSharpCode.Decompiler.CSharp.ProjectDecompiler;
 using ICSharpCode.Decompiler.Metadata;
 using ICSharpCode.ILSpy;
 using ICSharpCode.ILSpy.TreeNodes;
@@ -53,8 +54,15 @@ public string WriteResourceToFile(LoadedAssembly assembly, string fileName, Stre
 				ThrowOnAssemblyResolveErrors = options.DecompilerSettings.ThrowOnAssemblyResolveErrors
 			});
 			decompiler.CancellationToken = options.CancellationToken;
-			fileName = Path.ChangeExtension(fileName, ".xaml");
 			var result = decompiler.Decompile(stream);
+			if (result.TypeName.HasValue)
+			{
+				fileName = WholeProjectDecompiler.CleanUpPath(result.TypeName.Value.ReflectionName) + ".xaml";
+			}
+			else
+			{
+				fileName = Path.ChangeExtension(fileName, ".xaml");
+			}
 			result.Xaml.Save(Path.Combine(options.SaveAsProjectDirectory, fileName));
 			return fileName;
 		}

ILSpy.BamlDecompiler/Rewrite/XClassRewritePass.cs

@@ -62,6 +62,7 @@ void RewriteClass(XamlContext ctx, XElement elem)
 				attrs.Insert(0, new XAttribute(classModifierName, "internal"));
 			}
 			attrs.Insert(0, new XAttribute(attrName, type.ResolvedType.FullName));
+			ctx.XClassNames.Add(type.ResolvedType.FullName);
 			elem.ReplaceAttributes(attrs);
 		}
 	}

ILSpy.BamlDecompiler/XamlContext.cs

@@ -40,6 +40,7 @@ internal class XamlContext
 			TypeSystem = typeSystem;
 			NodeMap = new Dictionary<BamlRecord, BamlBlockNode>();
 			XmlNs = new XmlnsDictionary();
+			XClassNames = new List<string>();
 		}
 
 		Dictionary<ushort, XamlType> typeMap = new Dictionary<ushort, XamlType>();
@@ -54,6 +55,8 @@ internal class XamlContext
 		public BamlNode RootNode { get; private set; }
 		public IDictionary<BamlRecord, BamlBlockNode> NodeMap { get; }
 
+		public List<string> XClassNames { get; }
+
 		public XmlnsDictionary XmlNs { get; }
 
 		public static XamlContext Construct(IDecompilerTypeSystem typeSystem, BamlDocument document, CancellationToken token, BamlDecompilerSettings bamlDecompilerOptions)

ILSpy.BamlDecompiler/XamlDecompiler.cs

@@ -120,7 +120,8 @@ public BamlDecompilationResult Decompile(Stream stream)
 			}
 
 			var assemblyReferences = ctx.Baml.AssemblyIdMap.Select(a => a.Value.AssemblyFullName);
-			return new BamlDecompilationResult(xaml, assemblyReferences);
+			var typeName = ctx.XClassNames.FirstOrDefault() is string s ? (FullTypeName?)new FullTypeName(s) : null;
+			return new BamlDecompilationResult(xaml, typeName, assemblyReferences);
 		}
 	}
 }