fix xaml type name

Author: oolanlongoo

Extensions/dnSpy.BamlDecompiler/BamlDecompiler.cs

@@ -29,6 +29,11 @@ You should have received a copy of the GNU General Public License
 namespace dnSpy.BamlDecompiler {
 	[Export(typeof(IBamlDecompiler))]
 	sealed class BamlDecompiler : IBamlDecompiler {
+		public string DecompileTypeName(ModuleDef module, byte[] data, CancellationToken token, BamlDecompilerOptions bamlDecompilerOptions) {
+			var doc = BamlReader.ReadDocument(new MemoryStream(data), token);
+			return XamlDecompiler.DecompileTypeName(module, doc, token, bamlDecompilerOptions);
+		}
+
 		public IList<string> Decompile(ModuleDef module, byte[] data, CancellationToken token, BamlDecompilerOptions bamlDecompilerOptions, Stream output, XamlOutputOptions outputOptions) {
 			var doc = BamlReader.ReadDocument(new MemoryStream(data), token);
 			var asmRefs = new List<string>();

Extensions/dnSpy.BamlDecompiler/XamlDecompiler.cs

@@ -39,6 +39,21 @@ static class XamlDecompiler {
 			new DocumentRewritePass(),
 		};
 
+		public static string DecompileTypeName(ModuleDef module, BamlDocument document, CancellationToken token, BamlDecompilerOptions bamlDecompilerOptions) {
+			var ctx = XamlContext.Construct(module, document, token, bamlDecompilerOptions);
+
+			var handler = HandlerMap.LookupHandler(ctx.RootNode.Type);
+			var elem = handler.Translate(ctx, ctx.RootNode, null);
+
+			var xaml = new XDocument();
+			xaml.Add(elem.Xaml.Element);
+
+			token.ThrowIfCancellationRequested();
+			rewritePasses[0].Run(ctx, xaml);
+
+			return xaml.Root.Elements().FirstOrDefault().Attributes().FirstOrDefault(x => x.Name.LocalName == "Class")?.Value;
+		}
+
 		public static XDocument Decompile(ModuleDef module, BamlDocument document, CancellationToken token, BamlDecompilerOptions bamlDecompilerOptions, List<string> assemblyReferences) {
 			var ctx = XamlContext.Construct(module, document, token, bamlDecompilerOptions);
 

dnSpy/dnSpy.Console/Program.cs

@@ -971,8 +971,10 @@ ProjectModuleOptions CreateProjectModuleOptions(ModuleDef mod) {
 				NewLineChars = Environment.NewLine,
 				NewLineOnAttributes = true,
 			};
-			if (bamlDecompiler is not null)
+			if (bamlDecompiler is not null) {
+				proj.DecompileBamlTypeName = (a, b, c) => bamlDecompiler.DecompileTypeName(a, b, c, o);
 				proj.DecompileBaml = (a, b, c, d) => bamlDecompiler.Decompile(a, b, c, o, d, outputOptions);
+			}
 			return proj;
 		}
 

dnSpy/dnSpy.Contracts.Logic/Decompiler/IBamlDecompiler.cs

@@ -27,6 +27,16 @@ namespace dnSpy.Contracts.Decompiler {
 	/// Baml to xaml decompiler
 	/// </summary>
 	public interface IBamlDecompiler {
+		/// <summary>
+		/// Decompile the type name from baml data
+		/// </summary>
+		/// <param name="module"></param>
+		/// <param name="data"></param>
+		/// <param name="token"></param>
+		/// <param name="bamlDecompilerOptions"></param>
+		/// <returns></returns>
+		string DecompileTypeName(ModuleDef module, byte[] data, CancellationToken token, BamlDecompilerOptions bamlDecompilerOptions);
+
 		/// <summary>
 		/// Decompiles baml to xaml. Returns all assembly references.
 		/// </summary>

dnSpy/dnSpy.Decompiler/MSBuild/Project.cs

@@ -416,7 +416,8 @@ IEnumerable<ProjectFile> CreateXamlResourceFiles(ModuleDef module, ResourceNameC
 
 				var rsrcName = Uri.UnescapeDataString(e.Name);
 				if (decompileBaml && rsrcName.EndsWith(".baml", StringComparison.OrdinalIgnoreCase)) {
-					var filename = resourceNameCreator.GetBamlResourceName(rsrcName, out string typeFullName);
+					var bamlTypeName = Options.DecompileBamlTypeName!(module, data, Options.DecompilationContext.CancellationToken);
+					var filename = resourceNameCreator.GetBamlResourceName(rsrcName, bamlTypeName, out string typeFullName);
 					yield return new BamlResourceProjectFile(filename, data, typeFullName, (bamlData, stream) => Options.DecompileBaml!(module, bamlData, Options.DecompilationContext.CancellationToken, stream));
 				}
 				else if (StringComparer.InvariantCultureIgnoreCase.Equals(splashScreenImageName, e.Name)) {

dnSpy/dnSpy.Decompiler/MSBuild/ProjectModuleOptions.cs

@@ -73,6 +73,11 @@ sealed class ProjectModuleOptions {
 		/// </summary>
 		public bool DecompileXaml { get; set; }
 
+		/// <summary>
+		/// Decompiles type name from baml data
+		/// </summary>
+		public Func<ModuleDef, byte[], CancellationToken, string>? DecompileBamlTypeName;
+
 		/// <summary>
 		/// Decompiles baml data to a <see cref="Stream"/>
 		/// </summary>

dnSpy/dnSpy.Decompiler/MSBuild/ResourceNameCreator.cs

@@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 using dnlib.DotNet;
@@ -159,7 +160,7 @@ static string GetNamespace(string name) {
 			return name.Substring(0, i).Replace('/', '.');
 		}
 
-		public string GetBamlResourceName(string resourceName, out string typeFullName) {
+		public string GetBamlResourceName(string resourceName, string bamlTypeName, out string typeFullName) {
 			if (namespaces is null)
 				Initialize();
 			Debug2.Assert(partialNamespaceMap is not null);
@@ -169,10 +170,10 @@ public string GetBamlResourceName(string resourceName, out string typeFullName)
 			Debug2.Assert(namespaces is not null);
 
 			Debug.Assert(resourceName.EndsWith(".baml", StringComparison.OrdinalIgnoreCase));
-			var name = resourceName.Substring(0, resourceName.Length - ".baml".Length);
+			var name = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(resourceName.Substring(0, resourceName.Length - ".baml".Length));
 			var nameNoExt = name;
 			name = name.Replace('/', '.');
-			typeFullName = GetFullName(name) ?? string.Empty;
+			typeFullName = !string.IsNullOrWhiteSpace(bamlTypeName) ? bamlTypeName : GetFullName(name) ?? string.Empty;
 			if (!string.IsNullOrEmpty(typeFullName))
 				return filenameCreator.Create(".xaml", typeFullName);
 

dnSpy/dnSpy/Documents/Tabs/SaveCommands.cs

@@ -189,6 +189,7 @@ public void Execute(ExportToProjectVM vm) {
 						if (bamlDecompiler is not null) {
 							var o = BamlDecompilerOptions.Create(vm.Decompiler.Decompiler);
 							var outputOptions = xamlOutputOptionsProvider?.Default ?? new XamlOutputOptions();
+							projOpts.DecompileBamlTypeName = (a, b, c) => bamlDecompiler.DecompileTypeName(a, b, c, o);
 							projOpts.DecompileBaml = (a, b, c, d) => bamlDecompiler.Decompile(a, b, c, o, d, outputOptions);
 						}
 						options.ProjectModules.Add(projOpts);