Merge branch 'next' into fixCommandBar

Author: Hosch250

RetailCoder.VBE/UI/Command/AddTestMethodCommand.cs

@@ -34,7 +34,8 @@ protected override bool CanExecuteImpl(object parameter)
                         d.DeclarationType == DeclarationType.ProceduralModule &&
                         d.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule));
 
-            return testModules.Any(a => a.QualifiedName.QualifiedModuleName.Component == _vbe.SelectedVBComponent);
+            // the code modules consistently match correctly, but the components don't
+            return testModules.Any(a => a.QualifiedName.QualifiedModuleName.Component.CodeModule == _vbe.SelectedVBComponent.CodeModule);
         }
 
         protected override void ExecuteImpl(object parameter)

RetailCoder.VBE/UI/Command/AddTestMethodExpectedErrorCommand.cs

@@ -34,7 +34,8 @@ protected override bool CanExecuteImpl(object parameter)
                         d.DeclarationType == DeclarationType.ProceduralModule &&
                         d.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule));
 
-            return testModules.Any(a => a.QualifiedName.QualifiedModuleName.Component == _vbe.SelectedVBComponent);
+            // the code modules consistently match correctly, but the components don't
+            return testModules.Any(a => a.QualifiedName.QualifiedModuleName.Component.CodeModule == _vbe.SelectedVBComponent.CodeModule);
         }
 
         protected override void ExecuteImpl(object parameter)

RetailCoder.VBE/UnitTesting/NewTestMethodCommand.cs

@@ -2,6 +2,7 @@
 using System.Runtime.InteropServices;
 using Microsoft.Vbe.Interop;
 using Rubberduck.Parsing.Annotations;
+using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI;
 
@@ -67,11 +68,12 @@ public void NewTestMethod()
 
             try
             {
-                var declaration = _state.AllUserDeclarations.First(f =>
-                            f.DeclarationType == Parsing.Symbols.DeclarationType.ProceduralModule &&
+                var declaration = _state.AllUserDeclarations.FirstOrDefault(f =>
                             f.QualifiedName.QualifiedModuleName.Component.CodeModule == _vbe.ActiveCodePane.CodeModule);
 
-                if (declaration.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule))
+                if (declaration != null &&
+                    declaration.DeclarationType == DeclarationType.ProceduralModule &&
+                    declaration.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule))
                 {
                     var module = _vbe.ActiveCodePane.CodeModule;
                     var name = GetNextTestMethodName(module.Parent);
@@ -95,11 +97,12 @@ public void NewExpectedErrorTestMethod()
 
             try
             {
-                var declaration = _state.AllUserDeclarations.First(f =>
-                            f.DeclarationType == Parsing.Symbols.DeclarationType.ProceduralModule &&
+                var declaration = _state.AllUserDeclarations.FirstOrDefault(f =>
                             f.QualifiedName.QualifiedModuleName.Component.CodeModule == _vbe.ActiveCodePane.CodeModule);
 
-                if (declaration.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule))
+                if (declaration != null &&
+                    declaration.DeclarationType == DeclarationType.ProceduralModule &&
+                    declaration.Annotations.Any(a => a.AnnotationType == AnnotationType.TestModule))
                 {
                     var module = _vbe.ActiveCodePane.CodeModule;
                     var name = GetNextTestMethodName(module.Parent);