Merge pull request #1737 from Hosch250/release

Make code inspection settings save updated severities

Author: retailcoder

RetailCoder.VBE/UI/Settings/InspectionSettings.xaml

@@ -90,7 +90,7 @@
                     <DataGridComboBoxColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SeverityLabelText}"
                                             Width="*"
                                             ItemsSource="{Binding Source={StaticResource Severities}, Converter={StaticResource CodeInspectionSeverityEnumToText}, UpdateSourceTrigger=PropertyChanged}"
-                                            SelectedItemBinding="{Binding Path=SeverityLabel, Mode=TwoWay}" />
+                                            SelectedItemBinding="{Binding Path=SeverityLabel}" />
                 </controls:GroupingGrid.Columns>
             </controls:GroupingGrid>
         </DockPanel>

RetailCoder.VBE/UI/Settings/InspectionSettings.xaml.cs

@@ -1,4 +1,11 @@
-using System.Windows.Controls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Controls;
+using Rubberduck.Inspections;
+using Rubberduck.Settings;
+using Rubberduck.UI.Controls;
+using Rubberduck.UI.Settings.Converters;
 
 namespace Rubberduck.UI.Settings
 {
@@ -22,8 +29,15 @@ public InspectionSettings(ISettingsViewModel vm) : this()
         private void GroupingGrid_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
         {
             if (e.Cancel || e.EditAction == DataGridEditAction.Cancel) { return; }
+            
+            var selectedSeverityName = ((ComboBox) e.EditingElement).SelectedItem.ToString();
 
-            ((InspectionSettingsViewModel) ViewModel).UpdateCollection();
+            var severities = Enum.GetValues(typeof(CodeInspectionSeverity)).Cast<CodeInspectionSeverity>();
+            var selectedSeverity = severities.Single(s => RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + s) == selectedSeverityName);
+
+            var changedSetting = (CodeInspectionSetting) e.Row.Item;
+
+            ((InspectionSettingsViewModel) ViewModel).UpdateCollection(changedSetting.Name, selectedSeverity);
         }
     }
 }

RetailCoder.VBE/UI/Settings/InspectionSettingsViewModel.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Data;
+using Rubberduck.Inspections;
 using Rubberduck.Settings;
 
 namespace Rubberduck.UI.Settings
@@ -18,9 +19,15 @@ public InspectionSettingsViewModel(Configuration config)
             }
         }
 
-        public void UpdateCollection()
+        public void UpdateCollection(string name, CodeInspectionSeverity severity)
         {
             InspectionSettings.CommitEdit();
+            var changedItem = _inspectionSettings.SourceCollection.Cast<CodeInspectionSetting>().First(f => f.Name == name);
+
+            InspectionSettings.Remove(changedItem);
+
+            changedItem.Severity = severity;
+            InspectionSettings.AddNewItem(changedItem);
         }
 
         private ListCollectionView _inspectionSettings;