Merge pull request #644 from rossknudsen/refactor

Tidied up App class instantiation of fields.

Author: rubberduck203

RetailCoder.VBE/App.cs

@@ -30,6 +30,8 @@ public class App : IDisposable
         private RubberduckMenu _menu;
         private FormContextMenu _formContextMenu;
         private CodeInspectionsToolbar _codeInspectionsToolbar;
+        private bool displayToolbar = false;
+        private Point toolbarCoords = new Point(-1, -1);
 
         public App(VBE vbe, AddIn addIn)
         {
@@ -42,11 +44,19 @@ public App(VBE vbe, AddIn addIn)
             _editor = new ActiveCodePaneEditor(vbe);
 
             LoadConfig();
+
+            CleanUp();
+
+            Setup();
         }
 
         private void _configService_SettingsChanged(object sender, EventArgs e)
         {
             LoadConfig();
+
+            CleanUp();
+
+            Setup();
         }
 
         private void LoadConfig()
@@ -64,48 +74,15 @@ private void LoadConfig()
                 _config.UserSettings.LanguageSetting.Code = currentCulture.Name;
                 _configService.SaveConfiguration(_config);
             }
+        }
 
-            if (_menu != null)
-            {
-                _menu.Dispose();
-            }
-            
-            if (_formContextMenu != null)
-            {
-                _formContextMenu.Dispose();
-            }
-
-            var displayToolbar = false;
-            var toolbarCoords = new Point(-1, -1);
-            if (_codeInspectionsToolbar != null)
-            {
-                displayToolbar = _codeInspectionsToolbar.ToolbarVisible;
-                toolbarCoords = _codeInspectionsToolbar.ToolbarCoords;
-                _codeInspectionsToolbar.Dispose();
-            }
-
-            if (_inspector != null)
-            {
-                _inspector.Dispose();
-            }
-
-            if (_parserErrorsPresenter != null)
-            {
-                _parserErrorsPresenter.Dispose();
-            }
-
-            if (_parser != null)
-            {
-                _parser.ParseStarted -= _parser_ParseStarted;
-                _parser.ParserError -= _parser_ParserError;
-            }
+        private void Setup()
+        {
             _parser = new RubberduckParser();
             _parser.ParseStarted += _parser_ParseStarted;
             _parser.ParserError += _parser_ParserError;
 
-            _inspections = _configService.GetImplementedCodeInspections();
-            _inspector = new Inspector(_parser, _inspections);
-            EnableCodeInspections(_config);
+            _inspector = new Inspector(_parser, _configService);
 
             _parserErrorsPresenter = new ParserErrorsPresenter(_vbe, _addIn);
 
@@ -136,20 +113,6 @@ private void _parser_ParserError(object sender, ParseErrorEventArgs e)
             _parserErrorsPresenter.Show();
         }
 
-        private void EnableCodeInspections(Configuration config)
-        {
-            foreach (var inspection in _inspections)
-            {           
-                foreach (var setting in config.UserSettings.CodeInspectionSettings.CodeInspections)
-                {
-                    if (inspection.Description == setting.Description)
-                    {
-                        inspection.Severity = setting.Severity;
-                    }
-                } 
-            }
-        }
-
         public void Dispose()
         {
             Dispose(true);
@@ -159,6 +122,11 @@ protected virtual void Dispose(bool disposing)
         {
             if (!disposing) { return; }
 
+            CleanUp();
+        }
+
+        private void CleanUp()
+        {
             if (_menu != null)
             {
                 _menu.Dispose();
@@ -171,6 +139,8 @@ protected virtual void Dispose(bool disposing)
 
             if (_codeInspectionsToolbar != null)
             {
+                displayToolbar = _codeInspectionsToolbar.ToolbarVisible;
+                toolbarCoords = _codeInspectionsToolbar.ToolbarCoords;
                 _codeInspectionsToolbar.Dispose();
             }
 
@@ -183,6 +153,12 @@ protected virtual void Dispose(bool disposing)
             {
                 _parserErrorsPresenter.Dispose();
             }
+
+            if (_parser != null)
+            {
+                _parser.ParseStarted -= _parser_ParseStarted;
+                _parser.ParserError -= _parser_ParserError;
+            }
         }
     }
 }

RetailCoder.VBE/Inspections/Inspector.cs

@@ -6,21 +6,47 @@
 using System.Threading.Tasks;
 using Microsoft.Vbe.Interop;
 using Rubberduck.Parsing;
+using Rubberduck.Settings;
 
 namespace Rubberduck.Inspections
 {
     public class Inspector : IInspector, IDisposable
     {
         private readonly IRubberduckParser _parser;
+        private readonly IGeneralConfigService _configService;
         private readonly IList<IInspection> _inspections;
 
-        public Inspector(IRubberduckParser parser, IEnumerable<IInspection> inspections)
+        public Inspector(IRubberduckParser parser, IGeneralConfigService configService)
         {
             _parser = parser;
             _parser.ParseStarted += _parser_ParseStarted;
             _parser.ParseCompleted += _parser_ParseCompleted;
 
-            _inspections = inspections.ToList();
+            _configService = configService;
+            _inspections = configService.GetImplementedCodeInspections();
+            configService.SettingsChanged += ConfigServiceSettingsChanged;
+            UpdateInspectionSeverity();
+        }
+
+        private void ConfigServiceSettingsChanged(object sender, EventArgs e)
+        {
+            UpdateInspectionSeverity();
+        }
+
+        private void UpdateInspectionSeverity()
+        {
+            var config = _configService.LoadConfiguration();
+
+            foreach (var inspection in _inspections)
+            {
+                foreach (var setting in config.UserSettings.CodeInspectionSettings.CodeInspections)
+                {
+                    if (inspection.Description == setting.Description)
+                    {
+                        inspection.Severity = setting.Severity;
+                    }
+                }
+            }
         }
 
         private void _parser_ParseCompleted(object sender, ParseCompletedEventArgs e)
@@ -139,6 +165,11 @@ protected virtual void Dispose(bool disposing)
             if (!disposing) { return; }
             _parser.ParseStarted -= _parser_ParseStarted;
             _parser.ParseCompleted -= _parser_ParseCompleted;
+
+            if (_configService != null)
+            {
+                _configService.SettingsChanged -= ConfigServiceSettingsChanged;
+            }
         }
     }
 }