Merge upstream

Author: AnnaVel

.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!

Installer Build Script.iss

@@ -1,8 +1,8 @@
-#define BuildDir SourcePath + "RetailCoder.VBE\bin\release"
+#define BuildDir SourcePath + "RetailCoder.VBE\bin\Release"
 #define AppName "Rubberduck"
 #define AddinDLL "Rubberduck.dll"
 #define InspectionsDLL "Rubberduck.Inspections.dll"
-#define AppVersion GetFileVersion(SourcePath + "RetailCoder.VBE\bin\release\Rubberduck.dll")
+#define AppVersion GetFileVersion(SourcePath + "RetailCoder.VBE\bin\Release\Rubberduck.dll")
 #define AppPublisher "Rubberduck"
 #define AppURL "http://rubberduckvba.com"
 #define License SourcePath + "\License.rtf"
@@ -37,9 +37,9 @@ ArchitecturesInstallIn64BitMode=x64
 Name: "English"; MessagesFile: "compiler:Default.isl"
 
 [Files]
-; Install the correct bitness binaries.
-Source: "libs\NativeBinaries\amd64\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes: "{#AddinDLL}"; Check: Is64BitOfficeInstalled
-Source: "libs\NativeBinaries\x86\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes: "{#AddinDLL}"; Check: Is32BitOfficeInstalled
+; Install the correct bitness binaries.         
+Source: "{#BuildDir}\lib\win32\x64\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes: "{#AddinDLL}"; Check: Is64BitOfficeInstalled
+Source: "{#BuildDir}\lib\win32\x86\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes: "{#AddinDLL}"; Check: Is32BitOfficeInstalled
 
 Source: "{#BuildDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Excludes: "{#AddinDLL},\NativeBinaries"
 Source: "{#BuildDir}\{#InspectionsDLL}"; DestDir: "{app}"; Flags: ignoreversion

README.md

@@ -1,10 +1,12 @@
 <img src="http://i.stack.imgur.com/jnBEp.jpg" width=100% />
 
+<!-- campaign is no longer accepting donations
 ### Donate!
 
 If you like this project and would like to thank its contributors, you are welcome to support our GoFundMe campaign to finance Rubberduck swag and international shipping - contributors will be getting t-shirts, mugs, and other cool things.
 
 [![GoFundMe campaign](https://user-images.githubusercontent.com/5751684/29191799-e3d20b72-7dec-11e7-8ec6-0c69da4a3135.png)](https://www.gofundme.com/rubberduckvba)
+-->
 
 Branch     | Description | Build Status |
 |------------|---|--------------|
@@ -14,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/API/VBA/Declaration.cs

@@ -32,20 +32,18 @@ public interface IDeclaration
     [EditorBrowsable(EditorBrowsableState.Always)]
     public class Declaration : IDeclaration
     {
-        private readonly RubberduckDeclaration _declaration;
-
         internal Declaration(RubberduckDeclaration declaration)
         {
-            _declaration = declaration;
+            Instance = declaration;
         }
 
-        protected RubberduckDeclaration Instance { get { return _declaration; } }
+        protected RubberduckDeclaration Instance { get; }
 
-        public bool IsArray { get { return _declaration.IsArray; } }
-        public string Name { get { return _declaration.IdentifierName; } }
-        public Accessibility Accessibility { get { return (Accessibility)_declaration.Accessibility; } }
-        public DeclarationType DeclarationType {get { return TypeMappings[_declaration.DeclarationType]; }}
-        public string TypeName { get { return _declaration.AsTypeName; } }
+        public bool IsArray => Instance.IsArray;
+        public string Name => Instance.IdentifierName;
+        public Accessibility Accessibility => (Accessibility)Instance.Accessibility;
+        public DeclarationType DeclarationType => TypeMappings[Instance.DeclarationType];
+        public string TypeName => Instance.AsTypeName;
 
         private static readonly IDictionary<Parsing.Symbols.DeclarationType,DeclarationType> TypeMappings =
             new Dictionary<Parsing.Symbols.DeclarationType, DeclarationType>
@@ -75,20 +73,14 @@ internal Declaration(RubberduckDeclaration declaration)
             };
 
         private Declaration _parentDeclaration;
-        public Declaration ParentDeclaration
-        {
-            get
-            {
-                return _parentDeclaration ?? (_parentDeclaration = new Declaration(Instance.ParentDeclaration));
-            }
-        }
+        public Declaration ParentDeclaration => _parentDeclaration ?? (_parentDeclaration = new Declaration(Instance.ParentDeclaration));
 
         private IdentifierReference[] _references;
         public IdentifierReference[] References
         {
             get
             {
-                return _references ?? (_references = _declaration.References.Select(item => new IdentifierReference(item)).ToArray());
+                return _references ?? (_references = Instance.References.Select(item => new IdentifierReference(item)).ToArray());
             }
         }
     }

RetailCoder.VBE/API/VBA/IdentifierReference.cs

@@ -31,28 +31,19 @@ public IdentifierReference(Parsing.Symbols.IdentifierReference reference)
         }
 
         private Declaration _declaration;
-        public Declaration Declaration
-        {
-            get { return _declaration ?? (_declaration = new Declaration(_reference.Declaration)); }
-        }
+        public Declaration Declaration => _declaration ?? (_declaration = new Declaration(_reference.Declaration));
 
         private Declaration _parentScoping;
-        public Declaration ParentScope
-        {
-            get { return _parentScoping ?? (_parentScoping = new Declaration(_reference.ParentScoping)); }
-        }
+        public Declaration ParentScope => _parentScoping ?? (_parentScoping = new Declaration(_reference.ParentScoping));
 
         private Declaration _parentNonScoping;
-        public Declaration ParentNonScoping
-        {
-            get { return _parentNonScoping ?? (_parentNonScoping = new Declaration(_reference.ParentNonScoping)); }
-        }
+        public Declaration ParentNonScoping => _parentNonScoping ?? (_parentNonScoping = new Declaration(_reference.ParentNonScoping));
 
-        public bool IsAssignment { get { return _reference.IsAssignment; } }
+        public bool IsAssignment => _reference.IsAssignment;
 
-        public int StartLine { get { return _reference.Selection.StartLine; } }
-        public int EndLine { get { return _reference.Selection.EndLine; } }
-        public int StartColumn { get { return _reference.Selection.StartColumn; } }
-        public int EndColumn { get { return _reference.Selection.EndColumn; } }
+        public int StartLine => _reference.Selection.StartLine;
+        public int EndLine => _reference.Selection.EndLine;
+        public int StartColumn => _reference.Selection.StartColumn;
+        public int EndColumn => _reference.Selection.EndColumn;
     }
 }

RetailCoder.VBE/API/VBA/ParserState.cs

@@ -150,11 +150,11 @@ public void BeginParse()
 
         private void _state_StateChanged(object sender, EventArgs e)
         {
-            _allDeclarations = _state.AllDeclarations
+            AllDeclarations = _state.AllDeclarations
                                      .Select(item => new Declaration(item))
                                      .ToArray();
 
-            _userDeclarations = _state.AllUserDeclarations
+            UserDeclarations = _state.AllUserDeclarations
                                      .Select(item => new Declaration(item))
                                      .ToArray();
 
@@ -177,20 +177,9 @@ private void _state_StateChanged(object sender, EventArgs e)
             }
         }
 
-        private Declaration[] _allDeclarations;
+        public Declaration[] AllDeclarations { get; private set; }
 
-        public Declaration[] AllDeclarations
-        {
-            //[return: MarshalAs(UnmanagedType.SafeArray/*, SafeArraySubType = VarEnum.VT_VARIANT*/)]
-            get { return _allDeclarations; }
-        }
-
-        private Declaration[] _userDeclarations;
-        public Declaration[] UserDeclarations
-        {
-            //[return: MarshalAs(UnmanagedType.SafeArray/*, SafeArraySubType = VarEnum.VT_VARIANT*/)]
-            get { return _userDeclarations; }
-        }
+        public Declaration[] UserDeclarations { get; private set; }
 
         private bool _disposed;
         public void Dispose()

RetailCoder.VBE/App.cs

@@ -120,7 +120,7 @@ public void Startup()
             _hooks.HookHotkeys(); // need to hook hotkeys before we localize menus, to correctly display ShortcutTexts
             _appMenus.Localize();
 
-            if (_config.UserSettings.GeneralSettings.CheckVersion)
+            if (_config.UserSettings.GeneralSettings.CanCheckVersion)
             {
                 _checkVersionCommand.Execute(null);
             }
@@ -165,7 +165,7 @@ private void CheckForLegacyIndenterSettings()
             try
             {
                 Logger.Trace("Checking for legacy Smart Indenter settings.");
-                if (_config.UserSettings.GeneralSettings.SmartIndenterPrompted ||
+                if (_config.UserSettings.GeneralSettings.IsSmartIndenterPrompted ||
                     !_config.UserSettings.IndenterSettings.LegacySettingsExist())
                 {
                     return;
@@ -177,7 +177,7 @@ private void CheckForLegacyIndenterSettings()
                     Logger.Trace("Attempting to load legacy Smart Indenter settings.");
                     _config.UserSettings.IndenterSettings.LoadLegacyFromRegistry();
                 }
-                _config.UserSettings.GeneralSettings.SmartIndenterPrompted = true;
+                _config.UserSettings.GeneralSettings.IsSmartIndenterPrompted = true;
                 _configService.SaveConfiguration(_config);
             }
             catch 
@@ -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/AppMenu.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using NLog;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI;
@@ -17,6 +19,8 @@ public class AppMenu : IAppMenu, IDisposable
         private readonly ISelectionChangeService _selectionService;
         private readonly RubberduckCommandBar _stateBar;
 
+        private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
+
         public AppMenu(IEnumerable<IParentMenuItem> menus, IParseCoordinator parser, ISelectionChangeService selectionService, RubberduckCommandBar stateBar)
         {
             _menus = menus.ToList();
@@ -77,7 +81,13 @@ private void RemoveMenus()
         {
             foreach (var menu in _menus.Where(menu => menu.Item != null))
             {
+                _logger.Debug($"Starting removal of top-level menu {menu.GetType()}.");
                 menu.RemoveMenu();
+                //We do this here and not in the menu items because we only want to dispose of/release the parents of the top level parent menus.
+                //The parents further down get disposed of/released as part of the remove chain.
+                _logger.Trace($"Removing parent menu of top-level menu {menu.GetType()}.");
+                menu.Parent.Dispose();
+                menu.Parent = null;
             }
         }
     }

RetailCoder.VBE/Common/ClipboardWriter.cs

@@ -19,8 +19,8 @@ public class ClipboardWriter : IClipboardWriter
 
         public void Write(string text)
         {
-            this.AppendString(DataFormats.UnicodeText, text);
-            this.Flush();
+            AppendString(DataFormats.UnicodeText, text);
+            Flush();
         }
 
         public void AppendImage(BitmapSource image)