Revert ninject commits per Mat's request.

Author: rubberduck203

RetailCoder.VBE/App.cs

@@ -20,11 +20,11 @@ public class App : IDisposable
         private readonly VBE _vbe;
         private readonly AddIn _addIn;
         private Inspector _inspector;
-        private IParserErrorsPresenter _parserErrorsPresenter;
-        private readonly IConfigurationLoader _configService = new ConfigurationLoader();
-        private readonly IActiveCodePaneEditor _editor;
+        private ParserErrorsPresenter _parserErrorsPresenter;
+        private readonly IGeneralConfigService _configService = new ConfigurationLoader();
+        private readonly ActiveCodePaneEditor _editor;
         private readonly IRubberduckCodePaneFactory _factory;
-        private readonly IRubberduckParser _parser;
+        private IRubberduckParser _parser;
 
         private Configuration _config;
         private RubberduckMenu _menu;
@@ -33,21 +33,16 @@ public class App : IDisposable
         private bool _displayToolbar = false;
         private Point _toolbarCoords = new Point(-1, -1);
 
-        public App(VBE vbe, AddIn addIn, IParserErrorsPresenter presenter, IRubberduckParser parser, IRubberduckCodePaneFactory factory, IActiveCodePaneEditor editor)
+        public App(VBE vbe, AddIn addIn)
         {
             _vbe = vbe;
             _addIn = addIn;
-            _factory = factory;
-            _parser = parser;
+            _factory = new RubberduckCodePaneFactory();
 
-            _parserErrorsPresenter = presenter;
+            _parserErrorsPresenter = new ParserErrorsPresenter(vbe, addIn);
             _configService.SettingsChanged += _configService_SettingsChanged;
 
-            // todo: figure out why Ninject can't seem to resolve the VBE dependency to ActiveCodePaneEditor if it's in the VBEDitor assembly.
-            // could it be that the VBE type in the two assemblies is actually different? 
-            // aren't the two assemblies using the exact same Microsoft.Vbe.Interop assemby?
-            
-            _editor = editor; // */ new ActiveCodePaneEditor(vbe, _factory);
+            _editor = new ActiveCodePaneEditor(vbe, _factory);
 
             LoadConfig();
 
@@ -84,7 +79,7 @@ private void LoadConfig()
 
         private void Setup()
         {
-            //_parser = new RubberduckParser(_factory);
+            _parser = new RubberduckParser(_factory);
             _parser.ParseStarted += _parser_ParseStarted;
             _parser.ParserError += _parser_ParserError;
 
@@ -155,6 +150,11 @@ private void CleanUp()
                 _inspector.Dispose();
             }
 
+            if (_parserErrorsPresenter != null)
+            {
+                _parserErrorsPresenter.Dispose();
+            }
+
             if (_parser != null)
             {
                 _parser.ParseStarted -= _parser_ParseStarted;

RetailCoder.VBE/Extension.cs

@@ -1,13 +1,11 @@
 using System;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using Extensibility;
 using Microsoft.Vbe.Interop;
-using Ninject;
-using Rubberduck.Root;
 using Rubberduck.UI;
+using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
 
 namespace Rubberduck
 {
@@ -22,7 +20,6 @@ public class _Extension : IDTExtensibility2, IDisposable
         private const string ProgId = "Rubberduck.Extension";
 
         private App _app;
-        private IKernel _kernel;
 
         public void OnAddInsUpdate(ref Array custom)
         {
@@ -36,23 +33,14 @@ public void OnConnection(object Application, ext_ConnectMode ConnectMode, object
         {
             try
             {
-                _kernel = new StandardKernel();
-                Compose((VBE) Application, (AddIn) AddInInst);
+                _app = new App((VBE)Application, (AddIn)AddInInst);
             }
             catch (Exception exception)
             {
                 MessageBox.Show(exception.Message, RubberduckUI.RubberduckLoadFailure, MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
-        private void Compose(VBE application, AddIn addin)
-        {
-            var conventions = new RubberduckConventions(_kernel);
-            conventions.Apply(application, addin);
-
-            _app = _kernel.Get<App>();
-        }
-
         public void OnStartupComplete(ref Array custom)
         {
 
@@ -70,9 +58,9 @@ public void Dispose()
 
         protected virtual void Dispose(bool disposing)
         {
-            if (disposing & _kernel != null)
+            if (disposing & _app != null)
             {
-                _kernel.Dispose();
+                _app.Dispose();
             }
         }
     }

RetailCoder.VBE/Inspections/Inspector.cs

@@ -13,10 +13,10 @@ namespace Rubberduck.Inspections
     public class Inspector : IInspector, IDisposable
     {
         private readonly IRubberduckParser _parser;
-        private readonly IConfigurationLoader _configService;
+        private readonly IGeneralConfigService _configService;
         private readonly IList<IInspection> _inspections;
 
-        public Inspector(IRubberduckParser parser, IConfigurationLoader configService)
+        public Inspector(IRubberduckParser parser, IGeneralConfigService configService)
         {
             _parser = parser;
             _parser.ParseStarted += _parser_ParseStarted;

RetailCoder.VBE/Root/RubberduckConventions.cs

@@ -214,9 +214,6 @@
       <HintPath>..\packages\Ninject.3.2.2.0\lib\net45-full\Ninject.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Ninject.Extensions.Conventions">
-      <HintPath>..\packages\Ninject.Extensions.Conventions.3.2.0.0\lib\net45-full\Ninject.Extensions.Conventions.dll</HintPath>
-    </Reference>
     <Reference Include="Office, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>
@@ -252,7 +249,6 @@
     <Compile Include="Refactorings\ReorderParameters\ReorderParametersPresenter.cs" />
     <Compile Include="Refactorings\ReorderParameters\ReorderParametersPresenterFactory.cs" />
     <Compile Include="Refactorings\ReorderParameters\ReorderParametersRefactoring.cs" />
-    <Compile Include="Root\RubberduckConventions.cs" />
     <Compile Include="Settings\DisplayLanguageSetting.cs" />
     <Compile Include="Settings\SourceControlConfiguration.cs" />
     <Compile Include="Settings\SourceControlConfigurationService.cs" />

RetailCoder.VBE/Rubberduck.csproj

@@ -11,15 +11,15 @@
 
 namespace Rubberduck.Settings
 {
-    public interface IConfigurationLoader : IConfigurationService<Configuration>
+    public interface IGeneralConfigService : IConfigurationService<Configuration>
     {
         CodeInspectionSetting[] GetDefaultCodeInspections();
         Configuration GetDefaultConfiguration();
         ToDoMarker[] GetDefaultTodoMarkers();
         IList<IInspection> GetImplementedCodeInspections();
     }
 
-    public class ConfigurationLoader : XmlConfigurationServiceBase<Configuration>, IConfigurationLoader
+    public class ConfigurationLoader : XmlConfigurationServiceBase<Configuration>, IGeneralConfigService
     {
         protected override string ConfigFile
         {

RetailCoder.VBE/Settings/ConfigurationLoader.cs

@@ -35,14 +35,7 @@ public override string ToString()
         }
     }
 
-    public interface IParserErrorsPresenter
-    {
-        void Show();
-        void Clear();
-        void AddError(ParseErrorEventArgs error);
-    }
-
-    public class ParserErrorsPresenter : DockablePresenterBase, IParserErrorsPresenter
+    public class ParserErrorsPresenter : DockablePresenterBase
     {
         public ParserErrorsPresenter(VBE vbe, AddIn addin) 
             : base(vbe, addin, new SimpleListControl(RubberduckUI.ParseErrors_Caption))

RetailCoder.VBE/UI/ParserErrors/ParserErrorsPresenter.cs

@@ -28,7 +28,7 @@ internal class RubberduckMenu : Menu
         private readonly CodeExplorerMenu _codeExplorerMenu;
         private readonly CodeInspectionsMenu _codeInspectionsMenu;
         private readonly RefactorMenu _refactorMenu;
-        private readonly IConfigurationLoader _configService;
+        private readonly IGeneralConfigService _configService;
         private readonly IRubberduckParser _parser;
         private readonly IActiveCodePaneEditor _editor;
         private readonly IRubberduckCodePaneFactory _factory;
@@ -40,7 +40,7 @@ internal class RubberduckMenu : Menu
 
         private ProjectExplorerContextMenu _projectExplorerContextMenu;
 
-        public RubberduckMenu(VBE vbe, AddIn addIn, IConfigurationLoader configService, IRubberduckParser parser, IActiveCodePaneEditor editor, IInspector inspector, IRubberduckCodePaneFactory factory)
+        public RubberduckMenu(VBE vbe, AddIn addIn, IGeneralConfigService configService, IRubberduckParser parser, IActiveCodePaneEditor editor, IInspector inspector, IRubberduckCodePaneFactory factory)
             : base(vbe, addIn)
         {
             _addIn = addIn;

RetailCoder.VBE/UI/RubberduckMenu.cs

@@ -6,6 +6,9 @@ namespace Rubberduck.UI.Settings
 {
     public partial class GeneralSettingsControl : UserControl
     {
+        private readonly IGeneralConfigService _configService;
+        private readonly DisplayLanguageSetting _currentLanguage;
+
         public GeneralSettingsControl()
         {
             InitializeComponent();
@@ -15,9 +18,11 @@ public GeneralSettingsControl()
             LoadLanguageList();
         }
 
-        public GeneralSettingsControl(DisplayLanguageSetting displayLanguage)
+        public GeneralSettingsControl(DisplayLanguageSetting displayLanguage, IGeneralConfigService configService)
             : this()
         {
+            _configService = configService;
+            _currentLanguage = displayLanguage;
             LanguageList.SelectedItem = displayLanguage;
         }
 
@@ -36,7 +41,6 @@ private void LoadLanguageList()
                 new DisplayLanguageSetting("de-DE"),
             };
 
-            // ReSharper disable once CoVariantArrayConversion
             LanguageList.Items.AddRange(settings.Where(item => item.Exists).ToArray());
             LanguageList.DisplayMember = "Name";
         }

RetailCoder.VBE/UI/Settings/GeneralSettingsControl.cs

@@ -18,7 +18,7 @@ public partial class _SettingsDialog : Form
         private const string ProgId = "Rubberduck.UI.Settings.SettingsDialog";
 
         private Configuration _config;
-        private IConfigurationLoader _configService;
+        private IGeneralConfigService _configService;
         private ConfigurationTreeViewControl _treeview;
         private Control _activeControl;
 
@@ -85,7 +85,7 @@ private void OkButton_Click(object sender, EventArgs e)
             Close();
         }
 
-        public _SettingsDialog(IConfigurationLoader configService)
+        public _SettingsDialog(IGeneralConfigService configService)
             : this()
         {
             _configService = configService;
@@ -105,7 +105,7 @@ private void LoadWindow()
             splitContainer1.Panel1.Controls.Add(_treeview);
             _treeview.Dock = DockStyle.Fill;
 
-            _generalSettingsView = new GeneralSettingsControl(_config.UserSettings.LanguageSetting);
+            _generalSettingsView = new GeneralSettingsControl(_config.UserSettings.LanguageSetting, _configService);
 
             var markers = _config.UserSettings.ToDoListSettings.ToDoMarkers;
             var gridViewSort = new GridViewSort<ToDoMarker>("Priority", true);