Merge pull request #1834 from Hosch250/Issue1826

Close #1826

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -79,7 +79,6 @@ public App(VBE vbe, IMessageBox messageBox,
 
             _hooks.MessageReceived += _hooks_MessageReceived;
             _configService.SettingsChanged += _configService_SettingsChanged;
-            _configService.LanguageChanged += ConfigServiceLanguageChanged;
             _parser.State.StateChanged += Parser_StateChanged;
             _parser.State.StatusMessageUpdate += State_StatusMessageUpdate;
             _stateBar.Refresh += _stateBar_Refresh;
@@ -156,13 +155,18 @@ private bool ShouldEvaluateCanExecute(Declaration selectedDeclaration, ParserSta
                    (selectedDeclaration == null && _lastSelectedDeclaration != null);
         }
 
-        private void _configService_SettingsChanged(object sender, EventArgs e)
+        private void _configService_SettingsChanged(object sender, ConfigurationChangedEventArgs e)
         {
             _config = _configService.LoadConfiguration();
             _hooks.HookHotkeys();
             // also updates the ShortcutKey text
             _appMenus.Localize();
             UpdateLoggingLevel();
+
+            if (e.LanguageChanged)
+            {
+                LoadConfig();
+            }
         }
 
         private void UpdateLoggingLevel()
@@ -172,7 +176,7 @@ private void UpdateLoggingLevel()
 
         public void Startup()
         {
-            CleanReloadConfig();
+            LoadConfig();
             _appMenus.Initialize();
             _hooks.HookHotkeys(); // need to hook hotkeys before we localize menus, to correctly display ShortcutTexts
             _appMenus.Localize();
@@ -417,16 +421,6 @@ private void Parser_StateChanged(object sender, EventArgs e)
             _appMenus.EvaluateCanExecute(_parser.State);
         }
 
-        private void CleanReloadConfig()
-        {
-            LoadConfig();
-        }
-
-        private void ConfigServiceLanguageChanged(object sender, EventArgs e)
-        {
-            CleanReloadConfig();
-        }
-
         private void LoadConfig()
         {
             _logger.Debug("Loading configuration");
@@ -488,7 +482,6 @@ public void Dispose()
             if (_configService != null)
             {
                 _configService.SettingsChanged -= _configService_SettingsChanged;
-                _configService.LanguageChanged -= ConfigServiceLanguageChanged;
                 _configService = null;
             }
 

RetailCoder.VBE/AutoSave/AutoSave.cs

@@ -69,7 +69,7 @@ private void Dispose(bool disposing)
 
             if (_configService != null)
             {
-                _configService.LanguageChanged -= ConfigServiceSettingsChanged;
+                _configService.SettingsChanged -= ConfigServiceSettingsChanged;
             }
 
             if (_timer != null)

RetailCoder.VBE/Inspections/Inspector.cs

@@ -24,7 +24,7 @@ public Inspector(IGeneralConfigService configService, IEnumerable<IInspection> i
                 _inspections = inspections;
 
                 _configService = configService;
-                configService.LanguageChanged += ConfigServiceLanguageChanged;
+                configService.SettingsChanged += ConfigServiceLanguageChanged;
             }
 
             private void ConfigServiceLanguageChanged(object sender, EventArgs e)
@@ -121,7 +121,7 @@ public void Dispose()
             {
                 if (_configService != null)
                 {
-                    _configService.LanguageChanged -= ConfigServiceLanguageChanged;
+                    _configService.SettingsChanged -= ConfigServiceLanguageChanged;
                 }
             }
         }

RetailCoder.VBE/Settings/ConfigurationLoader.cs

@@ -6,6 +6,18 @@
 
 namespace Rubberduck.Settings
 {
+    public class ConfigurationChangedEventArgs : EventArgs
+    {
+        public bool LanguageChanged { get; private set; }
+        public bool InspectionSettingsChanged { get; private set; }
+
+        public ConfigurationChangedEventArgs(bool languageChanged, bool inspectionSettingsChanged)
+        {
+            LanguageChanged = languageChanged;
+            InspectionSettingsChanged = inspectionSettingsChanged;
+        }
+    }
+
     public interface IGeneralConfigService : IConfigurationService<Configuration>
     {
         Configuration GetDefaultConfiguration();
@@ -88,42 +100,25 @@ public Configuration GetDefaultConfiguration()
                 )
             };
         }
