show base members

Author: miloush

ILSpy/AssemblyTree/AssemblyListPane.axaml.cs

@@ -80,7 +80,7 @@ public AssemblyListPane()
 
 		void OnLanguageSettingsChanged(object? sender, PropertyChangedEventArgs e)
 		{
-			if (e.PropertyName != nameof(LanguageSettings.ShowApiLevel))
+			if (e.PropertyName != nameof(LanguageSettings.ShowApiLevel) && e.PropertyName != nameof(LanguageSettings.ShowBaseApi))
 				return;
 			// Re-apply the API-level filter in place; the flattener drops anything newly hidden.
 			if (DataContext is AssemblyTreeModel { Root: ILSpyTreeNode root })

ILSpy/LanguageSettings.cs

@@ -36,6 +36,7 @@ public LanguageSettings(XElement element, ISettingsSection parent)
 		{
 			Parent = parent;
 			showApiLevel = (ApiVisibility?)(int?)element.Element("ShowAPILevel") ?? ApiVisibility.PublicAndInternal;
+			showBaseApi = (bool?)element.Element("ShowBaseAPI") ?? false;
 			languageId = (string?)element.Element("Language");
 			languageVersionId = (string?)element.Element("LanguageVersion");
 		}
@@ -47,6 +48,7 @@ public XElement SaveAsXml()
 			return new XElement(
 				"FilterSettings",
 				new XElement("ShowAPILevel", (int)ShowApiLevel),
+				new XElement("ShowBaseAPI", ShowBaseApi),
 				new XElement("Language", LanguageId),
 				new XElement("LanguageVersion", LanguageVersionId));
 		}
@@ -80,6 +82,18 @@ public bool ApiVisAll {
 			set { if (value) ShowApiLevel = ApiVisibility.All; }
 		}
 
+		bool showBaseApi;
+
+		public bool ShowBaseApi {
+			get => showBaseApi;
+			set {
+				if (SetProperty(ref showBaseApi, value))
+				{
+					OnPropertyChanged(nameof(ShowBaseApi));
+				}
+			}
+		}
+
 		[ObservableProperty]
 		string? languageId;
 

ILSpy/Properties/Resources.Designer.cs

@@ -1036,8 +1036,11 @@ Do you want to continue?</value>
   <data name="Show_allTypesAndMembers" xml:space="preserve">
     <value>Show _all types and members</value>
   </data>
+  <data name="Show_baseMembers" xml:space="preserve">
+    <value>Show _base members</value>
+  </data>
   <data name="Show_internalTypesMembers" xml:space="preserve">
-    <value>Show public, private and internal</value>
+    <value>Show public, private and _internal</value>
   </data>
   <data name="Show_publiconlyTypesMembers" xml:space="preserve">
     <value>Show only _public types and members</value>

ILSpy/Properties/Resources.resx

