NavigationText for metadata nodes

ICSharpCode.Decompiler/Metadata/MetadataFile.cs

@@ -73,9 +73,12 @@ namespace ICSharpCode.Decompiler.Metadata
 				if (value == null)
 				{
 					var metadata = Metadata;
-					value = metadata.IsAssembly
-						? metadata.GetString(metadata.GetAssemblyDefinition().Name)
-						: metadata.GetString(metadata.GetModuleDefinition().Name);
+					if (metadata.IsAssembly)
+						value = metadata.GetString(metadata.GetAssemblyDefinition().Name);
+					else if (metadata.DebugMetadataHeader == null) // standalone debug metadata does not contain module table
+						value = metadata.GetString(metadata.GetModuleDefinition().Name);
+					else
+						value = "debug metadata";
 					value = LazyInit.GetOrSet(ref name, value);
 				}
 				return value;

ILSpy/Metadata/CoffHeaderTreeNode.cs

@@ -43,6 +43,8 @@ namespace ICSharpCode.ILSpy.Metadata
 
 		public override object Text => "COFF Header";
 
+		public override object NavigationText => $"{Text} ({module.Name})";
+
 		public override object Icon => Images.Header;
 
 		public override bool View(TabPageModel tabPage)

ILSpy/Metadata/DataDirectoriesTreeNode.cs

@@ -35,6 +35,8 @@ namespace ICSharpCode.ILSpy.Metadata
 
 		public override object Text => "Data Directories";
 
+		public override object NavigationText => $"{Text} ({module.Name})";
+
 		public override object Icon => Images.ListFolder;
 		public override object ExpandedIcon => Images.ListFolderOpen;
 

ILSpy/Metadata/DebugDirectory/DebugDirectoryEntryTreeNode.cs

@@ -40,6 +40,8 @@ namespace ICSharpCode.ILSpy.Metadata
 
 		override public object Text => entry.Type.ToString();
 
+		public override object NavigationText => $"{Text} ({module.Name})";
+
 		public override object Icon => Images.MetadataTable;
 
 		public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)

ILSpy/Metadata/DebugDirectoryTreeNode.cs

@@ -40,6 +40,8 @@ namespace ICSharpCode.ILSpy.Metadata
 
 		public override object Text => "Debug Directory";
 
+		public override object NavigationText => $"{Text} ({module.Name})";
+
 		public override object Icon => Images.ListFolder;
 		public override object ExpandedIcon => Images.ListFolderOpen;
 

ILSpy/Metadata/DebugMetadataTablesTreeNode.cs

@@ -37,6 +37,8 @@ namespace ICSharpCode.ILSpy.Metadata
 
 		public override object Text => "Tables";
 
+		public override object NavigationText => $"{Text} ({metadataFile.Name})";
+
 		public override object Icon => Images.MetadataTableGroup;
 
 		protected override void LoadChildren()

ILSpy/Metadata/DosHeaderTreeNode.cs

@@ -36,6 +36,8 @@ namespace ICSharpCode.ILSpy.Metadata
 
 		public override object Text => "DOS Header";
 
+		public override object NavigationText => $"{Text} ({module.Name})";
+
 		public override object Icon => Images.Header;
 
 		public override bool View(TabPageModel tabPage)

ILSpy/Metadata/MetadataHeapTreeNode.cs

@@ -33,6 +33,8 @@ namespace ICSharpCode.ILSpy.Metadata
 
 		public HandleKind Kind { get; }
 
+		public override object NavigationText => $"{Text} ({metadataFile.Name})";
+
 		public override object Icon => Images.Heap;
 
 		public MetadataHeapTreeNode(HandleKind kind, MetadataFile metadataFile)

ILSpy/Metadata/MetadataTableTreeNode.cs

@@ -39,6 +39,8 @@ namespace ICSharpCode.ILSpy.Metadata
 
 		public override object Text => $"{(int)Kind:X2} {Kind} ({metadataFile.Metadata.GetTableRowCount(Kind)})";
 
+		public override object NavigationText => $"{(int)Kind:X2} {Kind} ({metadataFile.Name})";
+
 		public override object Icon => Images.MetadataTable;
 
 		public MetadataTableTreeNode(TableIndex table, MetadataFile metadataFile)

ILSpy/Metadata/MetadataTablesTreeNode.cs

@@ -39,6 +39,8 @@ namespace ICSharpCode.ILSpy.Metadata
 
 		public override object Text => "Tables";
 
+		public override object NavigationText => $"{Text} ({metadataFile.Name})";
+
 		public override object Icon => Images.MetadataTableGroup;
 
 		protected override void LoadChildren()

ILSpy/Metadata/OptionalHeaderTreeNode.cs

@@ -42,6 +42,8 @@ namespace ICSharpCode.ILSpy.Metadata
 
 		public override object Text => "Optional Header";
 
+		public override object NavigationText => $"{Text} ({module.Name})";
+
 		public override object Icon => Images.Header;
 
 		public override bool View(ViewModels.TabPageModel tabPage)