Usability

Author: ATrefzer

CSharpCodeAnalyst/Areas/TreeArea/TreeControl.xaml

@@ -6,6 +6,7 @@
              xmlns:local="clr-namespace:CSharpCodeAnalyst.Areas.TreeArea"
              xmlns:resources="clr-namespace:CSharpCodeAnalyst.Resources"
              xmlns:dd="urn:gong-wpf-dragdrop"
+             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
              d:DataContext="{d:DesignInstance local:TreeViewModel}"
              mc:Ignorable="d"
              d:DesignHeight="300" d:DesignWidth="300">
@@ -64,6 +65,13 @@
                   Margin="5"
                   dd:DragDrop.IsDragSource="True">
 
+            <b:Interaction.Triggers>
+                <b:EventTrigger EventName="SelectedItemChanged">
+                    <b:InvokeCommandAction Command="{Binding SelectedItemChangedCommand}"
+                                           CommandParameter="{Binding SelectedItem, RelativeSource={RelativeSource AncestorType=TreeView}}" />
+                </b:EventTrigger>
+            </b:Interaction.Triggers>
+
             <TreeView.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="{x:Static resources:Strings.AddToGraph_MenuItem}"

CSharpCodeAnalyst/Areas/TreeArea/TreeViewModel.cs

@@ -18,6 +18,7 @@ public class TreeViewModel : INotifyPropertyChanged
     private readonly MessageBus _messaging;
     private readonly RefactoringService _refactoringService;
     private CodeGraph? _codeGraph;
+    private string? _lastSelectedCodeElement;
     private string _searchText;
     private ObservableCollection<TreeItemViewModel> _treeItems;
 
@@ -41,30 +42,11 @@ public TreeViewModel(MessageBus messaging, RefactoringService refactoringService
 
         SetMovementTargetCommand = new WpfCommand<TreeItemViewModel>(RefactoringSetMovementTarget, RefactoringCanSetMovementTarget);
         MoveCommand = new WpfCommand<TreeItemViewModel>(RefactoringMoveCodeElement, RefactoringCanMoveCodeElement);
+        SelectedItemChangedCommand = new WpfCommand<TreeItemViewModel>(OnSelectedItemChanged);
 
         _treeItems = [];
     }
 
-    private bool RefactoringCanMoveCodeElement(TreeItemViewModel tvm)
-    {
-        return _refactoringService.CanMoveCodeElement(tvm?.CodeElement?.Id);
-    }
-
-    private void RefactoringMoveCodeElement(TreeItemViewModel? tvm)
-    {
-        _refactoringService.MoveCodeElement(tvm?.CodeElement?.Id);
-    }
-
-    private bool RefactoringCanSetMovementTarget(TreeItemViewModel tvm)
-    {
-        return _refactoringService.CanSetMovementTarget(tvm?.CodeElement?.Id);
-    }
-
-    private void RefactoringSetMovementTarget(TreeItemViewModel tvm)
-    {
-        _refactoringService.SetMovementTarget(tvm?.CodeElement?.Id);
-    }
-
     public ICommand CollapseTreeCommand { get; }
 
     public ICommand ClearSearchCommand { get; }
@@ -79,7 +61,7 @@ public ObservableCollection<TreeItemViewModel> TreeItems
             OnPropertyChanged(nameof(TreeItems));
         }
     }
-    
+
     public string SearchText
     {
         get => _searchText;
@@ -97,12 +79,42 @@ public string SearchText
     public ICommand PartitionWithBaseTreeCommand { get; private set; }
     public ICommand CopyToClipboardCommand { get; private set; }
     public ICommand CreateCodeElementCommand { get; private set; }
-    
+
     public ICommand SetMovementTargetCommand { get; private set; }
     public ICommand MoveCommand { get; private set; }
 
+    public ICommand SelectedItemChangedCommand { get; }
+
     public event PropertyChangedEventHandler? PropertyChanged;
 
+    private void OnSelectedItemChanged(TreeItemViewModel item)
+    {
+        if (item?.CodeElement != null)
+        {
+            _lastSelectedCodeElement = item.CodeElement.Id;
+        }
+    }
+
+    private bool RefactoringCanMoveCodeElement(TreeItemViewModel tvm)
+    {
+        return _refactoringService.CanMoveCodeElement(tvm?.CodeElement?.Id);
+    }
+
+    private void RefactoringMoveCodeElement(TreeItemViewModel? tvm)
+    {
+        _refactoringService.MoveCodeElement(tvm?.CodeElement?.Id);
+    }
+
+    private bool RefactoringCanSetMovementTarget(TreeItemViewModel tvm)
+    {
+        return _refactoringService.CanSetMovementTarget(tvm?.CodeElement?.Id);
+    }
+
+    private void RefactoringSetMovementTarget(TreeItemViewModel tvm)
+    {
+        _refactoringService.SetMovementTarget(tvm?.CodeElement?.Id);
+    }
+
 
 
     private static void OnCopyToClipboard(TreeItemViewModel vm)
@@ -161,12 +173,12 @@ private void AddNodeToGraph(TreeItemViewModel? item)
             _messaging.Publish(new AddNodeToGraphRequest(item.CodeElement));
         }
     }
-    
+
 
     public void HandleCodeGraphRefactored(CodeGraphRefactored message)
     {
         // Note: Graph is actually the same
-        
+
         // Tree updates are slow, so do the update manually.
         if (message is CodeElementCreated created)
         {
@@ -192,7 +204,7 @@ public void HandleCodeGraphRefactored(CodeGraphRefactored message)
     private void RefactoringCodeElementDeleted(string deletedElementId, string? parentId, HashSet<string> deletedIds)
     {
         // Refresh the tree to show the new element
-      
+
         // Delete from tree.
         if (!CodeElementIdToViewModel.TryGetValue(deletedElementId, out _))
         {
@@ -247,7 +259,7 @@ private void RefactoringCodeElementAdded(CodeElementCreated created)
             }
         }
     }
-    
+
     /// <summary>
     ///     Creates a code element at the root level (e.g., Assembly).
     ///     Public method to be called from UI when right-clicking empty space.
@@ -256,7 +268,7 @@ public void RefactoringCreateCodeElementAtRoot()
     {
         RefactoringCreateCodeElement(null);
     }
-    
+
     private bool RefactoringCanCreateCodeElement(TreeItemViewModel? tvm)
     {
         // null tvm means root level (empty space in tree) - this is allowed
@@ -356,6 +368,14 @@ public void ExecuteSearch()
         else if (SearchText.Trim() == "!")
         {
             ResetVisibility(TreeItems, true);
+            if (!string.IsNullOrEmpty(_lastSelectedCodeElement))
+            {
+                // Since I want to keep the highlighting, I likely want to keep the location.
+                if ((bool)_codeGraph?.Nodes.ContainsKey(_lastSelectedCodeElement))
+                {
+                    _messaging.Publish(new LocateInTreeRequest(_lastSelectedCodeElement));
+                }
+            }
         }
         else
         {
@@ -422,11 +442,9 @@ private bool SearchAndExpandNodes(IEnumerable<TreeItemViewModel> items, IExpress
         return anyMatch;
     }
 
-    public string? GetRefactoringNewMoveParent()
+    public string GetRefactoringNewMoveParent()
     {
         var target = _refactoringService.GetMovementTarget();
         return target?.Name != null ? target.Name : string.Empty;
     }
-
- 
 }