Skip to content
Permalink
Browse files

Add "Select PDB..." context menu item on assemblies, to be able to ma…

…nually load a PDB for an assembly.
  • Loading branch information
siegfriedpammer committed Jan 29, 2020
1 parent bcf5166 commit 82f048d497464a33eb21f74a3642b81256d63f96
@@ -244,16 +244,22 @@ public LoadedAssembly ReloadAssembly(string file)
if (target == null)
return null;

return ReloadAssembly(target);
}

public LoadedAssembly ReloadAssembly(LoadedAssembly target)
{
var index = this.assemblies.IndexOf(target);
var newAsm = new LoadedAssembly(this, file);
var newAsm = new LoadedAssembly(this, target.FileName);
newAsm.IsAutoLoaded = target.IsAutoLoaded;
newAsm.PdbFileOverride = target.PdbFileOverride;
lock (assemblies) {
this.assemblies.Remove(target);
this.assemblies.Insert(index, newAsm);
}
return newAsm;
}

public void Unload(LoadedAssembly assembly)
{
App.Current.Dispatcher.VerifyAccess();
@@ -29,6 +29,7 @@
using ICSharpCode.ILSpy.TreeNodes;
using Microsoft.Win32;
using ICSharpCode.ILSpy.Properties;

namespace ICSharpCode.ILSpy
{
[ExportContextMenuEntry(Header = "Generate portable PDB")]
@@ -0,0 +1,56 @@
// Copyright (c) 2018 Siegfried Pammer
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.

using System.IO;
using System.Linq;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using Microsoft.Win32;
namespace ICSharpCode.ILSpy
{
[ExportContextMenuEntry(Header = "Select PDB...")]
class SelectPdbContextMenuEntry : IContextMenuEntry
{
public void Execute(TextViewContext context)
{
var assembly = (context.SelectedTreeNodes?.FirstOrDefault() as AssemblyTreeNode)?.LoadedAssembly;
if (assembly == null) return;
OpenFileDialog dlg = new OpenFileDialog();
dlg.FileName = DecompilerTextView.CleanUpName(assembly.ShortName) + ".pdb";
dlg.Filter = "Portable PDB|*.pdb|All files|*.*";
dlg.InitialDirectory = Path.GetDirectoryName(assembly.FileName);
if (dlg.ShowDialog() != true) return;

using (context.TreeView.LockUpdates()) {
assembly.PdbFileOverride = dlg.FileName;
assembly.AssemblyList.ReloadAssembly(assembly);
}

MainWindow.Instance.SelectNode(MainWindow.Instance.FindNodeByPath(new[] { assembly.FileName }, true));
MainWindow.Instance.RefreshDecompiledView();
}

public bool IsEnabled(TextViewContext context) => true;

public bool IsVisible(TextViewContext context)
{
return context.SelectedTreeNodes?.Length == 1
&& context.SelectedTreeNodes?.FirstOrDefault() is AssemblyTreeNode;
}
}
}
@@ -118,6 +118,7 @@
<Compile Include="Commands\ManageAssemblyListsCommand.cs" />
<Compile Include="Commands\Pdb2XmlCommand.cs" />
<Compile Include="Commands\RemoveAssembliesWithLoadErrors.cs" />
<Compile Include="Commands\SelectPdbContextMenuEntry.cs" />
<Compile Include="Commands\ShowCFGContextMenuEntry.cs" />
<Compile Include="Commands\ShowDebugSteps.cs" />
<Compile Include="Commands\SortAssemblyListCommand.cs" />
@@ -143,6 +143,8 @@ public ICompilation GetTypeSystemOrNull()

public bool IsAutoLoaded { get; set; }

public string PdbFileOverride { get; set; }

PEFile LoadAssembly(object state)
{
MetadataReaderOptions options;
@@ -167,7 +169,8 @@ PEFile LoadAssembly(object state)

if (DecompilerSettingsPanel.CurrentDecompilerSettings.UseDebugSymbols) {
try {
debugInfoProvider = DebugInfoUtils.LoadSymbols(module);
debugInfoProvider = DebugInfoUtils.FromFile(module, PdbFileOverride)
?? DebugInfoUtils.LoadSymbols(module);
} catch (IOException) {
} catch (UnauthorizedAccessException) {
} catch (InvalidOperationException) {

0 comments on commit 82f048d

Please sign in to comment.
You can’t perform that action at this time.