Make CE selection stick

Author: Hosch250

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerItemViewModel.cs

@@ -164,6 +164,7 @@ protected set
         }
 
         public bool IsExpanded { get; set; }
+        public bool IsSelected { get; set; }
 
         public abstract string Name { get; }
         public abstract string NameWithSignature { get; }

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs

@@ -53,6 +53,14 @@ private void FillFolders(IEnumerable<Declaration> declarations)
                                .GroupBy(item => item.CustomFolder)
                                .OrderBy(item => item.Key);
 
+            // set parent so we can walk up to the project node
+            // we haven't added the nodes yet, so this cast is valid
+            // ReSharper disable once PossibleInvalidCastExceptionInForeachLoop
+            foreach (CodeExplorerCustomFolderViewModel item in _folderTree.Items)
+            {
+                item.SetParent(this);
+            }
+
             foreach (var grouping in groupedItems)
             {
                 AddNodesToTree(_folderTree, items, grouping);
@@ -68,11 +76,6 @@ private bool AddNodesToTree(CodeExplorerCustomFolderViewModel tree, List<Declara
                     continue;
                 }
 
-                if (folder.Parent.Name == string.Empty)
-                {
-                    folder.SetParent(this);
-                }
-
                 var parents = grouping.Where(
                         item => ComponentTypes.Contains(item.DeclarationType) &&
                             item.CustomFolder.Replace("\"", string.Empty) == folder.FullPath)

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -244,6 +244,23 @@ public ObservableCollection<CodeExplorerItemViewModel> Projects
             }
         }
 
+        private Declaration FindNewProjectDeclaration(string id)
+        {
+            return _state.AllUserDeclarations.SingleOrDefault(item =>
+                        item.ProjectId == id &&
+                        item.DeclarationType == DeclarationType.Project);
+        }
+
+        private Declaration FindNewDeclaration(Declaration declaration)
+        {
+            return _state.AllUserDeclarations.SingleOrDefault(item =>
+                        item.ProjectId == declaration.ProjectId &&
+                        item.ComponentName == declaration.ComponentName &&
+                        item.ParentScope == declaration.ParentScope &&
+                        item.IdentifierName == declaration.IdentifierName &&
+                        item.DeclarationType == declaration.DeclarationType);
+        }
+
         private void ParserState_StateChanged(object sender, ParserStateEventArgs e)
         {
             if (Projects == null)
@@ -274,7 +291,7 @@ private void ParserState_StateChanged(object sender, ParserStateEventArgs e)
                     grouping)).ToList();
 
             UpdateNodes(Projects, newProjects);
-
+            
             Projects = new ObservableCollection<CodeExplorerItemViewModel>(newProjects);
         }
 
@@ -303,6 +320,7 @@ private void UpdateNodes(IEnumerable<CodeExplorerItemViewModel> oldList,
                 if (oldItem != null)
                 {
                     item.IsExpanded = oldItem.IsExpanded;
+                    item.IsSelected = oldItem.IsSelected;
 
                     if (oldItem.Items.Any() && item.Items.Any())
                     {

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -271,6 +271,7 @@
                TargetType="{x:Type TreeViewItem}">
             <Setter Property="BorderThickness" Value="1.5"/>
             <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
+            <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
             <Setter Property="HorizontalAlignment" Value="Left" />
             <EventSetter Event="PreviewMouseRightButtonDown" Handler="OnPreviewMouseRightButtonDown" />
             <Style.Triggers>