Fix navigation history

Author: tom-englert

ILSpy/AssemblyTree/AssemblyTreeModel.cs

@@ -94,8 +94,7 @@ private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
 					case nameof(SessionSettings.Theme):
 						// update syntax highlighting and force reload (AvalonEdit does not automatically refresh on highlighting change)
 						DecompilerTextView.RegisterHighlighting();
-						DecompileSelectedNodes(
-							DockWorkspace.Instance.ActiveTabPage.GetState() as DecompilerTextViewState);
+						DecompileSelectedNodes(DockWorkspace.Instance.ActiveTabPage.GetState() as DecompilerTextViewState);
 						break;
 					case nameof(SessionSettings.CurrentCulture):
 						MessageBox.Show(Properties.Resources.SettingsChangeRestartRequired, "ILSpy");
@@ -107,7 +106,7 @@ private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
 				switch (e.PropertyName)
 				{
 					case nameof(LanguageSettings.Language) or nameof(LanguageSettings.LanguageVersion):
-						DecompileSelectedNodes(recordHistory: false);
+						DecompileSelectedNodes();
 						break;
 				}
 			}
@@ -692,7 +691,20 @@ void TreeView_SelectionChanged()
 		{
 			if (SelectedItems.Count > 0)
 			{
-				var delayDecompilationRequestDueToContextMenu = Mouse.RightButton == MouseButtonState.Pressed;
+				bool isRightButtonPressed = Mouse.RightButton == MouseButtonState.Pressed;
+				bool isLeftButtonPressed = Mouse.LeftButton == MouseButtonState.Pressed;
+
+				if (isLeftButtonPressed || isRightButtonPressed)
+				{
+					// record history only if change is initiated by user
+					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;
 
 				if (!delayDecompilationRequestDueToContextMenu)
 				{
@@ -721,18 +733,10 @@ void ContextMenuClosed(object sender, EventArgs e)
 			}
 		}
 
-		public void DecompileSelectedNodes(DecompilerTextViewState newState = null, bool recordHistory = true)
+		private void DecompileSelectedNodes(DecompilerTextViewState newState = null)
 		{
 			var activeTabPage = DockWorkspace.Instance.ActiveTabPage;
 
-			if (recordHistory)
-			{
-				var currentState = activeTabPage.GetState();
-				if (currentState != null)
-					history.UpdateCurrent(new NavigationState(activeTabPage, currentState));
-				history.Record(new NavigationState(activeTabPage, SelectedItems));
-			}
-
 			activeTabPage.SupportsLanguageSwitching = true;
 
 			if (SelectedItems.Count == 1)
@@ -742,7 +746,7 @@ public void DecompileSelectedNodes(DecompilerTextViewState newState = null, bool
 			}
 			if (newState?.ViewedUri != null)
 			{
-				MainWindow.Instance.AssemblyTreeModel.NavigateTo(new(newState.ViewedUri, null), recordHistory: false);
+				NavigateTo(new(newState.ViewedUri, null), recordHistory: false);
 				return;
 			}
 
@@ -779,7 +783,6 @@ public void NavigateHistory(bool forward)
 			DockWorkspace.Instance.ActiveTabPage = newState.TabPage;
 
 			SelectNodes(newState.TreeNodes);
-			DecompileSelectedNodes(newState.ViewState as DecompilerTextViewState, false);
 		}
 
 		public bool CanNavigateBack => history.CanNavigateBack;
@@ -802,6 +805,7 @@ internal void NavigateTo(RequestNavigateEventArgs e, bool recordHistory = true,
 					e.Handled = true;
 					return;
 				}
+
 				AvalonEditTextOutput output = new AvalonEditTextOutput {
 					Address = e.Uri,
 					Title = e.Uri.AbsolutePath,