@@ -88,7 +88,18 @@ protected static LanguageSettings? CurrentLanguageSettings {
 		/// "Show metadata tokens". Mirrors WPF's <c>ILSpyTreeNode.GetSuffixString</c>; format
 		/// matches byte-for-byte so cross-tool grep on token strings keeps working.
 		/// </summary>
-		protected static string GetSuffixString(IMember member) => GetSuffixString(member.MetadataToken);
+		protected string GetSuffixString(IMember member) => GetSuffixString(member.MetadataToken) + GetTypeSuffixString(member);
+
+		private string GetTypeSuffixString(IMember member)
+		{
+			if (Parent is not TypeTreeNode typeNode)
+				return string.Empty;
+
+			if (member.DeclaringTypeDefinition?.MetadataToken == typeNode.Handle)
+				return string.Empty;
+
+			return $" ({member.DeclaringType.Name})";
+		}
 
 		protected static string GetSuffixString(EntityHandle handle)
 		{

ILSpy/TreeNodes/ILSpyTreeNode.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection.Metadata;
 
@@ -25,7 +26,6 @@
 using ICSharpCode.Decompiler.Output;
 using ICSharpCode.Decompiler.TypeSystem;
 using ICSharpCode.ILSpyX;
-
 using ICSharpCode.ILSpy;
 using ICSharpCode.ILSpy.AppEnv;
 using ICSharpCode.ILSpy.AssemblyTree;
@@ -38,6 +38,8 @@ public sealed class TypeTreeNode : ILSpyTreeNode, IMemberTreeNode
 		readonly TypeDefinitionHandle handle;
 		readonly MetadataFile module;
 
+		bool? loadedInheritedMembers;
+
 		public TypeDefinitionHandle Handle => handle;
 		public MetadataFile Module => module;
 
@@ -97,6 +99,11 @@ public override void Decompile(Language language, ITextOutput output, Decompilat
 
 		public override FilterResult Filter(LanguageSettings settings)
 		{
+			if (loadedInheritedMembers != settings.ShowBaseApi && IsVisible)
+			{
+				ReloadChildren();
+			}
+
 			if (settings.ShowApiLevel == ApiVisibility.PublicOnly && !IsPublicAPI)
 				return FilterResult.Hidden;
 			var typeDef = ResolveTypeDefinition();
@@ -163,7 +170,14 @@ protected override void LoadChildren()
 			if (assemblyList != null && CanHaveDerivedTypes(typeDef))
 				Children.Add(new DerivedTypesTreeNode(assemblyList, typeDef));
 
-			foreach (var nestedType in typeDef.NestedTypes
+			loadedInheritedMembers = CurrentLanguageSettings?.ShowBaseApi;
+			IEnumerable<ITypeDefinition> nestedTypes = GetMembers(typeDef, t => t.NestedTypes, loadedInheritedMembers);
+			IEnumerable<IField> fields = GetMembers(typeDef, t => t.Fields, loadedInheritedMembers);
+			IEnumerable<IProperty> properties = GetMembers(typeDef, t => t.Properties, loadedInheritedMembers);
+			IEnumerable<IEvent> events = GetMembers(typeDef, t => t.Events, loadedInheritedMembers);
+			IEnumerable<IMethod> methods = GetMembers(typeDef, t => t.Methods, loadedInheritedMembers);
+
+			foreach (var nestedType in nestedTypes
 				.OrderBy(t => t.Name, NaturalStringComparer.Instance))
 			{
 				Children.Add(new TypeTreeNode((TypeDefinitionHandle)nestedType.MetadataToken, module));
@@ -184,24 +198,40 @@ protected override void LoadChildren()
 			}
 
 			// Enums look more useful in declaration order than alphabetical.
-			var fields = typeDef.Kind == TypeKind.Enum
-				? typeDef.Fields
-				: typeDef.Fields.OrderBy(f => f.Name, NaturalStringComparer.Instance);
+			if (typeDef.Kind != TypeKind.Enum)
+				fields = fields.OrderBy(f => f.Name, NaturalStringComparer.Instance);
+
 			foreach (var field in fields)
 				Children.Add(new FieldTreeNode(field));
 
-			foreach (var prop in typeDef.Properties.OrderBy(p => p.Name, NaturalStringComparer.Instance))
+			foreach (var prop in properties.OrderBy(p => p.Name, NaturalStringComparer.Instance))
 				Children.Add(new PropertyTreeNode(prop));
 
-			foreach (var ev in typeDef.Events.OrderBy(e => e.Name, NaturalStringComparer.Instance))
+			foreach (var ev in events.OrderBy(e => e.Name, NaturalStringComparer.Instance))
 				Children.Add(new EventTreeNode(ev));
 
-			foreach (var method in typeDef.Methods.OrderBy(m => m.Name, NaturalStringComparer.Instance))
+			foreach (var method in methods.OrderBy(m => m.Name, NaturalStringComparer.Instance))
 			{
-				if (method.MetadataToken.IsNil || method.IsAccessor)
+				if (method.MetadataToken.IsNil || method.IsAccessor)			
 					continue;
 				Children.Add(new MethodTreeNode(method));
 			}
 		}
+
+		private IEnumerable<TMember> GetMembers<TMember>(ITypeDefinition type, Func<ITypeDefinition, IEnumerable<TMember>> selector, bool? includeInherited)
+		{
+			IEnumerable<TMember> allMembers = selector(type);
+			if (includeInherited == true)
+			{
+				var typeSystem = new DecompilerTypeSystem(module, module.GetAssemblyResolver(),
+					TypeSystemOptions.Default | TypeSystemOptions.Uncached);
+
+				if (typeSystem.MainModule.ResolveEntity(handle) is ITypeDefinition resolvedType)
+					foreach (var baseType in resolvedType.GetNonInterfaceBaseTypes().Reverse().Select(t => t.GetDefinition()))
+						if (baseType != null && baseType != type)
+							allMembers = allMembers.Concat(selector(baseType));
+			}
+			return allMembers;
+		}
 	}
 }

ILSpy/TreeNodes/TypeTreeNode.cs

@@ -151,6 +151,10 @@ static void PopulateViewMenu(NativeMenu view, SessionSettings session, SetThemeC
 
 		view.Items.Add(new NativeMenuItemSeparator());
 
+		view.Items.Add(MakeCheckBox(Resources.Show_baseMembers, languageSettings, nameof(LanguageSettings.ShowBaseApi)));
+
+		view.Items.Add(new NativeMenuItemSeparator());
+
 		var theme = new NativeMenuItem {
 			Header = Resources.Theme,
 			Menu = new NativeMenu(),
@@ -180,6 +184,26 @@ static NativeMenuItem MakeRadio(string header, object source, string path)
 		return item;
 	}
 
+	static NativeMenuItem MakeCheckBox(string header, object source, string path)
+	{
+		var item = new NativeMenuItem {
+			Header = header,
+			ToggleType = MenuItemToggleType.CheckBox,
+		};
+		// IsChecked is purely for *displaying* the checkmark (OneWay). The write
+		// path lives in Command, because Avalonia's macOS NativeMenu bridge maps
+		// NativeMenuItem -> NSMenuItem only when Command != null; without it the
+		// item gets greyed out by NSMenuValidation and no click ever reaches the
+		// IsChecked binding.
+		item.Bind(NativeMenuItem.IsCheckedProperty, new Binding(path) {
+			Source = source,
+			Mode = BindingMode.OneWay,
+		});
+		var property = source.GetType().GetProperty(path);
+		item.Command = new RelayCommand(() => property?.SetValue(source, property?.GetValue(source) is true ? false : true));
+		return item;
+	}
+
 	static void PopulateThemeSubmenu(NativeMenu theme, SessionSettings session, SetThemeCommand setThemeCommand)
 	{
 		foreach (var themeName in ThemeManager.AllThemes)