Merge pull request #3572 from rubberduck-vba/next

Release 2.1.1

Author: retailcoder

.gitignore

@@ -177,3 +177,5 @@ $RECYCLE.BIN/
 *.xlsm
 Installers/
 *.xlsx
+
+CodeGraphData/

CONTRIBUTING.md

@@ -95,4 +95,5 @@ If you contribute a translation for a brand new previously unsupported language,
 
 Well ... the eternal gratitude of all Rubberduck users for one :wink:
 Aside from that, all contributors are explicitly listed by name (or alias) in the "About Rubberduck" window.
-In addition to that, there is some [Contributor-only Rubberduck swag](https://gofundme.com/rubberduckvba), that can be sent to you, at the discretion of @retailcoder.. while supplies last.
+
+We ran a [fundraiser](https://gofundme.com/rubberduckvba) last summer, and had t-sihrts, mugs, pens, and stickers made - the goods are now unfortunately depleted; we'll probably run another campaign next year!

README.md

@@ -16,7 +16,7 @@ Branch     | Description | Build Status |
 [nextBuildStatus]:https://ci.appveyor.com/api/projects/status/we3pdnkeebo4nlck/branch/next?svg=true
 [masterBuildStatus]:https://ci.appveyor.com/api/projects/status/we3pdnkeebo4nlck/branch/master?svg=true
 
-[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/rubberduck-vba/rubberduck.svg)](http://isitmaintained.com/project/rubberduck-vba/rubberduck "Average time to resolve an issue") [![Percentage of issues still open](http://isitmaintained.com/badge/open/rubberduck-vba/rubberduck.svg)](http://isitmaintained.com/project/rubberduck-vba/rubberduck "Percentage of issues still open") 
+[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/rubberduck-vba/Rubberduck.svg)](http://isitmaintained.com/project/rubberduck-vba/Rubberduck "Average time to resolve an issue") [![Percentage of issues still open](http://isitmaintained.com/badge/open/rubberduck-vba/Rubberduck.svg)](http://isitmaintained.com/project/rubberduck-vba/Rubberduck "Percentage of issues still open")
 
 > **[rubberduckvba.com](http://rubberduckvba.com)** [Wiki](https://github.com/retailcoder/Rubberduck/wiki) [Rubberduck News](https://rubberduckvba.wordpress.com/) 
 > contact@rubberduckvba.com  

RetailCoder.VBE/App.cs

@@ -192,11 +192,11 @@ public void LogRubberduckStart()
             GlobalDiagnosticsContext.Set("RubberduckVersion", version.ToString());
             var headers = new List<string>
             {
-                string.Format("\r\n\tRubberduck version {0} loading:", version),
-                string.Format("\tOperating System: {0} {1}", Environment.OSVersion.VersionString, Environment.Is64BitOperatingSystem ? "x64" : "x86"),
-                string.Format("\tHost Product: {0} {1}", Application.ProductName, Environment.Is64BitProcess ? "x64" : "x86"),
-                string.Format("\tHost Version: {0}", Application.ProductVersion),
-                string.Format("\tHost Executable: {0}", Path.GetFileName(Application.ExecutablePath)),
+                $"\r\n\tRubberduck version {version} loading:",
+                $"\tOperating System: {Environment.OSVersion.VersionString} {(Environment.Is64BitOperatingSystem ? "x64" : "x86")}",
+                $"\tHost Product: {Application.ProductName} {(Environment.Is64BitProcess ? "x64" : "x86")}",
+                $"\tHost Version: {Application.ProductVersion}",
+                $"\tHost Executable: {Path.GetFileName(Application.ExecutablePath).ToUpper()}", // .ToUpper() used to convert ExceL.EXE -> EXCEL.EXE
             };
             LogLevelHelper.SetDebugInfo(string.Join(Environment.NewLine, headers));
         }

RetailCoder.VBE/Common/ModuleExporter.cs

@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Reflection;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;

RetailCoder.VBE/Extension.cs

@@ -1,7 +1,4 @@
 using Extensibility;
-using Ninject;
-using Ninject.Extensions.Factory;
-using Rubberduck.Root;
 using Rubberduck.UI;
 using System;
 using System.ComponentModel;
@@ -13,9 +10,10 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using System.Windows.Threading;
+using Castle.Windsor;
 using Microsoft.Vbe.Interop;
-using Ninject.Extensions.Interception;
 using NLog;
+using Rubberduck.Root;
 using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
 using Rubberduck.VBEditor.Events;
@@ -41,7 +39,9 @@ public class _Extension : IDTExtensibility2
         private bool _isInitialized;
         private bool _isBeginShutdownExecuted;
 
-        private IKernel _kernel;
+        private GeneralSettings _initialSettings;
+
+        private IWindsorContainer _container;
         private App _app;
         private readonly Logger _logger = LogManager.GetCurrentClassLogger();
 
@@ -152,12 +152,12 @@ private void InitializeAddIn()
             };
             var configProvider = new GeneralConfigProvider(configLoader);
 
-            var settings = configProvider.Create();
-            if (settings != null)
+            _initialSettings = configProvider.Create();
+            if (_initialSettings != null)
             {
                 try
                 {
-                    var cultureInfo = CultureInfo.GetCultureInfo(settings.Language.Code);
+                    var cultureInfo = CultureInfo.GetCultureInfo(_initialSettings.Language.Code);
                     Dispatcher.CurrentDispatcher.Thread.CurrentUICulture = cultureInfo;
                 }
                 catch (CultureNotFoundException)
@@ -170,7 +170,7 @@ private void InitializeAddIn()
             }
 
             Splash splash = null;
-            if (settings.ShowSplash)
+            if (_initialSettings.ShowSplash)
             {
                 splash = new Splash
                 {
@@ -210,10 +210,9 @@ private void Startup()
                 currentDomain.UnhandledException += HandlAppDomainException;
                 currentDomain.AssemblyResolve += LoadFromSameFolder;
 
-                _kernel = new StandardKernel(new NinjectSettings {LoadExtensions = true}, new FuncModule(), new DynamicProxyModule());
-                _kernel.Load(new RubberduckModule(_ide, _addin));
-
-                _app = _kernel.Get<App>();
+                _container = new WindsorContainer().Install(new RubberduckIoCInstaller(_ide, _addin, _initialSettings));
+                
+                _app = _container.Resolve<App>();
                 _app.Startup();
 
                 _isInitialized = true;
@@ -222,7 +221,9 @@ private void Startup()
             catch (Exception e)
             {
                 _logger.Log(LogLevel.Fatal, e, "Startup sequence threw an unexpected exception.");
-                //throw; // <<~ uncomment to crash the process
+#if DEBUG
+                throw; // <<~ uncomment to crash the process
+#endif
             }
         }
 
@@ -253,11 +254,11 @@ private void ShutdownAddIn()
                     _app = null;
                 }
 
-                if (_kernel != null)
+                if (_container != null)
                 {
                     _logger.Log(LogLevel.Trace, "Disposing IoC container...");
-                    _kernel.Dispose();
-                    _kernel = null;
+                    _container.Dispose();
+                    _container = null;
                 }
 
                 _isInitialized = false;

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -35,6 +35,8 @@ public sealed class CodeExplorerViewModel : ViewModelBase, IDisposable
         private GeneralSettings _generalSettings;
         private WindowSettings _windowSettings;
 
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+
         public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState state, List<CommandBase> commands,
             IConfigProvider<GeneralSettings> generalSettingsProvider, IConfigProvider<WindowSettings> windowSettingsProvider)
         {
@@ -374,7 +376,7 @@ private void ParserState_ModuleStateChanged(object sender, Parsing.ParseProgress
                 return;
             }
 
-            var components = e.Component.Collection;
+            var components = e.Module.Component.Collection;
             var componentProject = components.Parent;
             {
                 var projectNode = Projects.OfType<CodeExplorerProjectViewModel>()
@@ -385,7 +387,7 @@ private void ParserState_ModuleStateChanged(object sender, Parsing.ParseProgress
                     return;
                 }
 
-                SetErrorState(projectNode, e.Component);
+                SetErrorState(projectNode, e.Module);
 
                 if (_errorStateSet) { return; }
 
@@ -395,42 +397,49 @@ private void ParserState_ModuleStateChanged(object sender, Parsing.ParseProgress
 
                 UiDispatcher.Invoke(() =>
                 {
-                    if (folderNode == null)
+                    try
                     {
-                        folderNode = new CodeExplorerCustomFolderViewModel(projectNode, projectName, projectName);
-                        projectNode.AddChild(folderNode);
+                        if (folderNode == null)
+                        {
+                            folderNode = new CodeExplorerCustomFolderViewModel(projectNode, projectName, projectName);
+                            projectNode.AddChild(folderNode);
+                        }
+
+                        var declaration = CreateDeclaration(e.Module);
+                        var newNode =
+                            new CodeExplorerComponentViewModel(folderNode, declaration, new List<Declaration>())
+                            {
+                                IsErrorState = true
+                            };
+
+                        folderNode.AddChild(newNode);
+
+                        // Force a refresh. OnPropertyChanged("Projects") didn't work.
+                        Projects = Projects;
                     }
-
-                    var declaration = CreateDeclaration(e.Component);
-                    var newNode = new CodeExplorerComponentViewModel(folderNode, declaration, new List<Declaration>())
+                    catch (Exception exception)
                     {
-                        IsErrorState = true
-                    };
-
-                    folderNode.AddChild(newNode);
-
-                    // Force a refresh. OnPropertyChanged("Projects") didn't work.
-                    Projects = Projects;
+                        Logger.Error(exception, "Exception thrown trying to refresh the code explorer view on the UI thread.");
+                    }
                 });
             }
         }
 
