Merge pull request #2354 from retailcoder/next

Green build!

Author: retailcoder

RetailCoder.VBE/Inspections/ObjectVariableNotSetInspection.cs

@@ -75,10 +75,9 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                     (item.DeclarationType == DeclarationType.Function || item.DeclarationType == DeclarationType.PropertyGet)
                     && !item.IsArray
                     && item.IsTypeSpecified
-                    && !ValueTypes.Contains(item.AsTypeName)
-                    && (item.AsTypeDeclaration != null && (
-                        item.AsTypeDeclaration.DeclarationType != DeclarationType.Enumeration
-                        && item.AsTypeDeclaration.DeclarationType != DeclarationType.UserDefinedType)));
+                    && !ValueTypes.Contains(item.AsTypeName) 
+                    && (item.AsTypeDeclaration == null // null if unresolved (e.g. in unit tests)
+                        || (item.AsTypeDeclaration.DeclarationType != DeclarationType.Enumeration && item.AsTypeDeclaration.DeclarationType != DeclarationType.UserDefinedType)));
 
             var interestingReferences = interestingDeclarations
                     .Union(interestingMembers.SelectMany(item =>

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -506,7 +506,8 @@ private void SwitchNodeState(CodeExplorerItemViewModel node, bool expandedState)
         private void ExecuteRemoveComand(object param)
         {
             var node = (CodeExplorerComponentViewModel)SelectedItem;
-            SelectedItem = Projects.First(p => ((CodeExplorerProjectViewModel)p).Declaration.Project.Equals(node.Declaration.Project));
+            SelectedItem = Projects.FirstOrDefault(p => p.QualifiedSelection.HasValue 
+                && p.QualifiedSelection.Value.QualifiedName.ProjectId == node.Declaration.ProjectId);
 
             _externalRemoveCommand.Execute(param);
         }

RetailCoder.VBE/Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs

@@ -78,17 +78,15 @@ public void Refactor(QualifiedSelection selection)
             {
                 var module = oldSelection.Value.QualifiedName.Component.CodeModule;
                 var pane = module.CodePane;
-                {
-                    pane.Selection = oldSelection.Value.Selection;
-                }
+                pane.Selection = oldSelection.Value.Selection;
             }
 
             _state.OnParseRequested(this);
         }
 
         public void Refactor(Declaration target)
         {
-            throw new NotImplementedException();
+            throw new NotSupportedException();
         }
 
         private void ImplementMissingMembers()

RetailCoder.VBE/UI/CodeExplorer/Commands/RemoveCommand.cs

@@ -6,7 +6,6 @@
 using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor.SafeComWrappers;
-using Rubberduck.VBEditor.SafeComWrappers.VBA;
 
 namespace Rubberduck.UI.CodeExplorer.Commands
 {

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Rubberduck.Parsing.Symbols;
@@ -21,6 +22,13 @@ public RefactorExtractInterfaceCommand(IVBE vbe, RubberduckParserState state, IM
             _messageBox = messageBox;
         }
 
+        private static readonly IReadOnlyList<DeclarationType> ModuleTypes = new[] 
+        {
+            DeclarationType.ClassModule,
+            DeclarationType.UserForm, 
+            DeclarationType.ProceduralModule, 
+        };
+
         protected override bool CanExecuteImpl(object parameter)
         {
             var selection = Vbe.ActiveCodePane.GetQualifiedSelection();
@@ -29,14 +37,18 @@ protected override bool CanExecuteImpl(object parameter)
                 return false;
             }
 
-            var target = _state.AllUserDeclarations.SingleOrDefault(item =>
+            var interfaceClass = _state.AllUserDeclarations.SingleOrDefault(item =>
                 item.QualifiedName.QualifiedModuleName.Equals(selection.Value.QualifiedName)
-                && item.IdentifierName == selection.Value.QualifiedName.ComponentName
-                && (item.DeclarationType == DeclarationType.ClassModule || item.DeclarationType == DeclarationType.Document || item.DeclarationType == DeclarationType.UserForm));
-            var hasMembers = _state.AllUserDeclarations.Any(item => item.DeclarationType.HasFlag(DeclarationType.Member) && item.ParentDeclaration != null && item.ParentDeclaration.Equals(target));
+                && ModuleTypes.Contains(item.DeclarationType));
+
+            // interface class must have members to be implementable
+            var hasMembers = _state.AllUserDeclarations.Any(item => 
+                item.DeclarationType.HasFlag(DeclarationType.Member) 
+                && item.ParentDeclaration != null 
+                && item.ParentDeclaration.Equals(interfaceClass));
 
             // true if active code pane is for a class/document/form module
-            return target != null && hasMembers;
+            return interfaceClass != null && hasMembers;
         }
 
         protected override void ExecuteImpl(object parameter)

Rubberduck.Parsing/Binding/SimpleNameDefaultBinding.cs

@@ -70,7 +70,7 @@ public IBoundExpression Resolve()
 
             var undeclaredLocal = _declarationFinder.OnUndeclaredVariable(_parent, _name, _context);
             return new SimpleNameExpression(undeclaredLocal, ExpressionClassification.Variable, _context);
-            return new ResolutionFailedExpression();
+            //return new ResolutionFailedExpression();
         }
 
         private IBoundExpression ResolveProcedureNamespace()

Rubberduck.Parsing/Binding/SimpleNameTypeBinding.cs

@@ -29,7 +29,7 @@ public SimpleNameTypeBinding(
 
         public IBoundExpression Resolve()
         {
-            string name = Identifier.GetName(_expression.identifier());
+            var name = Identifier.GetName(_expression.identifier());
             if (PreferProjectOverUdt)
             {
                 return ResolvePreferProject(name);

Rubberduck.Parsing/Rubberduck.Parsing.csproj

@@ -272,7 +272,7 @@
     <Compile Include="Symbols\IdentifierReference.cs" />
     <Compile Include="Symbols\IdentifierReferenceListener.cs" />
     <Compile Include="Symbols\ConstantDeclaration.cs" />
-    <Compile Include="Syntax\SyntaxNode.cs" />
+    <Compile Include="Syntax\SyntaxTree.cs" />
     <Compile Include="Syntax\TextSpan.cs" />
     <Compile Include="VBA\AttributeParser.cs" />
     <Compile Include="VBA\Attributes.cs" />

Rubberduck.Parsing/Symbols/DebugDeclarations.cs

@@ -45,7 +45,7 @@ public IReadOnlyList<Declaration> Load()
 
         private IReadOnlyList<Declaration> Load(Declaration parentProject, Declaration parentModule)
         {
-            List<Declaration> declarations = new List<Declaration>();
+            var declarations = new List<Declaration>();
             var debugModuleName = new QualifiedModuleName(parentProject.QualifiedName.QualifiedModuleName.ProjectName, parentProject.QualifiedName.QualifiedModuleName.ProjectPath, "DebugClass");
             var debugModule = new ProceduralModuleDeclaration(new QualifiedMemberName(debugModuleName, "DebugModule"), parentProject, "DebugModule", true, new List<IAnnotation>(), new Attributes());
             var debugClassName = new QualifiedModuleName(parentProject.QualifiedName.QualifiedModuleName.ProjectName, parentProject.QualifiedName.QualifiedModuleName.ProjectPath, "DebugClass");