Fix #3142: Exception when analyzing source of library with global ass…

…embly attributes
icsharpcode · Dec 25, 2023 · 123da88 · 123da88
1 parent 760e7e0
commit 123da88
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/ILSpy/Analyzers/AnalyzerEntityTreeNode.cs b/ILSpy/Analyzers/AnalyzerEntityTreeNode.cs
@@ -36,7 +36,7 @@ public abstract class AnalyzerEntityTreeNode : AnalyzerTreeNode, IMemberTreeNode
 		public override void ActivateItem(System.Windows.RoutedEventArgs e)
 		{
 			e.Handled = true;
-			if (this.Member.MetadataToken.IsNil)
+			if (this.Member == null || this.Member.MetadataToken.IsNil)
 			{
 				MessageBox.Show(Properties.Resources.CannotAnalyzeMissingRef, "ILSpy");
 				return;

diff --git a/ILSpy/Analyzers/TreeNodes/AnalyzedModuleTreeNode.cs b/ILSpy/Analyzers/TreeNodes/AnalyzedModuleTreeNode.cs
@@ -18,9 +18,9 @@
 
 using System;
 using System.Linq;
+using System.Windows;
 
 using ICSharpCode.Decompiler.TypeSystem;
-using ICSharpCode.ILSpy.TreeNodes;
 
 namespace ICSharpCode.ILSpy.Analyzers.TreeNodes
 {
@@ -51,6 +51,17 @@ protected override void LoadChildren()
 			}
 		}
 
+		public override void ActivateItem(RoutedEventArgs e)
+		{
+			e.Handled = true;
+			if (analyzedModule.PEFile == null)
+			{
+				MessageBox.Show(Properties.Resources.CannotAnalyzeMissingRef, "ILSpy");
+				return;
+			}
+			MainWindow.Instance.JumpToReference(analyzedModule.PEFile);
+		}
+
 		public override IEntity Member => null;
 	}
 }