Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into HostApplicationDocument

# Conflicts:
#	Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs

Author: bclothier

.gitignore

@@ -181,3 +181,5 @@ Installers/
 
 CodeGraphData/
 /Rubberduck.Deployment/Properties/launchSettings.json
+/Rubberduck.Deployment/Rubberduck.API.idl
+/Rubberduck.Deployment/Rubberduck.idl

Rubberduck.CodeAnalysis/Inspections/Concrete/VariableNotUsedInspection.cs

@@ -22,7 +22,7 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
                 .Where(declaration =>
                     !declaration.IsWithEvents
                     && !IsIgnoringInspectionResultFor(declaration, AnnotationName)
-                    && declaration.References.All(reference => reference.IsAssignment));
+                    && !declaration.References.Any());
 
             return declarations.Select(issue => 
                 new DeclarationInspectionResult(this,

Rubberduck.CodeAnalysis/Inspections/Results/IdentifierReferenceInspectionResult.cs

@@ -25,7 +25,7 @@ public IdentifierReferenceInspectionResult(IInspection inspection, string descri
         private static QualifiedMemberName? GetQualifiedMemberName(RubberduckParserState state, IdentifierReference reference)
         {
             var members = state.DeclarationFinder.Members(reference.QualifiedModuleName);
-            return members.SingleOrDefault(m => m.Selection.Contains(reference.Selection))?.QualifiedName;
+            return members.SingleOrDefault(m => reference.Context.IsDescendentOf(m.Context))?.QualifiedName;
         }
     }
 }

Rubberduck.CodeAnalysis/QuickFixes/RemoveUnassignedVariableUsageQuickFix.cs

@@ -1,10 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using Antlr4.Runtime;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Concrete;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Inspections.Abstract;
-using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 
 namespace Rubberduck.Inspections.QuickFixes
@@ -23,8 +25,26 @@ public override void Fix(IInspectionResult result)
         {
             var rewriter = _state.GetRewriter(result.QualifiedSelection.QualifiedName);
 
+            if (result.Context.Parent.Parent is VBAParser.WithStmtContext withContext)
+            {
+                var lines = withContext.GetText().Replace("\r", string.Empty).Split('\n');
+                // Assume that the End With is at the appropriate indentation level for the block. Note that this could
+                // over-indent or under-indent some lines if statement separators are being used, but meh. 
+                var padding = new string(' ', lines.Last().IndexOf(Tokens.End, StringComparison.Ordinal));
+
+                var replacement = new List<string>
+                {
+                    $"{Tokens.CommentMarker}TODO - {result.Description}",
+                    $"{Tokens.CommentMarker}{padding}{lines.First()}"
+                };
+                replacement.AddRange(lines.Skip(1)
+                    .Select(line => Tokens.CommentMarker + line));
+                
+                rewriter.Replace(withContext, string.Join(Environment.NewLine, replacement));
+                return;
+            }
             var assignmentContext = result.Context.GetAncestor<VBAParser.LetStmtContext>() ??
-                                                  (ParserRuleContext)result.Context.GetAncestor<VBAParser.CallStmtContext>();
+                                    (ParserRuleContext)result.Context.GetAncestor<VBAParser.CallStmtContext>();
 
             rewriter.Remove(assignmentContext);
         }

Rubberduck.Core/Common/RubberduckHooks.cs

@@ -19,8 +19,19 @@ public class RubberduckHooks : SubclassingWindow, IRubberduckHooks
         private readonly IList<IAttachable> _hooks = new List<IAttachable>();
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        public RubberduckHooks(IVBE vbe, IGeneralConfigService config, HotkeyFactory hotkeyFactory, AutoCompleteService autoComplete)
-            : base((IntPtr)vbe.MainWindow.HWnd, (IntPtr)vbe.MainWindow.HWnd)
+        private static IntPtr GetVbeMainWindowPtr(IVBE vbe)
+        {
+            using (var window = vbe.MainWindow)
+            {
+                return (IntPtr)window.HWnd;
+            }
+        }
+
+        private RubberduckHooks(IntPtr ptr) : base(ptr, ptr) { }
+
+        public RubberduckHooks(IVBE vbe, IGeneralConfigService config, HotkeyFactory hotkeyFactory,
+            AutoCompleteService autoComplete)
+            : this(GetVbeMainWindowPtr(vbe))
         {
             _config = config;
             _hotkeyFactory = hotkeyFactory;

Rubberduck.Core/Properties/Settings.Designer.cs

@@ -3,7 +3,6 @@
 using NLog;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.Navigation.CodeExplorer;
-using Rubberduck.UI.CodeExplorer.Commands;
 using Rubberduck.Resources;
 using Rubberduck.VBEditor.SafeComWrappers;
 
@@ -32,17 +31,32 @@ protected override bool EvaluateCanExecute(object parameter)
                 return false;
             }
 
-            var projectNode = parameter as CodeExplorerProjectViewModel;
-
-            var project = parameter as IVBProject;
-
-            return Evaluate(projectNode?.Declaration.Project ?? project ?? _vbe.ActiveVBProject);
+            switch (parameter)
+            {
+                case CodeExplorerProjectViewModel projectNode:
+                    return Evaluate(projectNode.Declaration.Project);
+                case IVBProject project:
+                    return Evaluate(project);
+            }
 
+            using (var activeProject = _vbe.ActiveVBProject)
+            {
+                return Evaluate(activeProject);
+            }
         }
 
         private bool Evaluate(IVBProject project)
         {
-            return project != null && !project.IsWrappingNullReference && project.VBComponents.Count > 0;
+            if (project == null || project.IsWrappingNullReference)
+            {
+                return false;
+            }
+
+            using (var compontents = project.VBComponents)
+            {
+                return compontents.Count > 0;
+            }
+
         }
 
         protected override void OnExecute(object parameter)

