Merge pull request #4765 from comintern/explorer

Code Explorer bug fixes.

Author: retailcoder

Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerItemComparer.cs

@@ -192,7 +192,9 @@ public override int Compare(ICodeExplorerNode x, ICodeExplorerNode y)
                 return 1;
             }
 
-            return SortOrder[first.Value].CompareTo(SortOrder[second.Value]);
+            var component = SortOrder[first.Value].CompareTo(SortOrder[second.Value]);
+
+            return component == 0 ? CodeExplorerItemComparer.Name.Compare(x, y) : component;
         }
     }
 

Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -214,6 +214,15 @@ public double? FontSize
             }
         }
 
+        // This is just a binding hack to force the icon binding to re-evaluate. It has no other functionality and should
+        // not be used for anything else.
+        public bool ParserReady
+        {
+            get => true;
+            // ReSharper disable once ValueParameterNotUsed
+            set => OnPropertyChanged();
+        }
+
         private void HandleStateChanged(object sender, ParserStateEventArgs e)
         {
             Unparsed = false;
@@ -232,6 +241,7 @@ private void HandleStateChanged(object sender, ParserStateEventArgs e)
 
                     Unparsed = !Projects.Any();
                     IsBusy = false;
+                    ParserReady = true;
                 });
                 return;
             }

Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -595,6 +595,7 @@
                                             <Binding RelativeSource="{RelativeSource Self}" Path="DataContext"/>
                                             <Binding Path="Declaration" />
                                             <Binding Path="IsExpanded" />
+                                            <Binding ElementName="CodeExplorer" Path="DataContext.ParserReady" />
                                         </MultiBinding.Bindings>
                                     </MultiBinding>
                                 </Image.Source>

Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml.cs

@@ -21,8 +21,8 @@ private void TreeView_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
             if (ViewModel != null && ViewModel.OpenCommand.CanExecute(ViewModel.SelectedItem))
             {
                 ViewModel.OpenCommand.Execute(ViewModel.SelectedItem);
+                e.Handled = true;
             }
-            e.Handled = true;
         }
 
         private void TreeView_OnMouseRightButtonDown(object sender, MouseButtonEventArgs e)

Rubberduck.Core/UI/CodeExplorer/Commands/RenameCommand.cs

@@ -31,6 +31,7 @@ public RenameCommand(IVBE vbe, RubberduckParserState state, IMessageBox msgBox,
             _state = state;
             _rewritingManager = rewritingManager;
             _msgBox = msgBox;
+            _factory = factory;
         }
 
         public override IEnumerable<Type> ApplicableNodeTypes => ApplicableNodes;

Rubberduck.Core/UI/Converters/CodeExplorerNodeToIconConverter.cs

@@ -92,7 +92,8 @@ public override object Convert(object value, Type targetType, object parameter,
                         return ExceptionIcon;
                     }
 
-                    if (component.Declaration is ClassModuleDeclaration classModule && classModule.IsInterface)
+                    if (component.Declaration is ClassModuleDeclaration classModule && 
+                        (classModule.IsInterface || classModule.Annotations.Any(annotation => annotation is InterfaceAnnotation)))
                     {
                         return InterfaceIcon;
                     }