Add filtering for inspection severities

Author: IvenBach

Rubberduck.Core/UI/Settings/GeneralSettings.xaml

@@ -113,11 +113,11 @@
                     </Label>
                     <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_LanguageLabel}" FontWeight="SemiBold" />
                     <ComboBox Width="210"
-                      HorizontalAlignment="Left"
-                      Margin="5"
-                      SelectedItem="{Binding SelectedLanguage, Mode=TwoWay}"
-                      ItemsSource="{Binding Languages, UpdateSourceTrigger=PropertyChanged}"
-                      DisplayMemberPath="Name" />
+                              HorizontalAlignment="Left"
+                              Margin="5"
+                              SelectedItem="{Binding SelectedLanguage, Mode=TwoWay}"
+                              ItemsSource="{Binding Languages, UpdateSourceTrigger=PropertyChanged}"
+                              DisplayMemberPath="Name" />
 
                     <CheckBox Margin="5,0,0,5" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_ShowSplash}"
                               IsChecked="{Binding ShowSplashAtStartup}" />
@@ -131,11 +131,11 @@
                     <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_MinimumLogLevelLabel}" FontWeight="SemiBold" />
                     <StackPanel Orientation="Horizontal">
                         <ComboBox Width="210"
-                      HorizontalAlignment="Left"
-                      Margin="5"
-                      SelectedItem="{Binding SelectedLogLevel, Mode=TwoWay}"
-                      ItemsSource="{Binding LogLevels, UpdateSourceTrigger=PropertyChanged}"
-                      DisplayMemberPath="Name"/>
+                                  HorizontalAlignment="Left"
+                                  Margin="5"
+                                  SelectedItem="{Binding SelectedLogLevel, Mode=TwoWay}"
+                                  ItemsSource="{Binding LogLevels, UpdateSourceTrigger=PropertyChanged}"
+                                  DisplayMemberPath="Name"/>
                         <Button 
                             Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_ShowLogFolder}"
                             Padding="5"

Rubberduck.Core/UI/Settings/InspectionSettings.xaml

@@ -276,8 +276,7 @@
                     <DockPanel FlowDirection="LeftToRight">
                         <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
                             <Label Style="{StaticResource HeaderText}"
-                                Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionSettings_InspectionSeveritySettingsLabel}">
-                            </Label>
+                                Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionSettings_InspectionSeveritySettingsLabel}" />
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
                                 <Label Content="-"/>
                                 <Label Style="{StaticResource HeaderText}"
@@ -287,15 +286,10 @@
                                          HorizontalAlignment="Stretch" />
                                 <Border Width="10" />
                                 <Label Style="{StaticResource HeaderText}"
-                                               Content="Severity:" />
-                                <CheckBox IsChecked="{Binding AreInspectionsFilteredBySeverity, UpdateSourceTrigger=PropertyChanged}" />
-                                <StackPanel Orientation="Horizontal">
-                                    <ComboBox Width="100"
-                                              IsEnabled="{Binding AreInspectionsFilteredBySeverity}"
-                                              ItemsSource="{Binding InspectionSettingsSeverityFilter}">
-                                        <!--, UpdateSourceTrigger=PropertyChanged-->
-                                    </ComboBox>
-                                </StackPanel>
+                                       Content="Severity:" />
+                                <ComboBox Width="100"
+                                          ItemsSource="{Binding SeverityFilters, UpdateSourceTrigger=PropertyChanged}"
+                                          SelectedItem="{Binding SelectedSeverityFilter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                             </StackPanel>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" HorizontalAlignment="Left"

Rubberduck.Core/UI/Settings/InspectionSettingsViewModel.cs

@@ -7,6 +7,9 @@
 using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
 using Rubberduck.UI.Command;
+using Rubberduck.Resources.Inspections;
+using System.Globalization;
+using System;
 using Rubberduck.Resources;
 
 namespace Rubberduck.UI.Settings
@@ -29,6 +32,10 @@ public InspectionSettingsViewModel(Configuration config)
             InspectionSettings.GroupDescriptions?.Add(new PropertyGroupDescription("TypeLabel"));
             ExportButtonCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), _ => ExportSettings());
             ImportButtonCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), _ => ImportSettings());