-
-
+        
         public void SaveConfiguration(Configuration toSerialize)
         {
+            var langChanged = _generalProvider.Create().Language.Code != toSerialize.UserSettings.GeneralSettings.Language.Code;
+            var oldInspectionSettings = _inspectionProvider.Create(_inspections).CodeInspections.Select(s => Tuple.Create(s.Name, s.Severity));
+            var newInspectionSettings = toSerialize.UserSettings.CodeInspectionSettings.CodeInspections.Select(s => Tuple.Create(s.Name, s.Severity));
+
             _generalProvider.Save(toSerialize.UserSettings.GeneralSettings);
             _hotkeyProvider.Save(toSerialize.UserSettings.HotkeySettings);
             _todoProvider.Save(toSerialize.UserSettings.ToDoListSettings);
             _inspectionProvider.Save(toSerialize.UserSettings.CodeInspectionSettings);
             _unitTestProvider.Save(toSerialize.UserSettings.UnitTestSettings);
             _indenterProvider.Save(toSerialize.UserSettings.IndenterSettings);
-        }
-
-        public void SaveConfiguration(Configuration toSerialize, bool languageChanged)
-        {
-            SaveConfiguration(toSerialize);
-
-            if (languageChanged)
-            {
-                OnLanguageChanged(EventArgs.Empty);
-            }
-
-            OnSettingsChanged(EventArgs.Empty);
-        }
 
-        public event EventHandler LanguageChanged;
-        protected virtual void OnLanguageChanged(EventArgs e)
-        {
-            var handler = LanguageChanged;
-            if (handler != null)
-            {
-                handler(this, e);
-            }
+            OnSettingsChanged(new ConfigurationChangedEventArgs(langChanged, !oldInspectionSettings.SequenceEqual(newInspectionSettings)));
         }
 
-        public event EventHandler SettingsChanged;
-        protected virtual void OnSettingsChanged(EventArgs e)
+        public event EventHandler<ConfigurationChangedEventArgs> SettingsChanged;
+        protected virtual void OnSettingsChanged(ConfigurationChangedEventArgs e)
         {
             var handler = SettingsChanged;
             if (handler != null)

RetailCoder.VBE/Settings/GeneralConfigProvider.cs

@@ -9,9 +9,6 @@ public interface IGeneralConfigProvider
         GeneralSettings CreateDefaults();
 
         void Save(GeneralSettings settings);
-
-        event EventHandler LanguageChanged;
-        event EventHandler AutoSaveSettingsChanged;
     }
 
     public class GeneralConfigProvider : IGeneralConfigProvider

RetailCoder.VBE/Settings/IConfigurationService.cs

@@ -6,8 +6,6 @@ public interface IConfigurationService<T>
     {
         T LoadConfiguration();
         void SaveConfiguration(T toSerialize);
-        void SaveConfiguration(T toSerialize, bool languageChanged);
-        event EventHandler LanguageChanged;
-        event EventHandler SettingsChanged;
+        event EventHandler<ConfigurationChangedEventArgs> SettingsChanged;
     }
 }

RetailCoder.VBE/UI/Inspections/InspectionResultsViewModel.cs

