Skip to content

Commit 6fbffb1

Browse files
committed
Simplify targetClass retrieval in ImplementInterfaceCommand
1 parent 3c7320d commit 6fbffb1

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

Rubberduck.Core/UI/Command/Refactorings/RefactorImplementInterfaceCommand.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@ protected override bool EvaluateCanExecute(object parameter)
3333
}
3434

3535
var targetInterface = _state.AllUserDeclarations.FindInterface(selection.Value);
36-
37-
var targetClass = _state.AllUserDeclarations.SingleOrDefault(d =>
38-
d.DeclarationType == DeclarationType.ClassModule &&
39-
d.QualifiedSelection.QualifiedName.Equals(selection.Value.QualifiedName));
36+
37+
var targetClass = _state.DeclarationFinder.Members(selection.Value.QualifiedName)
38+
.SingleOrDefault(declaration => declaration.DeclarationType == DeclarationType.ClassModule);
4039

4140
return targetInterface != null && targetClass != null
4241
&& !_state.IsNewOrModified(targetInterface.QualifiedModuleName)

Rubberduck.Core/UnitTesting/ProjectTestExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System.Runtime.InteropServices;
22
using System.Reflection;
33
using System.IO;
4-
using System.Linq;
54
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
65

76
namespace Rubberduck.UnitTesting

0 commit comments

Comments
 (0)