Merge pull request #1385 from Hosch250/BugBlipper

Working implementation of CanExecute for Implement Interface

Author: retailcoder

RetailCoder.VBE/UI/Command/Refactorings/RefactorImplementInterfaceCommand.cs

@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using System.Linq;
 using Microsoft.Vbe.Interop;
 using System.Runtime.InteropServices;
@@ -7,7 +6,6 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.ImplementInterface;
 using Rubberduck.VBEditor;
-using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
 
 namespace Rubberduck.UI.Command.Refactorings
 {
@@ -29,30 +27,28 @@ public override bool CanExecute(object parameter)
                 return false;
             }
 
-            //var target = _state.FindSelectedDeclaration(Vbe.ActiveCodePane); // nope. logic is a bit more complex here.
+            var selection = Editor.GetSelection();
 
-            var selection = Vbe.ActiveCodePane.GetSelection();
-            var targetInterface = _state.AllUserDeclarations.FindInterface(selection);
+            if (!selection.HasValue)
+            {
+                return false;
+            }
+
+            var targetInterface = _state.AllUserDeclarations.FindInterface(selection.Value);
 
             var targetClass = _state.AllUserDeclarations.SingleOrDefault(d =>
                         !d.IsBuiltIn && d.DeclarationType == DeclarationType.ClassModule &&
-                        d.QualifiedSelection.QualifiedName.Equals(selection.QualifiedName));
-
-            var canExecute = targetInterface != null && targetClass != null;
+                        d.QualifiedSelection.QualifiedName.Equals(selection.Value.QualifiedName));
 
-            Debug.WriteLine("{0}.CanExecute evaluates to {1}", GetType().Name, canExecute);
-            return canExecute;
+            return targetClass != null && targetInterface != null;
         }
 
         public override void Execute(object parameter)
         {
-            if (Vbe.ActiveCodePane == null)
-            {
-                return;
-            }
-
             var refactoring = new ImplementInterfaceRefactoring(_state, Editor, new MessageBox());
-            refactoring.Refactor();
+
+            // ReSharper disable once PossibleInvalidOperationException
+            refactoring.Refactor(Editor.GetSelection().Value);
         }
     }
 }