merge next

Author: comintern

.github/ISSUE_TEMPLATE/bug_report.md

@@ -33,7 +33,7 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Logfile**
-Rubberduck generates extensive logging in TRACE-Level. If no log was created at `%APP_DATA%\Rubberduck\Logs`, check your settings. Include this Log for bugreports about the behavior of Rubbberduck
+Rubberduck generates extensive logging in TRACE-Level. If no log was created at `%APPDATA%\Rubberduck\Logs`, check your settings. Include this Log for bugreports about the behavior of Rubbberduck
 
 **Additional context**
 Add any other context about the problem here.

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/Command/ReparseCommand.cs

@@ -15,6 +15,12 @@
 
 namespace Rubberduck.UI.Command
 {
+    [ComVisible(false)]
+    public class ReparseCancellationFlag
+    {
+        public bool Canceled { get;  set; }
+    }
+
     [ComVisible(false)]
     public class ReparseCommand : CommandBase
     {
@@ -58,13 +64,21 @@ protected override void OnExecute(object parameter)
             {
                 if (!VerifyCompileOnDemand())
                 {
+                    if (parameter is ReparseCancellationFlag cancellation)
+                    {
+                        cancellation.Canceled = true;
+                    }
                     return;
                 }
 
                 if (AreAllProjectsCompiled(out var failedNames))
                 {
                     if (!PromptUserToContinue(failedNames))
                     {
+                        if (parameter is ReparseCancellationFlag cancellation)
+                        {
+                            cancellation.Canceled = true;
+                        }
                         return;
                     }
                 }

Rubberduck.Core/UI/Controls/GroupItemExpandedBehavior.cs

@@ -0,0 +1,35 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Interactivity;
+using GongSolutions.Wpf.DragDrop.Utilities;
+
+namespace Rubberduck.UI.Controls
+{
+    public class GroupItemExpandedBehavior : Behavior<DataGrid>
+    {
+        public object ExpandedState
+        {
+            get => GetValue(ExpandedStateProperty);
+            set => SetValue(ExpandedStateProperty, value);
+        }
+
+        public static readonly DependencyProperty ExpandedStateProperty =
+            DependencyProperty.Register("ExpandedState", typeof(object), typeof(GroupItemExpandedBehavior), new UIPropertyMetadata(null, OnExpandedStateChanged));
+
+        private static void OnExpandedStateChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (!(sender is GroupItemExpandedBehavior data) ||
+                !(data.AssociatedObject is DataGrid grid) ||
+                !grid.IsGrouping ||
+                !(e.NewValue is bool))
+            {
+                return;
+            }
+
+            foreach (var expander in grid.GetVisualDescendents<Expander>())
+            {
+                expander.IsExpanded = (bool)e.NewValue;
+            }
+        }
+    }
+}

Rubberduck.Core/UI/Controls/GroupingGrid.xaml

@@ -60,7 +60,7 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate>
-                        <Expander Background="WhiteSmoke" Foreground="Black" FontWeight="SemiBold" IsExpanded="True">
+                        <Expander Background="WhiteSmoke" Foreground="Black" FontWeight="SemiBold">
                             <Expander.Header>
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock Margin="4" 
@@ -107,7 +107,6 @@
             <Setter Property="HorizontalScrollBarVisibility" Value="Disabled" />
             <Setter Property="ItemContainerStyle" Value="{StaticResource PrettifyRow}" />
             <Setter Property="ColumnHeaderHeight" Value="22" />
-            <Setter Property="SelectionMode" Value="Single" />
         </Style>
     </DataGrid.Style>
     <DataGrid.CellStyle>
@@ -116,7 +115,16 @@
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="Padding" Value="0" />
             <Setter Property="VerticalContentAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type DataGridCell}">
+                        <Grid Background="{TemplateBinding Background}">
+                            <ContentPresenter VerticalAlignment="Center" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
         </Style>
     </DataGrid.CellStyle>
 </DataGrid>

Rubberduck.Core/UI/Controls/GroupingGrid.xaml.cs

@@ -7,7 +7,7 @@ namespace Rubberduck.UI.Controls
     public partial class GroupingGrid
     {
         public static readonly DependencyProperty ShowGroupingItemCountProperty =
-            DependencyProperty.Register("ShowGroupingItemCount", typeof (bool), typeof (GroupingGrid));
+            DependencyProperty.Register("ShowGroupingItemCount", typeof (bool), typeof(GroupingGrid));
 
         public bool ShowGroupingItemCount
         {