Support batch PDB generation. #3619
+458
−30
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -47,19 +47,30 @@ class GeneratePdbContextMenuEntry(LanguageService languageService, DockWorkspace | |||||
| { | ||||||
| public void Execute(TextViewContext context) | ||||||
| { | ||||||
| var selectedNodes = context.SelectedTreeNodes?.OfType<AssemblyTreeNode>().ToArray(); | ||||||
| if (selectedNodes == null || selectedNodes.Length == 0) | ||||||
| return; | ||||||
|
|
||||||
| if (selectedNodes.Length == 1) | ||||||
| { | ||||||
| var assembly = selectedNodes.First().LoadedAssembly; | ||||||
| if (assembly == null) | ||||||
| return; | ||||||
| GeneratePdbForAssembly(assembly, languageService, dockWorkspace); | ||||||
| } | ||||||
| else | ||||||
| { | ||||||
| GeneratePdbForAssemblies(selectedNodes.Select(n => n.LoadedAssembly), languageService, dockWorkspace); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| public bool IsEnabled(TextViewContext context) => true; | ||||||
|
|
||||||
| public bool IsVisible(TextViewContext context) | ||||||
| { | ||||||
| var selectedNodes = context.SelectedTreeNodes; | ||||||
| return selectedNodes?.Any() == true | ||||||
| && selectedNodes.All(n => n is AssemblyTreeNode asm && asm.LoadedAssembly.IsLoadedAsValidAssembly); | ||||||
| } | ||||||
|
|
||||||
| internal static void GeneratePdbForAssembly(LoadedAssembly assembly, LanguageService languageService, DockWorkspace dockWorkspace) | ||||||
|
|
@@ -105,6 +116,109 @@ internal static void GeneratePdbForAssembly(LoadedAssembly assembly, LanguageSer | |||||
| return output; | ||||||
| }, ct)).Then(dockWorkspace.ShowText).HandleExceptions(); | ||||||
| } | ||||||
|
|
||||||
| internal static void GeneratePdbForAssemblies(System.Collections.Generic.IEnumerable<LoadedAssembly> assemblies, LanguageService languageService, DockWorkspace dockWorkspace) | ||||||
| { | ||||||
| var assemblyArray = assemblies?.Where(a => a != null).ToArray(); | ||||||
siegfriedpammer marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
| if (assemblyArray == null || assemblyArray.Length == 0) | ||||||
|
There was a problem hiding this comment. The redundant null check can be simplified. Line 123 already filters out null values with
Suggested change
|
||||||
| return; | ||||||
|
|
||||||
| // Ensure at least one assembly supports PDB generation | ||||||
| if (!assemblyArray.Any(a => PortablePdbWriter.HasCodeViewDebugDirectoryEntry(a.GetMetadataFileOrNull() as PEFile))) | ||||||
| { | ||||||
| MessageBox.Show(Resources.CannotCreatePDBFile); | ||||||
siegfriedpammer marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| // Ask for target folder | ||||||
| using (var dlg = new System.Windows.Forms.FolderBrowserDialog()) | ||||||
siegfriedpammer marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
| { | ||||||
| dlg.Description = Resources.SelectPDBOutputFolder; | ||||||
| dlg.RootFolder = Environment.SpecialFolder.MyComputer; | ||||||
| dlg.ShowNewFolderButton = true; | ||||||
| // Show dialog on UI thread | ||||||
| System.Windows.Forms.DialogResult result = dlg.ShowDialog(); | ||||||
| if (result != System.Windows.Forms.DialogResult.OK || string.IsNullOrWhiteSpace(dlg.SelectedPath)) | ||||||
| return; | ||||||
|
|
||||||
| string targetFolder = dlg.SelectedPath; | ||||||
| DecompilationOptions options = dockWorkspace.ActiveTabPage.CreateDecompilationOptions(); | ||||||
|
|
||||||
| dockWorkspace.RunWithCancellation(ct => Task<AvalonEditTextOutput>.Factory.StartNew(() => { | ||||||
| AvalonEditTextOutput output = new AvalonEditTextOutput(); | ||||||
| Stopwatch totalWatch = Stopwatch.StartNew(); | ||||||
| options.CancellationToken = ct; | ||||||
|
|
||||||
| int total = assemblyArray.Length; | ||||||
| int processed = 0; | ||||||
| foreach (var assembly in assemblyArray) | ||||||
| { | ||||||
| if (ct.IsCancellationRequested) | ||||||
| { | ||||||
| output.WriteLine(); | ||||||
| output.WriteLine(Resources.GenerationWasCancelled); | ||||||
| throw new OperationCanceledException(ct); | ||||||
| } | ||||||
|
|
||||||
| var file = assembly.GetMetadataFileOrNull() as PEFile; | ||||||
| if (file == null || !PortablePdbWriter.HasCodeViewDebugDirectoryEntry(file)) | ||||||
| { | ||||||
| output.WriteLine(string.Format(Resources.CannotCreatePDBFile, Path.GetFileName(assembly.FileName))); | ||||||
| processed++; | ||||||
| if (options.Progress != null) | ||||||
| { | ||||||
| options.Progress.Report(new DecompilationProgress { | ||||||
| Title = "Generating portable PDB...", | ||||||
sonyps5201314 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
| TotalUnits = total, | ||||||
| UnitsCompleted = processed | ||||||
| }); | ||||||
| } | ||||||
| continue; | ||||||
| } | ||||||
|
|
||||||
| string fileName = Path.Combine(targetFolder, WholeProjectDecompiler.CleanUpFileName(assembly.ShortName, ".pdb")); | ||||||
|
|
||||||
| try | ||||||
| { | ||||||
| using (FileStream stream = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.Write)) | ||||||
| { | ||||||
| var decompiler = new CSharpDecompiler(file, assembly.GetAssemblyResolver(options.DecompilerSettings.AutoLoadAssemblyReferences), options.DecompilerSettings); | ||||||
| decompiler.CancellationToken = ct; | ||||||
| PortablePdbWriter.WritePdb(file, decompiler, options.DecompilerSettings, stream, progress: options.Progress); | ||||||
siegfriedpammer marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
| } | ||||||
| output.WriteLine(string.Format(Resources.GeneratedPDBFile, fileName)); | ||||||
| } | ||||||
| catch (OperationCanceledException) | ||||||
| { | ||||||
| output.WriteLine(); | ||||||
| output.WriteLine(Resources.GenerationWasCancelled); | ||||||
| throw; | ||||||
| } | ||||||
| catch (Exception ex) | ||||||
| { | ||||||
| output.WriteLine(string.Format(Resources.GenerationFailedForAssembly, assembly.FileName, ex.Message)); | ||||||
| } | ||||||
| processed++; | ||||||
| if (options.Progress != null) | ||||||
| { | ||||||
| options.Progress.Report(new DecompilationProgress { | ||||||
| Title = "Generating portable PDB...", | ||||||
|
||||||
| TotalUnits = total, | ||||||
| UnitsCompleted = processed | ||||||
| }); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| totalWatch.Stop(); | ||||||
| output.WriteLine(); | ||||||
| output.WriteLine(Resources.GenerationCompleteInSeconds, totalWatch.Elapsed.TotalSeconds.ToString("F1")); | ||||||
| output.WriteLine(); | ||||||
| output.AddButton(null, Resources.OpenExplorer, delegate { Process.Start("explorer", "/select,\"" + targetFolder + "\""); }); | ||||||
|
||||||
| output.AddButton(null, Resources.OpenExplorer, delegate { Process.Start("explorer", "/select,\"" + targetFolder + "\""); }); | |
| output.AddButton(null, Resources.OpenExplorer, delegate { Process.Start("explorer", "\"" + targetFolder + "\""); }); |
Member
There was a problem hiding this comment.
@sonyps5201314 Yes, this a legitimate bug: explorer C:\path\to\folder is the syntax for folders.
Contributor
Author
There was a problem hiding this comment.
1f13b80 resolved.
This also incidentally resolves another small 'unmodern' issue in ILSpy: every time 'Open or Select File/Folder' was executed, a new explorer.exe process was launched, and these processes would not automatically exit even after closing the opened windows.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.