@@ -42,14 +42,16 @@ public InspectionResultsViewModel(RubberduckParserState state, IInspector inspec
             _clipboard = clipboard;
             _configService = configService;
             _operatingSystem = operatingSystem;
-            _refreshCommand = new DelegateCommand(async param => await Task.Run(() => ExecuteRefreshCommandAsync(param)), CanExecuteRefreshCommand);
+            _refreshCommand = new DelegateCommand(async param => await Task.Run(() => ExecuteRefreshCommandAsync()), CanExecuteRefreshCommand);
             _disableInspectionCommand = new DelegateCommand(ExecuteDisableInspectionCommand);
             _quickFixCommand = new DelegateCommand(ExecuteQuickFixCommand, CanExecuteQuickFixCommand);
             _quickFixInModuleCommand = new DelegateCommand(ExecuteQuickFixInModuleCommand);
             _quickFixInProjectCommand = new DelegateCommand(ExecuteQuickFixInProjectCommand);
             _copyResultsCommand = new DelegateCommand(ExecuteCopyResultsCommand, CanExecuteCopyResultsCommand);
             _openSettingsCommand = new DelegateCommand(OpenSettings);
 
+            _configService.SettingsChanged += _configService_SettingsChanged;
+
             _setInspectionTypeGroupingCommand = new DelegateCommand(param =>
             {
                 GroupByInspectionType = (bool)param;
@@ -65,6 +67,14 @@ public InspectionResultsViewModel(RubberduckParserState state, IInspector inspec
             _state.StateChanged += _state_StateChanged;
         }
 
+        private void _configService_SettingsChanged(object sender, ConfigurationChangedEventArgs e)
+        {
+            if (e.InspectionSettingsChanged)
+            {
+                RefreshInspections();
+            }
+        }
+
         private ObservableCollection<ICodeInspectionResult> _results = new ObservableCollection<ICodeInspectionResult>();
         public ObservableCollection<ICodeInspectionResult> Results
         {
@@ -219,7 +229,7 @@ private set
         private bool _isBusy;
         public bool IsBusy { get { return _isBusy; } set { _isBusy = value; OnPropertyChanged(); } }
 
-        private async void ExecuteRefreshCommandAsync(object parameter)
+        private async void ExecuteRefreshCommandAsync()
         {
             CanRefresh = _vbe.HostApplication() != null && _state.IsDirty();
             if (!CanRefresh)
@@ -239,7 +249,7 @@ private bool CanExecuteRefreshCommand(object parameter)
             return !IsBusy && _state.IsDirty();
         }
 
-        private async void _state_StateChanged(object sender, EventArgs e)
+        private void _state_StateChanged(object sender, EventArgs e)
         {
             _logger.Debug("InspectionResultsViewModel handles StateChanged...");
             if (_state.Status != ParserState.Ready)
@@ -248,6 +258,11 @@ private async void _state_StateChanged(object sender, EventArgs e)
                 return;
             }
 
+            RefreshInspections();
+        }
+
+        private async void RefreshInspections()
+        {
             _logger.Debug("Running code inspections...");
             IsBusy = true;
 
@@ -301,7 +316,7 @@ private void ExecuteQuickFixes(IEnumerable<CodeInspectionQuickFix> quickFixes)
             // refresh if any quickfix has completed without cancelling:
             if (completed != 0 && cancelled < completed)
             {
-                Task.Run(() => ExecuteRefreshCommandAsync(null));
+                Task.Run(() => ExecuteRefreshCommandAsync());
             }
         }
 
@@ -370,7 +385,7 @@ private void ExecuteDisableInspectionCommand(object parameter)
             var setting = config.UserSettings.CodeInspectionSettings.CodeInspections.Single(e => e.Name == _selectedInspection.Name);
             setting.Severity = CodeInspectionSeverity.DoNotShow;
 
-            Task.Run(() => _configService.SaveConfiguration(config)).ContinueWith(t => ExecuteRefreshCommandAsync(null));
+            Task.Run(() => _configService.SaveConfiguration(config)).ContinueWith(t => ExecuteRefreshCommandAsync());
         }
 
         private bool _canDisableInspection;
@@ -441,6 +456,11 @@ public void Dispose()
             {
                 _state.StateChanged -= _state_StateChanged;
             }
+
+            if (_configService != null)
+            {
+                _configService.SettingsChanged -= _configService_SettingsChanged;
+            }
         }
     }
 }

RetailCoder.VBE/UI/Settings/SettingsControlViewModel.cs

@@ -76,7 +76,7 @@ private void SaveConfig()
                 vm.UpdateConfig(_config);
             }
 
-            _configService.SaveConfiguration(_config, _config.UserSettings.GeneralSettings.Language.Code != oldLangCode);
+            _configService.SaveConfiguration(_config);
         }
 
         private void CloseWindow()