Fix #2686: Introduce ToolPaneModel.AssociatedCommand to allow overriding Window-menu action.

Author: siegfriedpammer

ILSpy/Analyzers/AnalyzeCommand.cs

@@ -58,24 +58,30 @@ bool IsValidReference(object reference)
 
 		public void Execute(TextViewContext context)
 		{
+			AnalyzerTreeView analyzerTreeView = MainWindow.Instance.AnalyzerTreeView;
+			if (analyzerTreeView == null)
+			{
+				return;
+			}
 			if (context.SelectedTreeNodes != null)
 			{
 				foreach (IMemberTreeNode node in context.SelectedTreeNodes)
 				{
-					MainWindow.Instance.AnalyzerTreeView.Analyze(node.Member);
+					analyzerTreeView.Analyze(node.Member);
 				}
 			}
 			else if (context.Reference != null && context.Reference.Reference is IEntity entity)
 			{
-				MainWindow.Instance.AnalyzerTreeView.Analyze(entity);
+				analyzerTreeView.Analyze(entity);
 			}
 		}
 
 		public override bool CanExecute(object parameter)
 		{
-			if (MainWindow.Instance.AnalyzerTreeView.IsKeyboardFocusWithin)
+			AnalyzerTreeView analyzerTreeView = MainWindow.Instance.AnalyzerTreeView;
+			if (analyzerTreeView != null && analyzerTreeView.IsKeyboardFocusWithin)
 			{
-				return MainWindow.Instance.AnalyzerTreeView.SelectedItems.OfType<object>().All(n => n is IMemberTreeNode);
+				return analyzerTreeView.SelectedItems.OfType<object>().All(n => n is IMemberTreeNode);
 			}
 			else
 			{
@@ -85,7 +91,8 @@ public override bool CanExecute(object parameter)
 
 		public override void Execute(object parameter)
 		{
-			if (MainWindow.Instance.AnalyzerTreeView.IsKeyboardFocusWithin)
+			AnalyzerTreeView analyzerTreeView = MainWindow.Instance.AnalyzerTreeView;
+			if (analyzerTreeView != null && analyzerTreeView.IsKeyboardFocusWithin)
 			{
 				foreach (IMemberTreeNode node in MainWindow.Instance.AnalyzerTreeView.SelectedItems.OfType<IMemberTreeNode>().ToArray())
 				{

ILSpy/MainWindow.xaml.cs

@@ -89,7 +89,7 @@ public SharpTreeView AssemblyTreeView {
 
 		public AnalyzerTreeView AnalyzerTreeView {
 			get {
-				return FindResource("AnalyzerTreeView") as AnalyzerTreeView;
+				return !IsLoaded ? null : FindResource("AnalyzerTreeView") as AnalyzerTreeView;
 			}
 		}
 
@@ -428,7 +428,7 @@ void ToolsChanged(object sender, NotifyCollectionChangedEventArgs e)
 				MenuItem CreateMenuItem(ToolPaneModel pane)
 				{
 					MenuItem menuItem = new MenuItem();
-					menuItem.Command = new ToolPaneCommand(pane.ContentId);
+					menuItem.Command = pane.AssociatedCommand ?? new ToolPaneCommand(pane.ContentId);
 					menuItem.Header = pane.Title;
 					menuItem.Tag = pane;
 					var shortcutKey = pane.ShortcutKey;

ILSpy/ViewModels/AnalyzerPaneModel.cs

@@ -31,6 +31,7 @@ private AnalyzerPaneModel()
 			ContentId = PaneContentId;
 			Title = Properties.Resources.Analyze;
 			ShortcutKey = new KeyGesture(Key.R, ModifierKeys.Control);
+			AssociatedCommand = ILSpyCommands.Analyze;
 		}
 
 		public override DataTemplate Template => (DataTemplate)MainWindow.Instance.FindResource("AnalyzerPaneTemplate");

ILSpy/ViewModels/ToolPaneModel.cs

@@ -34,5 +34,7 @@ public virtual void Show()
 		public KeyGesture ShortcutKey { get; protected set; }
 
 		public string Icon { get; protected set; }
+
+		public ICommand AssociatedCommand { get; set; }
 	}
 }