Rubberduck.Core/UI/Command/ExportAllCommand.cs

@@ -192,24 +192,24 @@ private Declaration FindTarget(object parameter)
                 return declaration;
             }
 
-            bool findDesigner;
             using (var activePane = _vbe.ActiveCodePane)
             {
+                bool findDesigner;
                 using (var selectedComponent = _vbe.SelectedVBComponent)
                 {
-                    findDesigner = activePane != null && !activePane.IsWrappingNullReference 
-                                    && (selectedComponent?.HasDesigner ?? false);
+                    findDesigner = activePane != null && !activePane.IsWrappingNullReference
+                                                      && (selectedComponent?.HasDesigner ?? false);
                 }
-            }
 
-            return findDesigner
-                ? FindFormDesignerTarget()
-                : FindCodePaneTarget();
+                return findDesigner
+                    ? FindFormDesignerTarget()
+                    : FindCodePaneTarget(activePane);
+            }
         }
 
-        private Declaration FindCodePaneTarget()
+        private Declaration FindCodePaneTarget(ICodePane codePane)
         {
-            return _state.FindSelectedDeclaration(_vbe.ActiveCodePane);
+            return _state.FindSelectedDeclaration(codePane);
         }
 
         private Declaration FindFormDesignerTarget(QualifiedModuleName? qualifiedModuleName = null)

Rubberduck.Core/UI/Command/FindAllReferencesCommand.cs

@@ -23,7 +23,11 @@ public IndentCurrentProjectCommand(IVBE vbe, IIndenter indenter, RubberduckParse
 
         protected override bool EvaluateCanExecute(object parameter)
         {
-            return !_vbe.ActiveVBProject.IsWrappingNullReference && _vbe.ActiveVBProject.Protection != ProjectProtection.Locked;
+            using (var vbProject = _vbe.ActiveVBProject)
+            {
+                return !vbProject.IsWrappingNullReference &&
+                       vbProject.Protection != ProjectProtection.Locked;
+            }
         }
 
         protected override void OnExecute(object parameter)

Rubberduck.Core/UI/Command/IndentCurrentProjectCommand.cs

@@ -224,7 +224,7 @@ private void child_Click(object sender, CommandBarButtonClickEventArgs e)
             ICommandMenuItem item;
             try
             {
-                item = _items.Select(kvp => kvp.Key).SingleOrDefault(menu => menu.GetType().FullName == e.Control.Tag);
+                item = _items.Select(kvp => kvp.Key).SingleOrDefault(menu => menu.GetType().FullName == e.Tag);
             }
             catch (COMException exception)
             {
@@ -236,7 +236,7 @@ private void child_Click(object sender, CommandBarButtonClickEventArgs e)
                 return;
             }
 
-            Logger.Debug("({0}) Executing click handler for commandbar item '{1}', hash code {2}", GetHashCode(), e.Control.Caption, e.Control.Target.GetHashCode());
+            Logger.Debug("({0}) Executing click handler for commandbar item '{1}', hash code {2}", GetHashCode(), e.Caption, e.TargetHashCode);
             item.Command.Execute(null);
         }
     }