Code Quality: Fixed null warnings in MainPage.xaml.cs (#14145)

denisdekh · web-flow · commit ddf3b2aa3ae8 · 2023-12-11T10:57:50.000-05:00
diff --git a/src/Files.App/Helpers/Navigation/NavigationHelpers.cs b/src/Files.App/Helpers/Navigation/NavigationHelpers.cs
@@ -211,7 +211,7 @@ private static async Task UpdateTabInfoAsync(TabBarItem tabItem, object navigati
 			return (tabLocationHeader, iconSource, toolTipText);
 		}
 
-		public static async Task UpdateInstancePropertiesAsync(object navigationArg)
+		public static async Task UpdateInstancePropertiesAsync(object? navigationArg)
 		{
 			await SafetyExtensions.IgnoreExceptions(async () =>
 			{
diff --git a/src/Files.App/UserControls/AddressToolbar.xaml.cs b/src/Files.App/UserControls/AddressToolbar.xaml.cs
@@ -46,7 +46,7 @@ public bool ShowSearchBox
 		// Using a DependencyProperty as the backing store for ViewModel.  This enables animation, styling, binding, etc...
 		public static readonly DependencyProperty ViewModelProperty =
 			DependencyProperty.Register(nameof(ViewModel), typeof(ToolbarViewModel), typeof(AddressToolbar), new PropertyMetadata(null));
-		public ToolbarViewModel ViewModel
+		public ToolbarViewModel? ViewModel
 		{
 			get => (ToolbarViewModel)GetValue(ViewModelProperty);
 			set => SetValue(ViewModelProperty, value);
diff --git a/src/Files.App/UserControls/InnerNavigationToolbar.xaml.cs b/src/Files.App/UserControls/InnerNavigationToolbar.xaml.cs
@@ -27,7 +27,7 @@ public InnerNavigationToolbar()
 
 		public AppModel AppModel => App.AppModel;
 
-		public ToolbarViewModel ViewModel
+		public ToolbarViewModel? ViewModel
 		{
 			get => (ToolbarViewModel)GetValue(ViewModelProperty);
 			set => SetValue(ViewModelProperty, value);
diff --git a/src/Files.App/UserControls/StatusBarControl.xaml.cs b/src/Files.App/UserControls/StatusBarControl.xaml.cs
@@ -21,7 +21,7 @@ public DirectoryPropertiesViewModel? DirectoryPropertiesViewModel
 		public static readonly DependencyProperty DirectoryPropertiesViewModelProperty =
 			DependencyProperty.Register(nameof(DirectoryPropertiesViewModel), typeof(DirectoryPropertiesViewModel), typeof(StatusBarControl), new PropertyMetadata(null));
 
-		public SelectedItemsPropertiesViewModel SelectedItemsPropertiesViewModel
+		public SelectedItemsPropertiesViewModel? SelectedItemsPropertiesViewModel
 		{
 			get => (SelectedItemsPropertiesViewModel)GetValue(SelectedItemsPropertiesViewModelProperty);
 			set => SetValue(SelectedItemsPropertiesViewModelProperty, value);
diff --git a/src/Files.App/Utils/RecycleBin/RecycleBinHelpers.cs b/src/Files.App/Utils/RecycleBin/RecycleBinHelpers.cs
@@ -117,10 +117,14 @@ public static async Task RestoreRecycleBinAsync()
 
 		public static async Task RestoreSelectionRecycleBinAsync(IShellPage associatedInstance)
 		{
+			var items = associatedInstance.SlimContentPage.SelectedItems;
+			if (items == null) 
+				return;
 			var ConfirmEmptyBinDialog = new ContentDialog()
 			{
 				Title = "ConfirmRestoreSelectionBinDialogTitle".GetLocalizedResource(),
-				Content = string.Format("ConfirmRestoreSelectionBinDialogContent".GetLocalizedResource(), associatedInstance.SlimContentPage.SelectedItems.Count),
+				
+				Content = string.Format("ConfirmRestoreSelectionBinDialogContent".GetLocalizedResource(), items.Count),
 				PrimaryButtonText = "Yes".GetLocalizedResource(),
 				SecondaryButtonText = "Cancel".GetLocalizedResource(),
 				DefaultButton = ContentDialogButton.Primary
@@ -152,7 +156,10 @@ public static bool RecycleBinHasItems()
 
 		public static async Task RestoreItemAsync(IShellPage associatedInstance)
 		{
-			var items = associatedInstance.SlimContentPage.SelectedItems.ToList().Where(x => x is RecycleBinItem).Select((item) => new
+			var selected = associatedInstance.SlimContentPage.SelectedItems;
+			if (selected == null) 
+				return;
+			var items = selected.ToList().Where(x => x is RecycleBinItem).Select((item) => new
 			{
 				Source = StorageHelpers.FromPathAndType(
 					item.ItemPath,
@@ -164,10 +171,13 @@ public static async Task RestoreItemAsync(IShellPage associatedInstance)
 
 		public static async Task DeleteItemAsync(IShellPage associatedInstance)
 		{
-			var items = associatedInstance.SlimContentPage.SelectedItems.ToList().Select((item) => StorageHelpers.FromPathAndType(
+			var selected = associatedInstance.SlimContentPage.SelectedItems;
+			if (selected == null) 
+				return;
+			var items = selected.ToList().Select((item) => StorageHelpers.FromPathAndType(
 				item.ItemPath,
 				item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory));
 			await associatedInstance.FilesystemHelpers.DeleteItemsAsync(items, userSettingsService.FoldersSettingsService.DeleteConfirmationPolicy, false, true);
 		}
 	}
-}
+}
diff --git a/src/Files.App/Utils/Storage/History/StorageHistoryWrapper.cs b/src/Files.App/Utils/Storage/History/StorageHistoryWrapper.cs
@@ -14,7 +14,7 @@ public class StorageHistoryWrapper : IDisposable
 
 		public IStorageHistory GetCurrentHistory() => histories[index];
 
-		public void AddHistory(IStorageHistory history)
+		public void AddHistory(IStorageHistory? history)
 		{
 			if (history is not null)
 			{
diff --git a/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs b/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs
@@ -25,7 +25,7 @@ public sealed class FilesystemHelpers : IFilesystemHelpers
 		private readonly IJumpListService jumpListService;
 		private IFilesystemOperations filesystemOperations;
 
-		private ItemManipulationModel itemManipulationModel => associatedInstance.SlimContentPage?.ItemManipulationModel;
+		private ItemManipulationModel? itemManipulationModel => associatedInstance.SlimContentPage?.ItemManipulationModel;
 
 		private readonly CancellationToken cancellationToken;
 		private static char[] RestrictedCharacters
@@ -58,7 +58,7 @@ public FilesystemHelpers(IShellPage associatedInstance, CancellationToken cancel
 			jumpListService = Ioc.Default.GetRequiredService<IJumpListService>();
 			filesystemOperations = new ShellFilesystemOperations(this.associatedInstance);
 		}
-		public async Task<(ReturnResult, IStorageItem)> CreateAsync(IStorageItemWithPath source, bool registerHistory)
+		public async Task<(ReturnResult, IStorageItem?)> CreateAsync(IStorageItemWithPath source, bool registerHistory)
 		{
 			var returnStatus = ReturnResult.InProgress;
 			var progress = new Progress<StatusCenterItemProgressModel>();
@@ -363,7 +363,7 @@ public async Task<ReturnResult> CopyItemsFromClipboard(DataPackageView packageVi
 				ReturnResult returnStatus = ReturnResult.InProgress;
 
 				var destinations = new List<string>();
-				List<ShellFileItem> binItems = null;
+				List<ShellFileItem>? binItems = null;
 				foreach (var item in source)
 				{
 					if (RecycleBinHelpers.IsPathUnderRecycleBin(item.Path))
@@ -511,7 +511,7 @@ public async Task<ReturnResult> MoveItemsFromClipboard(DataPackageView packageVi
 			ReturnResult returnStatus = ReturnResult.InProgress;
 
 			var destinations = new List<string>();
-			List<ShellFileItem> binItems = null;
+			List<ShellFileItem>? binItems = null;
 			foreach (var item in source)
 			{
 				if (RecycleBinHelpers.IsPathUnderRecycleBin(item.Path))
@@ -551,7 +551,7 @@ await DialogDisplayHelper.ShowDialogAsync(
 				return ReturnResult.Failed;
 			}
 
-			IStorageHistory history = null;
+			IStorageHistory? history = null;
 
 			switch (source.ItemType)
 			{
@@ -658,7 +658,8 @@ public static bool IsValidForFilename(string name)
 			{
 				var itemPathOrName = string.IsNullOrEmpty(item.src.Path) ? item.src.Item.Name : item.src.Path;
 				incomingItems.Add(new FileSystemDialogConflictItemViewModel() { ConflictResolveOption = FileNameConflictResolveOptionType.None, SourcePath = itemPathOrName, DestinationPath = item.dest, DestinationDisplayName = Path.GetFileName(item.dest) });
-				if (collisions.ContainsKey(incomingItems.ElementAt(item.index).SourcePath))
+				var path = incomingItems.ElementAt(item.index).SourcePath;
+				if (path is not null && collisions.ContainsKey(path))
 				{
 					// Something strange happened, log
 					App.Logger.LogWarning($"Duplicate key when resolving conflicts: {incomingItems.ElementAt(item.index).SourcePath}, {item.src.Name}\n" +
@@ -870,6 +871,8 @@ public void Dispose()
 		{
 			filesystemOperations?.Dispose();
 
+			// SUPPRESS: Cannot convert null literal to non-nullable reference type.
+	#pragma warning disable CS8625
 			associatedInstance = null;
 			filesystemOperations = null;
 		}
diff --git a/src/Files.App/Utils/Storage/Operations/IFilesystemHelpers.cs b/src/Files.App/Utils/Storage/Operations/IFilesystemHelpers.cs
@@ -14,7 +14,7 @@ public interface IFilesystemHelpers : IDisposable
 		/// <param name="source">FullPath to the item</param>
 		/// <param name="registerHistory">Determines whether <see cref="IStorageHistory"/> is saved</param>
 		/// <returns><see cref="ReturnResult"/> of performed operation</returns>
-		Task<(ReturnResult, IStorageItem)> CreateAsync(IStorageItemWithPath source, bool registerHistory);
+		Task<(ReturnResult, IStorageItem?)> CreateAsync(IStorageItemWithPath source, bool registerHistory);
 
 		#region Delete
 
diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
@@ -88,14 +88,14 @@ public SidebarDisplayMode SidebarDisplayMode
 		public bool IsSidebarCompactSize
 			=> SidebarDisplayMode == SidebarDisplayMode.Compact || SidebarDisplayMode == SidebarDisplayMode.Minimal;
 
-		public void NotifyInstanceRelatedPropertiesChanged(string arg)
+		public void NotifyInstanceRelatedPropertiesChanged(string? arg)
 		{
 			UpdateSidebarSelectedItemFromArgs(arg);
 
 			OnPropertyChanged(nameof(SidebarSelectedItem));
 		}
 
-		public void UpdateSidebarSelectedItemFromArgs(string arg)
+		public void UpdateSidebarSelectedItemFromArgs(string? arg)
 		{
 			var value = arg;
 
diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs
@@ -161,7 +161,7 @@ public async void TabItemContent_ContentChanged(object? sender, CustomTabViewIte
 
 			var paneArgs = e.NavigationParameter as PaneNavigationArguments;
 			SidebarAdaptiveViewModel.UpdateSidebarSelectedItemFromArgs(SidebarAdaptiveViewModel.PaneHolder.IsLeftPaneActive ?
-				paneArgs.LeftPaneNavPathParam : paneArgs.RightPaneNavPathParam);
+				paneArgs?.LeftPaneNavPathParam : paneArgs?.RightPaneNavPathParam);
 
 			UpdateStatusBarProperties();
 			LoadPaneChanged();
@@ -175,9 +175,12 @@ public void MultitaskingControl_CurrentInstanceChanged(object? sender, CurrentIn
 				SidebarAdaptiveViewModel.PaneHolder.PropertyChanged -= PaneHolder_PropertyChanged;
 
 			var navArgs = e.CurrentInstance.TabItemParameter?.NavigationParameter;
-			SidebarAdaptiveViewModel.PaneHolder = e.CurrentInstance as IPaneHolder;
-			SidebarAdaptiveViewModel.PaneHolder.PropertyChanged += PaneHolder_PropertyChanged;
-			SidebarAdaptiveViewModel.NotifyInstanceRelatedPropertiesChanged((navArgs as PaneNavigationArguments).LeftPaneNavPathParam);
+            if (e.CurrentInstance is IPaneHolder currentInstance)
+            {
+                SidebarAdaptiveViewModel.PaneHolder = currentInstance;
+                SidebarAdaptiveViewModel.PaneHolder.PropertyChanged += PaneHolder_PropertyChanged;
+			}
+			SidebarAdaptiveViewModel.NotifyInstanceRelatedPropertiesChanged((navArgs as PaneNavigationArguments)?.LeftPaneNavPathParam);
 
 			if (SidebarAdaptiveViewModel.PaneHolder?.ActivePaneOrColumn.SlimContentPage?.DirectoryPropertiesViewModel is not null)
 				SidebarAdaptiveViewModel.PaneHolder.ActivePaneOrColumn.SlimContentPage.DirectoryPropertiesViewModel.ShowLocals = true;

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ private static async Task UpdateTabInfoAsync(TabBarItem tabItem, object navigati`
`211`	`211`	`return (tabLocationHeader, iconSource, toolTipText);`
`212`	`212`	`}`
`213`	`213`
`214`		`- public static async Task UpdateInstancePropertiesAsync(object navigationArg)`
	`214`	`+ public static async Task UpdateInstancePropertiesAsync(object? navigationArg)`
`215`	`215`	`{`
`216`	`216`	`await SafetyExtensions.IgnoreExceptions(async () =>`
`217`	`217`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public bool ShowSearchBox`
`46`	`46`	`// Using a DependencyProperty as the backing store for ViewModel. This enables animation, styling, binding, etc...`
`47`	`47`	`public static readonly DependencyProperty ViewModelProperty =`
`48`	`48`	`DependencyProperty.Register(nameof(ViewModel), typeof(ToolbarViewModel), typeof(AddressToolbar), new PropertyMetadata(null));`
`49`		`- public ToolbarViewModel ViewModel`
	`49`	`+ public ToolbarViewModel? ViewModel`
`50`	`50`	`{`
`51`	`51`	`get => (ToolbarViewModel)GetValue(ViewModelProperty);`
`52`	`52`	`set => SetValue(ViewModelProperty, value);`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public InnerNavigationToolbar()`
`27`	`27`
`28`	`28`	`public AppModel AppModel => App.AppModel;`
`29`	`29`
`30`		`- public ToolbarViewModel ViewModel`
	`30`	`+ public ToolbarViewModel? ViewModel`
`31`	`31`	`{`
`32`	`32`	`get => (ToolbarViewModel)GetValue(ViewModelProperty);`
`33`	`33`	`set => SetValue(ViewModelProperty, value);`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public DirectoryPropertiesViewModel? DirectoryPropertiesViewModel`
`21`	`21`	`public static readonly DependencyProperty DirectoryPropertiesViewModelProperty =`
`22`	`22`	`DependencyProperty.Register(nameof(DirectoryPropertiesViewModel), typeof(DirectoryPropertiesViewModel), typeof(StatusBarControl), new PropertyMetadata(null));`
`23`	`23`
`24`		`- public SelectedItemsPropertiesViewModel SelectedItemsPropertiesViewModel`
	`24`	`+ public SelectedItemsPropertiesViewModel? SelectedItemsPropertiesViewModel`
`25`	`25`	`{`
`26`	`26`	`get => (SelectedItemsPropertiesViewModel)GetValue(SelectedItemsPropertiesViewModelProperty);`
`27`	`27`	`set => SetValue(SelectedItemsPropertiesViewModelProperty, value);`
Original file line number	Diff line number	Diff line change
`@@ -117,10 +117,14 @@ public static async Task RestoreRecycleBinAsync()`
`117`	`117`
`118`	`118`	`public static async Task RestoreSelectionRecycleBinAsync(IShellPage associatedInstance)`
`119`	`119`	`{`
	`120`	`+ var items = associatedInstance.SlimContentPage.SelectedItems;`
	`121`	`+ if (items == null)`
	`122`	`+ return;`
`120`	`123`	`var ConfirmEmptyBinDialog = new ContentDialog()`
`121`	`124`	`{`
`122`	`125`	`Title = "ConfirmRestoreSelectionBinDialogTitle".GetLocalizedResource(),`
`123`		`- Content = string.Format("ConfirmRestoreSelectionBinDialogContent".GetLocalizedResource(), associatedInstance.SlimContentPage.SelectedItems.Count),`
	`126`	`+`
	`127`	`+ Content = string.Format("ConfirmRestoreSelectionBinDialogContent".GetLocalizedResource(), items.Count),`
`124`	`128`	`PrimaryButtonText = "Yes".GetLocalizedResource(),`
`125`	`129`	`SecondaryButtonText = "Cancel".GetLocalizedResource(),`
`126`	`130`	`DefaultButton = ContentDialogButton.Primary`
`@@ -152,7 +156,10 @@ public static bool RecycleBinHasItems()`
`152`	`156`
`153`	`157`	`public static async Task RestoreItemAsync(IShellPage associatedInstance)`
`154`	`158`	`{`
`155`		`- var items = associatedInstance.SlimContentPage.SelectedItems.ToList().Where(x => x is RecycleBinItem).Select((item) => new`
	`159`	`+ var selected = associatedInstance.SlimContentPage.SelectedItems;`
	`160`	`+ if (selected == null)`
	`161`	`+ return;`
	`162`	`+ var items = selected.ToList().Where(x => x is RecycleBinItem).Select((item) => new`
`156`	`163`	`{`
`157`	`164`	`Source = StorageHelpers.FromPathAndType(`
`158`	`165`	`item.ItemPath,`
`@@ -164,10 +171,13 @@ public static async Task RestoreItemAsync(IShellPage associatedInstance)`
`164`	`171`
`165`	`172`	`public static async Task DeleteItemAsync(IShellPage associatedInstance)`
`166`	`173`	`{`
`167`		`- var items = associatedInstance.SlimContentPage.SelectedItems.ToList().Select((item) => StorageHelpers.FromPathAndType(`
	`174`	`+ var selected = associatedInstance.SlimContentPage.SelectedItems;`
	`175`	`+ if (selected == null)`
	`176`	`+ return;`
	`177`	`+ var items = selected.ToList().Select((item) => StorageHelpers.FromPathAndType(`
`168`	`178`	`item.ItemPath,`
`169`	`179`	`item.PrimaryItemAttribute == StorageItemTypes.File ? FilesystemItemType.File : FilesystemItemType.Directory));`
`170`	`180`	`await associatedInstance.FilesystemHelpers.DeleteItemsAsync(items, userSettingsService.FoldersSettingsService.DeleteConfirmationPolicy, false, true);`
`171`	`181`	`}`
`172`	`182`	`}`
`173`		`-}`
	`183`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class StorageHistoryWrapper : IDisposable`
`14`	`14`
`15`	`15`	`public IStorageHistory GetCurrentHistory() => histories[index];`
`16`	`16`
`17`		`- public void AddHistory(IStorageHistory history)`
	`17`	`+ public void AddHistory(IStorageHistory? history)`
`18`	`18`	`{`
`19`	`19`	`if (history is not null)`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public sealed class FilesystemHelpers : IFilesystemHelpers`
`25`	`25`	`private readonly IJumpListService jumpListService;`
`26`	`26`	`private IFilesystemOperations filesystemOperations;`
`27`	`27`
`28`		`- private ItemManipulationModel itemManipulationModel => associatedInstance.SlimContentPage?.ItemManipulationModel;`
	`28`	`+ private ItemManipulationModel? itemManipulationModel => associatedInstance.SlimContentPage?.ItemManipulationModel;`
`29`	`29`
`30`	`30`	`private readonly CancellationToken cancellationToken;`
`31`	`31`	`private static char[] RestrictedCharacters`
`@@ -58,7 +58,7 @@ public FilesystemHelpers(IShellPage associatedInstance, CancellationToken cancel`
`58`	`58`	`jumpListService = Ioc.Default.GetRequiredService<IJumpListService>();`
`59`	`59`	`filesystemOperations = new ShellFilesystemOperations(this.associatedInstance);`
`60`	`60`	`}`
`61`		`- public async Task<(ReturnResult, IStorageItem)> CreateAsync(IStorageItemWithPath source, bool registerHistory)`
	`61`	`+ public async Task<(ReturnResult, IStorageItem?)> CreateAsync(IStorageItemWithPath source, bool registerHistory)`
`62`	`62`	`{`
`63`	`63`	`var returnStatus = ReturnResult.InProgress;`
`64`	`64`	`var progress = new Progress<StatusCenterItemProgressModel>();`
`@@ -363,7 +363,7 @@ public async Task<ReturnResult> CopyItemsFromClipboard(DataPackageView packageVi`
`363`	`363`	`ReturnResult returnStatus = ReturnResult.InProgress;`
`364`	`364`
`365`	`365`	`var destinations = new List<string>();`
`366`		`- List<ShellFileItem> binItems = null;`
	`366`	`+ List<ShellFileItem>? binItems = null;`
`367`	`367`	`foreach (var item in source)`
`368`	`368`	`{`
`369`	`369`	`if (RecycleBinHelpers.IsPathUnderRecycleBin(item.Path))`
`@@ -511,7 +511,7 @@ public async Task<ReturnResult> MoveItemsFromClipboard(DataPackageView packageVi`
`511`	`511`	`ReturnResult returnStatus = ReturnResult.InProgress;`
`512`	`512`
`513`	`513`	`var destinations = new List<string>();`
`514`		`- List<ShellFileItem> binItems = null;`
	`514`	`+ List<ShellFileItem>? binItems = null;`
`515`	`515`	`foreach (var item in source)`
`516`	`516`	`{`
`517`	`517`	`if (RecycleBinHelpers.IsPathUnderRecycleBin(item.Path))`
`@@ -551,7 +551,7 @@ await DialogDisplayHelper.ShowDialogAsync(`
`551`	`551`	`return ReturnResult.Failed;`
`552`	`552`	`}`
`553`	`553`
`554`		`- IStorageHistory history = null;`
	`554`	`+ IStorageHistory? history = null;`
`555`	`555`
`556`	`556`	`switch (source.ItemType)`
`557`	`557`	`{`
`@@ -658,7 +658,8 @@ public static bool IsValidForFilename(string name)`
`658`	`658`	`{`
`659`	`659`	`var itemPathOrName = string.IsNullOrEmpty(item.src.Path) ? item.src.Item.Name : item.src.Path;`
`660`	`660`	`incomingItems.Add(new FileSystemDialogConflictItemViewModel() { ConflictResolveOption = FileNameConflictResolveOptionType.None, SourcePath = itemPathOrName, DestinationPath = item.dest, DestinationDisplayName = Path.GetFileName(item.dest) });`
`661`		`- if (collisions.ContainsKey(incomingItems.ElementAt(item.index).SourcePath))`
	`661`	`+ var path = incomingItems.ElementAt(item.index).SourcePath;`
	`662`	`+ if (path is not null && collisions.ContainsKey(path))`
`662`	`663`	`{`
`663`	`664`	`// Something strange happened, log`
`664`	`665`	`App.Logger.LogWarning($"Duplicate key when resolving conflicts: {incomingItems.ElementAt(item.index).SourcePath}, {item.src.Name}\n" +`
`@@ -870,6 +871,8 @@ public void Dispose()`
`870`	`871`	`{`
`871`	`872`	`filesystemOperations?.Dispose();`
`872`	`873`
	`874`	`+ // SUPPRESS: Cannot convert null literal to non-nullable reference type.`
	`875`	`+ #pragma warning disable CS8625`
`873`	`876`	`associatedInstance = null;`
`874`	`877`	`filesystemOperations = null;`
`875`	`878`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,14 +88,14 @@ public SidebarDisplayMode SidebarDisplayMode`
`88`	`88`	`public bool IsSidebarCompactSize`
`89`	`89`	`=> SidebarDisplayMode == SidebarDisplayMode.Compact \|\| SidebarDisplayMode == SidebarDisplayMode.Minimal;`
`90`	`90`
`91`		`- public void NotifyInstanceRelatedPropertiesChanged(string arg)`
	`91`	`+ public void NotifyInstanceRelatedPropertiesChanged(string? arg)`
`92`	`92`	`{`
`93`	`93`	`UpdateSidebarSelectedItemFromArgs(arg);`
`94`	`94`
`95`	`95`	`OnPropertyChanged(nameof(SidebarSelectedItem));`
`96`	`96`	`}`
`97`	`97`
`98`		`- public void UpdateSidebarSelectedItemFromArgs(string arg)`
	`98`	`+ public void UpdateSidebarSelectedItemFromArgs(string? arg)`
`99`	`99`	`{`
`100`	`100`	`var value = arg;`
`101`	`101`