Reduce code duplication in Metadata tables by introducing a LoadTable method.

Author: siegfriedpammer

ILSpy/Metadata/CorTables/AssemblyRefTableTreeNode.cs

@@ -26,44 +26,24 @@
 
 namespace ICSharpCode.ILSpy.Metadata
 {
-	internal class AssemblyRefTableTreeNode : MetadataTableTreeNode
+	internal class AssemblyRefTableTreeNode : MetadataTableTreeNode<AssemblyRefTableTreeNode.AssemblyRefEntry>
 	{
 		public AssemblyRefTableTreeNode(MetadataFile metadataFile)
 			: base(TableIndex.AssemblyRef, metadataFile)
 		{
 		}
 
-		public override bool View(ViewModels.TabPageModel tabPage)
+		protected override IReadOnlyList<AssemblyRefEntry> LoadTable()
 		{
-			tabPage.Title = Text.ToString();
-			tabPage.SupportsLanguageSwitching = false;
-
-			var view = Helpers.PrepareDataGrid(tabPage, this);
 			var list = new List<AssemblyRefEntry>();
-			AssemblyRefEntry scrollTargetEntry = default;
-
 			foreach (var row in metadataFile.Metadata.AssemblyReferences)
 			{
-				AssemblyRefEntry entry = new AssemblyRefEntry(metadataFile, row);
-				if (scrollTarget == MetadataTokens.GetRowNumber(row))
-				{
-					scrollTargetEntry = entry;
-				}
-				list.Add(entry);
-			}
-
-			view.ItemsSource = list;
-			tabPage.Content = view;
-
-			if (scrollTargetEntry.RID > 0)
-			{
-				ScrollItemIntoView(view, scrollTargetEntry);
+				list.Add(new AssemblyRefEntry(metadataFile, row));
 			}
-
-			return true;
+			return list;
 		}
 
-		struct AssemblyRefEntry
+		internal struct AssemblyRefEntry
 		{
 			readonly MetadataFile metadataFile;
 			readonly AssemblyReferenceHandle handle;

ILSpy/Metadata/CorTables/AssemblyTableTreeNode.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Metadata;
 using System.Reflection.Metadata.Ecma335;
@@ -25,33 +26,26 @@
 
 namespace ICSharpCode.ILSpy.Metadata
 {
-	internal class AssemblyTableTreeNode : MetadataTableTreeNode
+	internal class AssemblyTableTreeNode : MetadataTableTreeNode<AssemblyTableTreeNode.AssemblyEntry>
 	{
 		public AssemblyTableTreeNode(MetadataFile metadataFile)
 			: base(TableIndex.Assembly, metadataFile)
 		{
 		}
 
-		public override bool View(ViewModels.TabPageModel tabPage)
+		protected override IReadOnlyList<AssemblyEntry> LoadTable()
 		{
-			tabPage.Title = Text.ToString();
-			tabPage.SupportsLanguageSwitching = false;
-
-			var view = Helpers.PrepareDataGrid(tabPage, this);
 			if (metadataFile.Metadata.IsAssembly)
 			{
-				view.ItemsSource = new[] { new AssemblyEntry(metadataFile.Metadata, metadataFile.MetadataOffset) };
+				return [new AssemblyEntry(metadataFile.Metadata, metadataFile.MetadataOffset)];
 			}
 			else
 			{
-				view.ItemsSource = Array.Empty<AssemblyEntry>();
+				return [];
 			}
-
-			tabPage.Content = view;
-			return true;
 		}
 
-		readonly struct AssemblyEntry
+		internal readonly struct AssemblyEntry
 		{
 			readonly int metadataOffset;
 			readonly MetadataReader metadata;

ILSpy/Metadata/CorTables/ClassLayoutTableTreeNode.cs

@@ -26,45 +26,26 @@
 
 namespace ICSharpCode.ILSpy.Metadata
 {
-	class ClassLayoutTableTreeNode : MetadataTableTreeNode
+	internal class ClassLayoutTableTreeNode : MetadataTableTreeNode<ClassLayoutTableTreeNode.ClassLayoutEntry>
 	{
 		public ClassLayoutTableTreeNode(MetadataFile metadataFile)
 			: base(TableIndex.ClassLayout, metadataFile)
 		{
 		}
 
-		public override bool View(ViewModels.TabPageModel tabPage)
+		protected override IReadOnlyList<ClassLayoutEntry> LoadTable()
 		{
-			tabPage.Title = Text.ToString();
-			tabPage.SupportsLanguageSwitching = false;
-
-			var view = Helpers.PrepareDataGrid(tabPage, this);
-
 			var list = new List<ClassLayoutEntry>();
 
 			var length = metadataFile.Metadata.GetTableRowCount(TableIndex.ClassLayout);
 			ReadOnlySpan<byte> ptr = metadataFile.Metadata.AsReadOnlySpan();
-			ClassLayoutEntry scrollTargetEntry = default;
 
 			for (int rid = 1; rid <= length; rid++)
 			{
-				ClassLayoutEntry entry = new ClassLayoutEntry(metadataFile, ptr, rid);
-				if (scrollTarget == rid)
-				{
-					scrollTargetEntry = entry;
-				}
-				list.Add(entry);
-			}
-
-			view.ItemsSource = list;
-			tabPage.Content = view;
-
-			if (scrollTargetEntry.RID > 0)
-			{
-				ScrollItemIntoView(view, scrollTargetEntry);
+				list.Add(new ClassLayoutEntry(metadataFile, ptr, rid));
 			}
 
-			return true;
+			return list;
 		}
 
 		readonly struct ClassLayout
@@ -81,7 +62,7 @@ public ClassLayout(ReadOnlySpan<byte> ptr, int typeDefSize)
 			}
 		}
 
-		struct ClassLayoutEntry
+		internal struct ClassLayoutEntry
 		{
 			readonly MetadataFile metadataFile;
 			readonly ClassLayout classLayout;

ILSpy/Metadata/CorTables/ConstantTableTreeNode.cs

@@ -21,50 +21,27 @@
 using System.Reflection.Metadata.Ecma335;
 
 using ICSharpCode.Decompiler.Metadata;
-using ICSharpCode.ILSpy.ViewModels;
 
 namespace ICSharpCode.ILSpy.Metadata
 {
-	internal class ConstantTableTreeNode : MetadataTableTreeNode
+	internal class ConstantTableTreeNode : MetadataTableTreeNode<ConstantTableTreeNode.ConstantEntry>
 	{
 		public ConstantTableTreeNode(MetadataFile metadataFile)
 			: base(TableIndex.Constant, metadataFile)
 		{
 		}
 
-		public override bool View(TabPageModel tabPage)
+		protected override IReadOnlyList<ConstantEntry> LoadTable()
 		{
-			tabPage.Title = Text.ToString();
-			tabPage.SupportsLanguageSwitching = false;
-
-			var view = Helpers.PrepareDataGrid(tabPage, this);
-			var metadata = metadataFile.Metadata;
-
 			var list = new List<ConstantEntry>();
-			ConstantEntry scrollTargetEntry = default;
-
-			for (int row = 1; row <= metadata.GetTableRowCount(TableIndex.Constant); row++)
+			for (int row = 1; row <= metadataFile.Metadata.GetTableRowCount(TableIndex.Constant); row++)
 			{
-				ConstantEntry entry = new ConstantEntry(metadataFile, MetadataTokens.ConstantHandle(row));
-				if (scrollTarget == row)
-				{
-					scrollTargetEntry = entry;
-				}
-				list.Add(entry);
+				list.Add(new ConstantEntry(metadataFile, MetadataTokens.ConstantHandle(row)));
 			}
-
-			view.ItemsSource = list;
-			tabPage.Content = view;
-
-			if (scrollTargetEntry.RID > 0)
-			{
-				ScrollItemIntoView(view, scrollTargetEntry);
-			}
-
-			return true;
+			return list;
 		}
 
-		struct ConstantEntry
+		internal struct ConstantEntry
 		{
 			readonly MetadataFile metadataFile;
 			readonly EntityHandle handle;

ILSpy/Metadata/CorTables/CustomAttributeTableTreeNode.cs

@@ -24,47 +24,24 @@
 
 namespace ICSharpCode.ILSpy.Metadata
 {
-	class CustomAttributeTableTreeNode : MetadataTableTreeNode
+	class CustomAttributeTableTreeNode : MetadataTableTreeNode<CustomAttributeTableTreeNode.CustomAttributeEntry>
 	{
 		public CustomAttributeTableTreeNode(MetadataFile metadataFile)
 			: base(TableIndex.CustomAttribute, metadataFile)
 		{
 		}
 
-		public override bool View(ViewModels.TabPageModel tabPage)
+		protected override IReadOnlyList<CustomAttributeEntry> LoadTable()
 		{
-			tabPage.Title = Text.ToString();
-			tabPage.SupportsLanguageSwitching = false;
-
-			var view = Helpers.PrepareDataGrid(tabPage, this);
-			var metadata = metadataFile.Metadata;
-
 			var list = new List<CustomAttributeEntry>();
-			CustomAttributeEntry scrollTargetEntry = default;
-
-			foreach (var row in metadata.CustomAttributes)
-			{
-				CustomAttributeEntry entry = new CustomAttributeEntry(metadataFile, row);
-				if (scrollTarget == MetadataTokens.GetRowNumber(row))
-				{
-					scrollTargetEntry = entry;
-				}
-				list.Add(entry);
-			}
-
-			view.ItemsSource = list;
-
-			tabPage.Content = view;
-
-			if (scrollTargetEntry.RID > 0)
+			foreach (var row in metadataFile.Metadata.CustomAttributes)
 			{
-				ScrollItemIntoView(view, scrollTargetEntry);
+				list.Add(new CustomAttributeEntry(metadataFile, row));
 			}
-
-			return true;
+			return list;
 		}
 
-		struct CustomAttributeEntry
+		internal struct CustomAttributeEntry
 		{
 			readonly MetadataFile metadataFile;
 			readonly CustomAttributeHandle handle;

ILSpy/Metadata/CorTables/DeclSecurityTableTreeNode.cs

@@ -25,47 +25,24 @@
 
 namespace ICSharpCode.ILSpy.Metadata
 {
-	class DeclSecurityTableTreeNode : MetadataTableTreeNode
+	class DeclSecurityTableTreeNode : MetadataTableTreeNode<DeclSecurityTableTreeNode.DeclSecurityEntry>
 	{
 		public DeclSecurityTableTreeNode(MetadataFile metadataFile)
 			: base(TableIndex.DeclSecurity, metadataFile)
 		{
 		}
 
-		public override bool View(ViewModels.TabPageModel tabPage)
+		protected override IReadOnlyList<DeclSecurityEntry> LoadTable()
 		{
-			tabPage.Title = Text.ToString();
-			tabPage.SupportsLanguageSwitching = false;
-
-			var view = Helpers.PrepareDataGrid(tabPage, this);
-			var metadata = metadataFile.Metadata;
-
 			var list = new List<DeclSecurityEntry>();
-			DeclSecurityEntry scrollTargetEntry = default;
-
-			foreach (var row in metadata.DeclarativeSecurityAttributes)
-			{
-				var entry = new DeclSecurityEntry(metadataFile, row);
-				if (scrollTarget == MetadataTokens.GetRowNumber(row))
-				{
-					scrollTargetEntry = entry;
-				}
-				list.Add(entry);
-			}
-
-			view.ItemsSource = list;
-
-			tabPage.Content = view;
-
-			if (scrollTargetEntry.RID > 0)
+			foreach (var row in metadataFile.Metadata.DeclarativeSecurityAttributes)
 			{
-				ScrollItemIntoView(view, scrollTargetEntry);
+				list.Add(new DeclSecurityEntry(metadataFile, row));
 			}
-
-			return true;
+			return list;
 		}
 
-		struct DeclSecurityEntry
+		internal struct DeclSecurityEntry
 		{
 			readonly MetadataFile metadataFile;
 			readonly DeclarativeSecurityAttributeHandle handle;