-        private Declaration CreateDeclaration(IVBComponent component)
+        private Declaration CreateDeclaration(QualifiedModuleName module)
         {
             var projectDeclaration =
-                _state.AllUserDeclarations.FirstOrDefault(item =>
-                        item.DeclarationType == DeclarationType.Project &&
-                        item.Project.VBComponents.Contains(component));
+                _state.DeclarationFinder.UserDeclarations(DeclarationType.Project)
+                    .FirstOrDefault(item => item.Project.VBComponents.Contains(module.Component));
 
-            if (component.Type == ComponentType.StandardModule)
+            if (module.ComponentType == ComponentType.StandardModule)
             {
                 return new ProceduralModuleDeclaration(
-                        new QualifiedMemberName(new QualifiedModuleName(component), component.Name), projectDeclaration,
-                        component.Name, true, new List<IAnnotation>(), null);
+                        new QualifiedMemberName(module, module.ComponentName), projectDeclaration,
+                        module.ComponentName, true, new List<IAnnotation>(), null);
             }
 
-            return new ClassModuleDeclaration(new QualifiedMemberName(new QualifiedModuleName(component), component.Name),
-                    projectDeclaration, component.Name, true, new List<IAnnotation>(), null);
+            return new ClassModuleDeclaration(new QualifiedMemberName(module, module.ComponentName),
+                    projectDeclaration, module.ComponentName, true, new List<IAnnotation>(), null);
         }
 
         private void ReorderChildNodes(IEnumerable<CodeExplorerItemViewModel> nodes)
@@ -443,15 +452,15 @@ private void ReorderChildNodes(IEnumerable<CodeExplorerItemViewModel> nodes)
         }
 
         private bool _errorStateSet;
-        private void SetErrorState(CodeExplorerItemViewModel itemNode, IVBComponent component)
+        private void SetErrorState(CodeExplorerItemViewModel itemNode, QualifiedModuleName module)
         {
             _errorStateSet = false;
 
             foreach (var node in itemNode.Items)
             {
                 if (node is CodeExplorerCustomFolderViewModel)
                 {
-                    SetErrorState(node, component);
+                    SetErrorState(node, module);
                 }
 
                 if (_errorStateSet)
@@ -460,7 +469,7 @@ private void SetErrorState(CodeExplorerItemViewModel itemNode, IVBComponent comp
                 }
 
                 var componentNode = node as CodeExplorerComponentViewModel;
-                if (componentNode?.GetSelectedDeclaration().QualifiedName.QualifiedModuleName.Component.Equals(component) == true)
+                if (componentNode?.GetSelectedDeclaration().QualifiedName.QualifiedModuleName.Equals(module) == true)
                 {
                     componentNode.IsErrorState = true;
                     _errorStateSet = true;