Merge pull request #1730 from Hosch250/Issue1618

Correctly sort inspection results

Author: retailcoder

RetailCoder.VBE/UI/Inspections/InspectionResultsControl.xaml

@@ -264,27 +264,14 @@
             <Setter Property="Width" Value="16" />
             <Setter Property="Margin" Value="4" />
         </Style>
-        
+
         <CollectionViewSource x:Key="ResultsByInspectionType" Source="{Binding Results}">
-            <CollectionViewSource.SortDescriptions>
-                <componentModel:SortDescription PropertyName="Inspection.InspectionType"/>
-                <componentModel:SortDescription PropertyName="Inspection.Name"/>
-                <componentModel:SortDescription PropertyName="QualifiedSelection.QualifiedName.Name"/>
-                <componentModel:SortDescription PropertyName="QualifiedSelection.Selection.StartLine"/>
-                <componentModel:SortDescription PropertyName="QualifiedSelection.Selection.StartColumn"/>
-            </CollectionViewSource.SortDescriptions>
             <CollectionViewSource.GroupDescriptions>
                 <PropertyGroupDescription PropertyName="Inspection" Converter="{StaticResource InspectionTypeConverter}" />
             </CollectionViewSource.GroupDescriptions>
         </CollectionViewSource>
 
         <CollectionViewSource x:Key="ResultsByModule" Source="{Binding Results}">
-            <CollectionViewSource.SortDescriptions>
-                <componentModel:SortDescription PropertyName="QualifiedSelection.QualifiedName.Name"/>
-                <componentModel:SortDescription PropertyName="Inspection.Name"/>
-                <componentModel:SortDescription PropertyName="QualifiedSelection.Selection.StartLine"/>
-                <componentModel:SortDescription PropertyName="QualifiedSelection.Selection.StartColumn"/>
-            </CollectionViewSource.SortDescriptions>
             <CollectionViewSource.GroupDescriptions>
                 <PropertyGroupDescription PropertyName="QualifiedSelection.QualifiedName" />
             </CollectionViewSource.GroupDescriptions>

RetailCoder.VBE/UI/Inspections/InspectionResultsControl.xaml.cs

@@ -1,27 +1,15 @@
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Rubberduck.UI.Inspections
+namespace Rubberduck.UI.Inspections
 {
     /// <summary>
     /// Interaction logic for InspectionResultsControl.xaml
     /// </summary>
-    public partial class InspectionResultsControl : UserControl
+    public partial class InspectionResultsControl
     {
         private InspectionResultsViewModel ViewModel { get { return DataContext as InspectionResultsViewModel; } }
 
         public InspectionResultsControl()
         {
             InitializeComponent();
-            Loaded += InspectionResultsControl_Loaded;
-        }
-
-        private void InspectionResultsControl_Loaded(object sender, RoutedEventArgs e)
-        {
-            if (ViewModel != null && ViewModel.CanRefresh)
-            {
-                //ViewModel.RefreshCommand.Execute(null);
-            }
         }
     }
 }

RetailCoder.VBE/UI/Inspections/InspectionResultsViewModel.cs

@@ -124,7 +124,18 @@ public bool GroupByInspectionType
             set
             {
                 if (_groupByInspectionType == value) { return; }
-                
+
+                if (value)
+                {
+                    Results = new ObservableCollection<ICodeInspectionResult>(
+                            Results.OrderBy(o => o.Inspection.InspectionType)
+                                .ThenBy(t => t.Inspection.Name)
+                                .ThenBy(t => t.QualifiedSelection.QualifiedName.Name)
+                                .ThenBy(t => t.QualifiedSelection.Selection.StartLine)
+                                .ThenBy(t => t.QualifiedSelection.Selection.StartColumn)
+                                .ToList());
+                }
+
                 _groupByInspectionType = value;
                 OnPropertyChanged();
             }
@@ -137,7 +148,17 @@ public bool GroupByLocation
             set
             {
                 if (_groupByLocation == value) { return; }
-                
+
+                if (value)
+                {
+                    Results = new ObservableCollection<ICodeInspectionResult>(
+                            Results.OrderBy(o => o.QualifiedSelection.QualifiedName.Name)
+                                .ThenBy(t => t.Inspection.Name)
+                                .ThenBy(t => t.QualifiedSelection.Selection.StartLine)
+                                .ThenBy(t => t.QualifiedSelection.Selection.StartColumn)
+                                .ToList());
+                }
+
                 _groupByLocation = value;
                 OnPropertyChanged();
             }
@@ -231,6 +252,23 @@ private async void _state_StateChanged(object sender, EventArgs e)
             IsBusy = true;
 
             var results = (await _inspector.FindIssuesAsync(_state, CancellationToken.None)).ToList();
+            if (GroupByInspectionType)
+            {
+                results = results.OrderBy(o => o.Inspection.InspectionType)
+                    .ThenBy(t => t.Inspection.Name)
+                    .ThenBy(t => t.QualifiedSelection.QualifiedName.Name)
+                    .ThenBy(t => t.QualifiedSelection.Selection.StartLine)
+                    .ThenBy(t => t.QualifiedSelection.Selection.StartColumn)
+                    .ToList();
+            }
+            else
+            {
+                results = results.OrderBy(o => o.QualifiedSelection.QualifiedName.Name)
+                    .ThenBy(t => t.Inspection.Name)
+                    .ThenBy(t => t.QualifiedSelection.Selection.StartLine)
+                    .ThenBy(t => t.QualifiedSelection.Selection.StartColumn)
+                    .ToList();
+            }
 
             UiDispatcher.Invoke(() =>
             {