Fix navigation history also for keyboard

Author: tom-englert

ILSpy/AssemblyTree/AssemblyTreeModel.cs

@@ -44,15 +44,15 @@
 using ICSharpCode.Decompiler.Documentation;
 using ICSharpCode.Decompiler.TypeSystem.Implementation;
 using System.Reflection.Metadata;
+using System.Text;
+using System.Windows.Navigation;
 
 using ICSharpCode.ILSpy.AppEnv;
 using ICSharpCode.ILSpy.Search;
 using ICSharpCode.Decompiler;
-using System.Text;
 
 using TomsToolbox.Essentials;
 using TomsToolbox.Wpf;
-using System.Windows.Navigation;
 
 namespace ICSharpCode.ILSpy.AssemblyTree
 {
@@ -78,7 +78,7 @@ public AssemblyTreeModel()
 			MessageBus<NavigateToReferenceEventArgs>.Subscribers += JumpToReference;
 			MessageBus<SettingsChangedEventArgs>.Subscribers += (sender, e) => Settings_PropertyChanged(sender, e);
 
-			var selectionChangeThrottle = new DispatcherThrottle(DispatcherPriority.Background, TreeView_SelectionChanged);
+			var selectionChangeThrottle = new DispatcherThrottle(DispatcherPriority.Input, TreeView_SelectionChanged);
 			SelectedItems.CollectionChanged += (_, _) => selectionChangeThrottle.Tick();
 		}
 
@@ -128,6 +128,14 @@ public SharpTreeNode SelectedItem {
 
 		public ObservableCollection<SharpTreeNode> SelectedItems { get; } = [];
 
+		private bool isInternalSelectionChanging;
+
+		private void ChangingSelection()
+		{
+			isInternalSelectionChanging = true;
+			this.Dispatcher.BeginInvoke(DispatcherPriority.Background, () => isInternalSelectionChanging = false);
+		}
+
 		public string[] SelectedPath => GetPathForNode(SelectedItem);
 
 		readonly List<LoadedAssembly> commandLineLoadedAssemblies = [];
@@ -496,6 +504,7 @@ public void SelectNode(SharpTreeNode node, bool inNewTabPage = false)
 			}
 			else
 			{
+				ChangingSelection();
 				activeView?.ScrollIntoView(node);
 				SelectedItem = node;
 			}
@@ -519,6 +528,7 @@ internal void SelectNodes(IEnumerable<SharpTreeNode> nodes)
 				return;
 			}
 
+			ChangingSelection();
 			SelectedItems.Clear();
 			SelectedItems.AddRange(nodesList);
 		}
@@ -691,20 +701,17 @@ void TreeView_SelectionChanged()
 		{
 			if (SelectedItems.Count > 0)
 			{
-				bool isRightButtonPressed = Mouse.RightButton == MouseButtonState.Pressed;
-				bool isLeftButtonPressed = Mouse.LeftButton == MouseButtonState.Pressed;
-
-				if (isLeftButtonPressed || isRightButtonPressed)
+				if (!isInternalSelectionChanging)
 				{
-					// record history only if change is initiated by user
+					// record history only if change is initiated by user input
 					var activeTabPage = DockWorkspace.Instance.ActiveTabPage;
 					var currentState = activeTabPage.GetState();
 					if (currentState != null)
 						history.UpdateCurrent(new NavigationState(activeTabPage, currentState));
 					history.Record(new NavigationState(activeTabPage, SelectedItems));
 				}
 
-				var delayDecompilationRequestDueToContextMenu = isRightButtonPressed;
+				var delayDecompilationRequestDueToContextMenu = Mouse.RightButton == MouseButtonState.Pressed;
 
 				if (!delayDecompilationRequestDueToContextMenu)
 				{
@@ -855,6 +862,7 @@ public void Refresh()
 
 		private void UnselectAll()
 		{
+			ChangingSelection();
 			SelectedItems.Clear();
 		}
 

ILSpy/MainWindow.xaml

@@ -37,6 +37,7 @@
 
 	<Window.InputBindings>
 		<KeyBinding Key="R" Modifiers="Control" Command="{x:Static local:ILSpyCommands.Analyze}" />
+		<KeyBinding Key="Z" Modifiers="Control" Command="{x:Static NavigationCommands.BrowseBack}" />
 	</Window.InputBindings>
 
 	<Window.TaskbarItemInfo>