+
+            SeverityFilters = new ObservableCollection<string>(
+                new[] { InspectionsUI.ResourceManager.GetString("CodeInspectionSeverity_All", CultureInfo.CurrentUICulture) }
+                    .Concat(Enum.GetNames(typeof(CodeInspectionSeverity)).Select(s => InspectionsUI.ResourceManager.GetString("CodeInspectionSeverity_" + s, CultureInfo.CurrentUICulture))));
         }
 
         public void UpdateCollection(CodeInspectionSeverity severity)
@@ -43,7 +50,7 @@ public void UpdateCollection(CodeInspectionSeverity severity)
             InspectionSettings.CommitEdit();
         }
 
-        private string _inspectionSettingsDescriptionFilter;
+        private string _inspectionSettingsDescriptionFilter = string.Empty;
         public string InspectionSettingsDescriptionFilter
         {
             get => _inspectionSettingsDescriptionFilter;
@@ -52,54 +59,39 @@ public string InspectionSettingsDescriptionFilter
                 if (_inspectionSettingsDescriptionFilter != value)
                 {
                     _inspectionSettingsDescriptionFilter = value;
-                    OnPropertyChanged(nameof(InspectionSettings));
-
-                    if (string.IsNullOrEmpty(value))
-                    {
-                        InspectionSettings.Filter = null;
-                    }
-                    else
-                    {
-                        InspectionSettings.Filter = item => (item as CodeInspectionSetting)?
-                            .Description.ToUpper()
-                            .Contains(value.ToUpper()) ?? true;
-                    }
+                    InspectionSettings.Filter = item => FilterResults(item);
                 }
             }
         }
 
-        private bool _areInspectionsFilteredBySeverity;
-        public bool AreInspectionsFilteredBySeverity
+        public ObservableCollection<string> SeverityFilters { get; }
+
+        static private readonly string _allResultsFilter = InspectionsUI.ResourceManager.GetString("CodeInspectionSeverity_All", CultureInfo.CurrentUICulture);
+        private string _selectedSeverityFilter = _allResultsFilter;
+        public string SelectedSeverityFilter
         {
-            get => _areInspectionsFilteredBySeverity;
+            get => _selectedSeverityFilter;
             set
             {
-                if (_areInspectionsFilteredBySeverity != value)
+                if (!_selectedSeverityFilter.Equals(value))
                 {
-                    _areInspectionsFilteredBySeverity = value;
+                    _selectedSeverityFilter = value.Replace(" ", string.Empty);
                     OnPropertyChanged();
+                    InspectionSettings.Filter = item => FilterResults(item);
                 }
             }
-        }
+        }        
 
-        private CodeInspectionSeverity _appliedSeverityFilter;
-        private List<CodeInspectionSeverity> _inspectionSettingsSeverityFilters = new List<CodeInspectionSeverity> { CodeInspectionSeverity.DoNotShow, CodeInspectionSeverity.Error, CodeInspectionSeverity.Warning, CodeInspectionSeverity.Suggestion, CodeInspectionSeverity.Hint };
-        public List<CodeInspectionSeverity> InspectionSettingsSeverityFilters
+        private bool FilterResults(object setting)
         {
-            get => _inspectionSettingsSeverityFilters;
-            set
-            {
-                
-                if (_inspectionSettingsSeverityFilters.Contains(value))
-                {
-                    _inspectionSettingsSeverityFilters = value;
-
-                    AreInspectionsFilteredBySeverity = true;
+            OnPropertyChanged(nameof(InspectionSettings));
+            var cis = setting as CodeInspectionSetting;
 
-                    OnPropertyChanged(nameof(InspectionSettings));
-                }
-            }
-        }        
+            return cis.Description.ToUpper().Contains(_inspectionSettingsDescriptionFilter.ToUpper())
+                && _selectedSeverityFilter == _allResultsFilter 
+                    ? true
+                    : cis.Severity.ToString() == _selectedSeverityFilter;
+        }
 
         private ListCollectionView _inspectionSettings;
         public ListCollectionView InspectionSettings

Rubberduck.Resources/Inspections/InspectionsUI.Designer.cs

@@ -187,4 +187,7 @@
   <data name="information_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\icons\fugue\information-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="CodeInspectionSeverity_All" xml:space="preserve">
+    <value>All</value>
+  </data>
 </root>