Do not use ObservableObject when ObservableObjectBase is sufficient. (#3644)

tom-englert · web-flow · commit 1cfc5e740b6b · 2025-12-25T12:30:43.000+01:00
* Do not use ObservableObject when ObservableObjectBase is sufficient.
diff --git a/ILSpy.ReadyToRun/ReadyToRunOptionPage.xaml.cs b/ILSpy.ReadyToRun/ReadyToRunOptionPage.xaml.cs
@@ -38,7 +38,7 @@ public ReadyToRunOptionPage()
 
 	[ExportOptionPage(Order = 40)]
 	[NonShared]
-	class ReadyToRunOptionsViewModel : ObservableObject, IOptionPage
+	class ReadyToRunOptionsViewModel : ObservableObjectBase, IOptionPage
 	{
 		private ReadyToRunOptions options;
 
diff --git a/ILSpy.ReadyToRun/ReadyToRunOptions.cs b/ILSpy.ReadyToRun/ReadyToRunOptions.cs
@@ -24,7 +24,7 @@
 
 namespace ICSharpCode.ILSpy.ReadyToRun
 {
-	internal partial class ReadyToRunOptions : ObservableObject, ISettingsSection
+	internal partial class ReadyToRunOptions : ObservableObjectBase, ISettingsSection
 	{
 		private static readonly XNamespace ns = "http://www.ilspy.net/ready-to-run";
 
diff --git a/ILSpy/AssemblyTree/AssemblyTreeModel.cs b/ILSpy/AssemblyTree/AssemblyTreeModel.cs
@@ -72,6 +72,8 @@ public class AssemblyTreeModel : ToolPaneModel
 		private readonly LanguageService languageService;
 		private readonly IExportProvider exportProvider;
 
+		private static Dispatcher UIThreadDispatcher => Application.Current.Dispatcher;
+
 		public AssemblyTreeModel(SettingsService settingsService, LanguageService languageService, IExportProvider exportProvider)
 		{
 			this.settingsService = settingsService;
@@ -198,7 +200,7 @@ public async Task HandleSingleInstanceCommandLineArguments(string[] args)
 		{
 			var cmdArgs = CommandLineArguments.Create(args);
 
-			await Dispatcher.InvokeAsync(async () => {
+			await UIThreadDispatcher.InvokeAsync(async () => {
 
 				if (!HandleCommandLineArguments(cmdArgs))
 					return;
@@ -256,7 +258,7 @@ private async Task NavigateOnLaunch(string? navigateTo, string[]? activeTreeView
 
 					// Make sure we wait for assemblies being loaded...
 					// BeginInvoke in LoadedAssembly.LookupReferencedAssemblyInternal
-					await Dispatcher.InvokeAsync(delegate { }, DispatcherPriority.Normal);
+					await UIThreadDispatcher.InvokeAsync(delegate { }, DispatcherPriority.Normal);
 
 					if (mr is { ParentModule.MetadataFile: not null })
 					{
@@ -401,7 +403,7 @@ public void Initialize()
 				AssemblyList.Open(sessionSettings.ActiveAutoLoadedAssembly, true);
 			}
 
-			Dispatcher.BeginInvoke(DispatcherPriority.Loaded, OpenAssemblies);
+			UIThreadDispatcher.BeginInvoke(DispatcherPriority.Loaded, OpenAssemblies);
 		}
 
 		private async Task OpenAssemblies()
@@ -536,14 +538,14 @@ public void SelectNode(SharpTreeNode? node, bool inNewTabPage = false)
 
 			if (SelectedItem == node)
 			{
-				Dispatcher.BeginInvoke(RefreshDecompiledView);
+				UIThreadDispatcher.BeginInvoke(RefreshDecompiledView);
 			}
 			else
 			{
 				activeView?.ScrollIntoView(node);
 				SelectedItem = node;
 
-				Dispatcher.BeginInvoke(DispatcherPriority.Background, () => {
+				UIThreadDispatcher.BeginInvoke(DispatcherPriority.Background, () => {
 					activeView?.ScrollIntoView(node);
 				});
 			}
@@ -795,7 +797,7 @@ void ContextMenuClosed(object? sender, EventArgs e)
 			{
 				ContextMenuProvider.ContextMenuClosed -= ContextMenuClosed;
 
-				Dispatcher.BeginInvoke(DispatcherPriority.Background, () => {
+				UIThreadDispatcher.BeginInvoke(DispatcherPriority.Background, () => {
 					if (Mouse.RightButton != MouseButtonState.Pressed)
 					{
 						RefreshDecompiledView();
diff --git a/ILSpy/Docking/DockWorkspace.cs b/ILSpy/Docking/DockWorkspace.cs
@@ -46,7 +46,7 @@ namespace ICSharpCode.ILSpy.Docking
 {
 	[Export]
 	[Shared]
-	public class DockWorkspace : ObservableObject, ILayoutUpdateStrategy
+	public class DockWorkspace : ObservableObjectBase, ILayoutUpdateStrategy
 	{
 		private readonly IExportProvider exportProvider;
 
diff --git a/ILSpy/LanguageSettings.cs b/ILSpy/LanguageSettings.cs
@@ -31,7 +31,7 @@ namespace ICSharpCode.ILSpy
 	/// <summary>
 	/// Represents the filters applied to the tree view.
 	/// </summary>
-	public class LanguageSettings : ObservableObject, IChildSettings
+	public class LanguageSettings : ObservableObjectBase, IChildSettings
 	{
 		/// <summary>
 		/// This dictionary is necessary to remember language versions across language changes. For example, 
diff --git a/ILSpy/MainWindowViewModel.cs b/ILSpy/MainWindowViewModel.cs
@@ -27,7 +27,7 @@ namespace ICSharpCode.ILSpy
 {
 	[Export]
 	[Shared]
-	public class MainWindowViewModel(SettingsService settingsService, LanguageService languageService, DockWorkspace dockWorkspace) : ObservableObject
+	public class MainWindowViewModel(SettingsService settingsService, LanguageService languageService, DockWorkspace dockWorkspace) : ObservableObjectBase
 	{
 		public DockWorkspace Workspace { get; } = dockWorkspace;
 
diff --git a/ILSpy/Options/DisplaySettings.cs b/ILSpy/Options/DisplaySettings.cs
@@ -28,7 +28,7 @@ namespace ICSharpCode.ILSpy.Options
 	/// <summary>
 	/// Description of DisplaySettings.
 	/// </summary>
-	public class DisplaySettings : ObservableObject, ISettingsSection
+	public class DisplaySettings : ObservableObjectBase, ISettingsSection
 	{
 		FontFamily selectedFont;
 		public FontFamily SelectedFont {
diff --git a/ILSpy/Options/DisplaySettingsViewModel.cs b/ILSpy/Options/DisplaySettingsViewModel.cs
@@ -14,7 +14,7 @@ namespace ICSharpCode.ILSpy.Options
 {
 	[ExportOptionPage(Order = 20)]
 	[NonShared]
-	public class DisplaySettingsViewModel : ObservableObject, IOptionPage
+	public class DisplaySettingsViewModel : ObservableObjectBase, IOptionPage
 	{
 		private DisplaySettings settings = new();
 		private FontFamily[] fontFamilies;
diff --git a/ILSpy/Options/MiscSettings.cs b/ILSpy/Options/MiscSettings.cs
@@ -23,7 +23,7 @@
 
 namespace ICSharpCode.ILSpyX.Settings
 {
-	public class MiscSettings : ObservableObject, ISettingsSection
+	public class MiscSettings : ObservableObjectBase, ISettingsSection
 	{
 		private bool allowMultipleInstances;
 		private bool loadPreviousAssemblies = true;
diff --git a/ILSpy/Options/MiscSettingsViewModel.cs b/ILSpy/Options/MiscSettingsViewModel.cs
@@ -34,7 +34,7 @@ namespace ICSharpCode.ILSpy.Options
 {
 	[ExportOptionPage(Order = 30)]
 	[NonShared]
-	public class MiscSettingsViewModel : ObservableObject, IOptionPage
+	public class MiscSettingsViewModel : ObservableObjectBase, IOptionPage
 	{
 		private MiscSettings settings;
 		public MiscSettings Settings {
diff --git a/ILSpy/Options/OptionsDialogViewModel.cs b/ILSpy/Options/OptionsDialogViewModel.cs
@@ -27,14 +27,14 @@
 
 namespace ICSharpCode.ILSpy.Options
 {
-	public class OptionsItemViewModel(IOptionPage content) : ObservableObject
+	public class OptionsItemViewModel(IOptionPage content) : ObservableObjectBase
 	{
 		public string Title { get; } = content.Title;
 
 		public IOptionPage Content { get; } = content;
 	}
 
-	public class OptionsDialogViewModel : ObservableObject
+	public class OptionsDialogViewModel : ObservableObjectBase
 	{
 		private IOptionPage? selectedPage;
 
diff --git a/ILSpy/ViewModels/CompareViewModel.cs b/ILSpy/ViewModels/CompareViewModel.cs
@@ -46,7 +46,7 @@ namespace ICSharpCode.ILSpy.ViewModels
 
 	using TomsToolbox.Wpf;
 
-	class CompareViewModel : ObservableObject
+	class CompareViewModel : ObservableObjectBase
 	{
 		private readonly TabPageModel tabPage;
 		private readonly AssemblyTreeModel assemblyTreeModel;
diff --git a/ILSpy/ViewModels/ManageAssemblyListsViewModel.cs b/ILSpy/ViewModels/ManageAssemblyListsViewModel.cs
@@ -34,7 +34,7 @@
 
 namespace ICSharpCode.ILSpy.ViewModels
 {
-	public class ManageAssemblyListsViewModel : ObservableObject
+	public class ManageAssemblyListsViewModel : ObservableObjectBase
 	{
 		private readonly AssemblyListManager manager;
 		private readonly Window parent;
diff --git a/ILSpy/ViewModels/PaneModel.cs b/ILSpy/ViewModels/PaneModel.cs
@@ -27,7 +27,7 @@
 
 namespace ICSharpCode.ILSpy.ViewModels
 {
-	public abstract class PaneModel : ObservableObject
+	public abstract class PaneModel : ObservableObjectBase
 	{
 		private readonly Throttle titleChangeThrottle;
 
diff --git a/ILSpy/ViewModels/UpdatePanelViewModel.cs b/ILSpy/ViewModels/UpdatePanelViewModel.cs
@@ -28,7 +28,7 @@ namespace ICSharpCode.ILSpy.ViewModels;
 
 [Export]
 [NonShared]
-public class UpdatePanelViewModel : ObservableObject
+public class UpdatePanelViewModel : ObservableObjectBase
 {
 	bool isPanelVisible;
 	string updateAvailableDownloadUrl;
diff --git a/TestPlugin/CustomOptionPage.xaml.cs b/TestPlugin/CustomOptionPage.xaml.cs
@@ -25,7 +25,7 @@ public CustomOptionPage()
 
 	[ExportOptionPage(Order = 0)]
 	[NonShared]
-	class CustomOptionsViewModel : ObservableObject, IOptionPage
+	class CustomOptionsViewModel : ObservableObjectBase, IOptionPage
 	{
 		private Options options;
 
@@ -47,7 +47,7 @@ public void LoadDefaults()
 		}
 	}
 
-	class Options : ObservableObject, ISettingsSection
+	class Options : ObservableObjectBase, ISettingsSection
 	{
 		static readonly XNamespace ns = "http://www.ilspy.net/testplugin";
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public ReadyToRunOptionPage()`
`38`	`38`
`39`	`39`	`[ExportOptionPage(Order = 40)]`
`40`	`40`	`[NonShared]`
`41`		`- class ReadyToRunOptionsViewModel : ObservableObject, IOptionPage`
	`41`	`+ class ReadyToRunOptionsViewModel : ObservableObjectBase, IOptionPage`
`42`	`42`	`{`
`43`	`43`	`private ReadyToRunOptions options;`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`namespace ICSharpCode.ILSpy.ReadyToRun`
`26`	`26`	`{`
`27`		`- internal partial class ReadyToRunOptions : ObservableObject, ISettingsSection`
	`27`	`+ internal partial class ReadyToRunOptions : ObservableObjectBase, ISettingsSection`
`28`	`28`	`{`
`29`	`29`	`private static readonly XNamespace ns = "http://www.ilspy.net/ready-to-run";`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@ public class AssemblyTreeModel : ToolPaneModel`
`72`	`72`	`private readonly LanguageService languageService;`
`73`	`73`	`private readonly IExportProvider exportProvider;`
`74`	`74`
	`75`	`+ private static Dispatcher UIThreadDispatcher => Application.Current.Dispatcher;`
	`76`	`+`
`75`	`77`	`public AssemblyTreeModel(SettingsService settingsService, LanguageService languageService, IExportProvider exportProvider)`
`76`	`78`	`{`
`77`	`79`	`this.settingsService = settingsService;`
`@@ -198,7 +200,7 @@ public async Task HandleSingleInstanceCommandLineArguments(string[] args)`
`198`	`200`	`{`
`199`	`201`	`var cmdArgs = CommandLineArguments.Create(args);`
`200`	`202`
`201`		`- await Dispatcher.InvokeAsync(async () => {`
	`203`	`+ await UIThreadDispatcher.InvokeAsync(async () => {`
`202`	`204`
`203`	`205`	`if (!HandleCommandLineArguments(cmdArgs))`
`204`	`206`	`return;`
`@@ -256,7 +258,7 @@ private async Task NavigateOnLaunch(string? navigateTo, string[]? activeTreeView`
`256`	`258`
`257`	`259`	`// Make sure we wait for assemblies being loaded...`
`258`	`260`	`// BeginInvoke in LoadedAssembly.LookupReferencedAssemblyInternal`
`259`		`- await Dispatcher.InvokeAsync(delegate { }, DispatcherPriority.Normal);`
	`261`	`+ await UIThreadDispatcher.InvokeAsync(delegate { }, DispatcherPriority.Normal);`
`260`	`262`
`261`	`263`	`if (mr is { ParentModule.MetadataFile: not null })`
`262`	`264`	`{`
`@@ -401,7 +403,7 @@ public void Initialize()`
`401`	`403`	`AssemblyList.Open(sessionSettings.ActiveAutoLoadedAssembly, true);`
`402`	`404`	`}`
`403`	`405`
`404`		`- Dispatcher.BeginInvoke(DispatcherPriority.Loaded, OpenAssemblies);`
	`406`	`+ UIThreadDispatcher.BeginInvoke(DispatcherPriority.Loaded, OpenAssemblies);`
`405`	`407`	`}`
`406`	`408`
`407`	`409`	`private async Task OpenAssemblies()`
`@@ -536,14 +538,14 @@ public void SelectNode(SharpTreeNode? node, bool inNewTabPage = false)`
`536`	`538`
`537`	`539`	`if (SelectedItem == node)`
`538`	`540`	`{`
`539`		`- Dispatcher.BeginInvoke(RefreshDecompiledView);`
	`541`	`+ UIThreadDispatcher.BeginInvoke(RefreshDecompiledView);`
`540`	`542`	`}`
`541`	`543`	`else`
`542`	`544`	`{`
`543`	`545`	`activeView?.ScrollIntoView(node);`
`544`	`546`	`SelectedItem = node;`
`545`	`547`
`546`		`- Dispatcher.BeginInvoke(DispatcherPriority.Background, () => {`
	`548`	`+ UIThreadDispatcher.BeginInvoke(DispatcherPriority.Background, () => {`
`547`	`549`	`activeView?.ScrollIntoView(node);`
`548`	`550`	`});`
`549`	`551`	`}`
`@@ -795,7 +797,7 @@ void ContextMenuClosed(object? sender, EventArgs e)`
`795`	`797`	`{`
`796`	`798`	`ContextMenuProvider.ContextMenuClosed -= ContextMenuClosed;`
`797`	`799`
`798`		`- Dispatcher.BeginInvoke(DispatcherPriority.Background, () => {`
	`800`	`+ UIThreadDispatcher.BeginInvoke(DispatcherPriority.Background, () => {`
`799`	`801`	`if (Mouse.RightButton != MouseButtonState.Pressed)`
`800`	`802`	`{`
`801`	`803`	`RefreshDecompiledView();`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ namespace ICSharpCode.ILSpy.Docking`
`46`	`46`	`{`
`47`	`47`	`[Export]`
`48`	`48`	`[Shared]`
`49`		`- public class DockWorkspace : ObservableObject, ILayoutUpdateStrategy`
	`49`	`+ public class DockWorkspace : ObservableObjectBase, ILayoutUpdateStrategy`
`50`	`50`	`{`
`51`	`51`	`private readonly IExportProvider exportProvider;`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ namespace ICSharpCode.ILSpy`
`31`	`31`	`/// <summary>`
`32`	`32`	`/// Represents the filters applied to the tree view.`
`33`	`33`	`/// </summary>`
`34`		`- public class LanguageSettings : ObservableObject, IChildSettings`
	`34`	`+ public class LanguageSettings : ObservableObjectBase, IChildSettings`
`35`	`35`	`{`
`36`	`36`	`/// <summary>`
`37`	`37`	`/// This dictionary is necessary to remember language versions across language changes. For example,`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ namespace ICSharpCode.ILSpy`
`27`	`27`	`{`
`28`	`28`	`[Export]`
`29`	`29`	`[Shared]`
`30`		`- public class MainWindowViewModel(SettingsService settingsService, LanguageService languageService, DockWorkspace dockWorkspace) : ObservableObject`
	`30`	`+ public class MainWindowViewModel(SettingsService settingsService, LanguageService languageService, DockWorkspace dockWorkspace) : ObservableObjectBase`
`31`	`31`	`{`
`32`	`32`	`public DockWorkspace Workspace { get; } = dockWorkspace;`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ namespace ICSharpCode.ILSpy.Options`
`28`	`28`	`/// <summary>`
`29`	`29`	`/// Description of DisplaySettings.`
`30`	`30`	`/// </summary>`
`31`		`- public class DisplaySettings : ObservableObject, ISettingsSection`
	`31`	`+ public class DisplaySettings : ObservableObjectBase, ISettingsSection`
`32`	`32`	`{`
`33`	`33`	`FontFamily selectedFont;`
`34`	`34`	`public FontFamily SelectedFont {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace ICSharpCode.ILSpy.Options`
`14`	`14`	`{`
`15`	`15`	`[ExportOptionPage(Order = 20)]`
`16`	`16`	`[NonShared]`
`17`		`- public class DisplaySettingsViewModel : ObservableObject, IOptionPage`
	`17`	`+ public class DisplaySettingsViewModel : ObservableObjectBase, IOptionPage`
`18`	`18`	`{`
`19`	`19`	`private DisplaySettings settings = new();`
`20`	`20`	`private FontFamily[] fontFamilies;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`namespace ICSharpCode.ILSpyX.Settings`
`25`	`25`	`{`
`26`		`- public class MiscSettings : ObservableObject, ISettingsSection`
	`26`	`+ public class MiscSettings : ObservableObjectBase, ISettingsSection`
`27`	`27`	`{`
`28`	`28`	`private bool allowMultipleInstances;`
`29`	`29`	`private bool loadPreviousAssemblies = true;`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ namespace ICSharpCode.ILSpy.Options`
`34`	`34`	`{`
`35`	`35`	`[ExportOptionPage(Order = 30)]`
`36`	`36`	`[NonShared]`
`37`		`- public class MiscSettingsViewModel : ObservableObject, IOptionPage`
	`37`	`+ public class MiscSettingsViewModel : ObservableObjectBase, IOptionPage`
`38`	`38`	`{`
`39`	`39`	`private MiscSettings settings;`
`40`	`40`	`public MiscSettings Settings {`