Fix compilation errors that VS was quite quiet about

rubberduck-vba · May 24, 2018 · ca56503 · ca56503
1 parent d5e529b
commit ca56503
Show file tree

Hide file tree

Showing 27 changed files with 116 additions and 176 deletions.
diff --git a/Rubberduck.Core/App.cs b/Rubberduck.Core/App.cs
@@ -5,12 +5,10 @@
 using Rubberduck.Common;
 using Rubberduck.Interaction;
 using Rubberduck.Settings;
-using Rubberduck.UI;
 using Rubberduck.UI.Command.MenuItems;
 using System;
 using System.Diagnostics;
 using System.Globalization;
-using Rubberduck.Parsing.Inspections.Resources;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;

diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/ParameterViewModel.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/ParameterViewModel.cs
@@ -3,7 +3,7 @@
 
 namespace Rubberduck.UI.Refactorings.RemoveParameters
 {
-    internal class ParameterViewModel : ViewModelBase
+    public class ParameterViewModel : ViewModelBase
     {
         private Parameter wrapped;
         internal Parameter Wrapped { get => wrapped; }

diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersDialog.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersDialog.cs
@@ -3,7 +3,7 @@
 
 namespace Rubberduck.UI.Refactorings.RemoveParameters
 {
-    internal sealed partial class RemoveParametersDialog : Form, IRefactoringDialog<RemoveParametersViewModel>
+    public sealed partial class RemoveParametersDialog : Form, IRefactoringDialog<RemoveParametersViewModel>
     {
         public RemoveParametersViewModel ViewModel { get; }
 

diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
@@ -6,7 +6,7 @@
 
 namespace Rubberduck.UI.Refactorings.RemoveParameters
 {
-    internal class RemoveParametersPresenter : IRemoveParametersPresenter
+    public class RemoveParametersPresenter : IRemoveParametersPresenter
     {
         private readonly IRefactoringDialog<RemoveParametersViewModel> _view;
         private readonly RemoveParametersModel _model;

diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenterFactory.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenterFactory.cs
@@ -6,7 +6,7 @@
 
 namespace Rubberduck.UI.Refactorings.RemoveParameters
 {
-    internal class RemoveParametersPresenterFactory : IRefactoringPresenterFactory<RemoveParametersPresenter>
+    public class RemoveParametersPresenterFactory : IRefactoringPresenterFactory<RemoveParametersPresenter>
     {
         private readonly IVBE _vbe;
         private readonly IRefactoringDialog<RemoveParametersViewModel> _view;

diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml.cs
@@ -16,7 +16,7 @@ public RemoveParametersView()
         private void ListBoxItem_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
             var item = (ListBoxItem)sender;
-            var target = (Parameter)item.Content;
+            var target = (ParameterViewModel)item.Content;
 
             if (target.IsRemoved)
             {

diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersViewModel.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersViewModel.cs
@@ -10,7 +10,7 @@
 
 namespace Rubberduck.UI.Refactorings.RemoveParameters
 {
-    internal class RemoveParametersViewModel : ViewModelBase
+    public class RemoveParametersViewModel : ViewModelBase
     {
         public RubberduckParserState State { get; }
 

diff --git a/Rubberduck.Inspections/QuickFixes/MoveFieldCloserToUsageQuickFix.cs b/Rubberduck.Inspections/QuickFixes/MoveFieldCloserToUsageQuickFix.cs
@@ -1,10 +1,10 @@
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Concrete;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.MoveCloserToUsage;
 using Rubberduck.Resources.Inspections;
-using Rubberduck.UI;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Inspections.QuickFixes

diff --git a/Rubberduck.Inspections/QuickFixes/RemoveUnusedParameterQuickFix.cs b/Rubberduck.Inspections/QuickFixes/RemoveUnusedParameterQuickFix.cs
@@ -1,9 +1,9 @@
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Concrete;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.RemoveParameters;
-using Rubberduck.UI;
 using Rubberduck.UI.Refactorings.RemoveParameters;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 

diff --git a/Rubberduck.Inspections/QuickFixes/RenameDeclarationQuickFix.cs b/Rubberduck.Inspections/QuickFixes/RenameDeclarationQuickFix.cs
@@ -1,11 +1,11 @@
 using System.Globalization;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Concrete;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Rename;
 using Rubberduck.Resources;
-using Rubberduck.UI;
 using Rubberduck.UI.Refactorings.Rename;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 

diff --git a/Rubberduck.Inspections/Rubberduck.Inspections.csproj b/Rubberduck.Inspections/Rubberduck.Inspections.csproj
@@ -204,14 +204,22 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Rubberduck.Core\Rubberduck.Core.csproj">
-      <Project>{A1587EAC-7B54-407E-853F-4C7493D0323E}</Project>
+      <Project>{a1587eac-7b54-407e-853f-4c7493d0323e}</Project>
       <Name>Rubberduck.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Rubberduck.Interaction\Rubberduck.Interaction.csproj">
+      <Project>{AC54B7FB-170D-4DA6-A30B-8CAD182F0E6B}</Project>
+      <Name>Rubberduck.Interaction</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Rubberduck.Parsing\Rubberduck.Parsing.csproj">
       <Project>{a4a618e1-cbca-435f-9c6c-5181e030adfc}</Project>
       <Name>Rubberduck.Parsing</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Rubberduck.Refactorings\Rubberduck.Refactorings.csproj">
+      <Project>{D4B6A510-14E1-420A-A8D5-6A09890FD7D8}</Project>
+      <Name>Rubberduck.Refactorings</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Rubberduck.Resources\Rubberduck.Resources.csproj">
       <Project>{1B84B387-F7C4-4876-9BDF-C644C365359A}</Project>
       <Name>Rubberduck.Resources</Name>

diff --git a/Rubberduck.Refactorings/IntroduceField/IntroduceFieldRefactoring.cs b/Rubberduck.Refactorings/IntroduceField/IntroduceFieldRefactoring.cs
@@ -38,7 +38,7 @@ public void Refactor()
 
             if (!selection.HasValue)
             {
-                _messageBox.Show(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceField_Caption, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                _messageBox.NotifyWarn(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceField_Caption);
                 return;
             }
 
@@ -63,7 +63,7 @@ public void Refactor(Declaration target)
         {
             if (target.DeclarationType != DeclarationType.Variable)
             {
-                _messageBox.Show(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceParameter_Caption, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                _messageBox.NotifyWarn(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceParameter_Caption);
                 throw new ArgumentException(@"Invalid declaration type", nameof(target));
             }
 
@@ -75,7 +75,7 @@ private void PromoteVariable(IModuleRewriter rewriter, Declaration target)
         {
             if (new[] { DeclarationType.ClassModule, DeclarationType.ProceduralModule }.Contains(target.ParentDeclaration.DeclarationType))
             {
-                _messageBox.Show(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceParameter_Caption, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                _messageBox.NotifyWarn(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceParameter_Caption);
                 return;
             }
 

diff --git a/RubberduckTests/CodeExplorer/CodeExplorerTests.cs b/RubberduckTests/CodeExplorer/CodeExplorerTests.cs
@@ -19,6 +19,7 @@
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.SettingsProvider;
 using Rubberduck.VBEditor.ComManagement;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.CodeExplorer
 {
@@ -772,9 +773,7 @@ public void RemoveCommand_RemovesModuleWhenPromptOk()
             saveFileDialog.Setup(o => o.ShowDialog()).Returns(DialogResult.OK);
 
             var messageBox = new Mock<IMessageBox>();
-            messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>(), It.IsAny<MessageBoxDefaultButton>()))
-                .Returns(DialogResult.Yes);
+            messageBox.Setup(m => m.ConfirmYN(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
 
             var projectRepository = new ProjectsRepository(vbe.Object);
             using (var state = new RubberduckParserState(vbe.Object, projectRepository, new DeclarationFinderFactory(), vbeEvents.Object))
@@ -817,10 +816,7 @@ public void RemoveCommand_CancelsWhenFilePromptCancels()
             saveFileDialog.Setup(o => o.ShowDialog()).Returns(DialogResult.Cancel);
 
             var messageBox = new Mock<IMessageBox>();
-            messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(),
-                    It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>(), It.IsAny<MessageBoxDefaultButton>()))
-                .Returns(DialogResult.Yes);
+            messageBox.Setup(m => m.ConfirmYN(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns(true);
 
             var projectRepository = new ProjectsRepository(vbe.Object);
             using (var state = new RubberduckParserState(vbe.Object, projectRepository, new DeclarationFinderFactory(), vbeEvents.Object))
@@ -863,10 +859,7 @@ public void RemoveCommand_GivenMsgBoxNO_RemovesModuleNoExport()
             saveFileDialog.Setup(o => o.ShowDialog()).Returns(DialogResult.OK);
 
             var messageBox = new Mock<IMessageBox>();
-            messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(),
-                    It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>(), It.IsAny<MessageBoxDefaultButton>()))
-                .Returns(DialogResult.No);
+            messageBox.Setup(m => m.ConfirmYN(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns(false);
 
             var projectRepository = new ProjectsRepository(vbe.Object);
             using (var state = new RubberduckParserState(vbe.Object, projectRepository, new DeclarationFinderFactory(), vbeEvents.Object))
@@ -909,9 +902,7 @@ public void RemoveModule_Cancel()
             saveFileDialog.Setup(o => o.OverwritePrompt);
 
             var messageBox = new Mock<IMessageBox>();
-            messageBox.Setup(m =>
-                m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>(), It.IsAny<MessageBoxDefaultButton>())).Returns(DialogResult.Cancel);
+            messageBox.Setup(m => m.Confirm(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns((bool?)null);
 
             var projectRepository = new ProjectsRepository(vbe.Object);
             using (var state = new RubberduckParserState(vbe.Object, projectRepository, new DeclarationFinderFactory(), vbeEvents.Object))

diff --git a/RubberduckTests/Commands/FindAllImplementationsTests.cs b/RubberduckTests/Commands/FindAllImplementationsTests.cs
@@ -12,6 +12,7 @@
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.Commands
 {
@@ -144,17 +145,13 @@ public void FindAllImplementations_NoResults_DisplayMessageBox()
             {
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m =>
-                    m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                        It.IsAny<MessageBoxIcon>())).Returns(DialogResult.OK);
 
                 var vm = new SearchResultsWindowViewModel();
                 var command = new FindAllImplementationsCommand(null, messageBox.Object, state, vbe.Object, vm, null, uiDispatcher.Object);
 
                 command.Execute(state.AllUserDeclarations.Single(s => s.IdentifierName == "Foo"));
 
-                messageBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>()), Times.Once);
+                messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
             }
         }
 

diff --git a/RubberduckTests/Commands/FindAllReferencesTests.cs b/RubberduckTests/Commands/FindAllReferencesTests.cs
@@ -12,6 +12,7 @@
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.Commands
 {
@@ -91,18 +92,14 @@ public void FindAllReferences_NoResults_DisplayMessageBox()
             {
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m =>
-                    m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                        It.IsAny<MessageBoxIcon>())).Returns(DialogResult.OK);
 
                 var vm = new SearchResultsWindowViewModel();
                 var uiDispatcher = new Mock<IUiDispatcher>();
                 var command = new FindAllReferencesCommand(null, messageBox.Object, state, vbe.Object, vm, null, uiDispatcher.Object);
 
                 command.Execute(state.AllUserDeclarations.Single(s => s.IdentifierName == "Foo"));
 
-                messageBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>()), Times.Once);
+                messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
             }
         }
 
@@ -348,9 +345,6 @@ End Sub
                 AssertParserReady(state);
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m =>
-                    m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                        It.IsAny<MessageBoxIcon>())).Returns(DialogResult.OK);
 
                 var vm = new SearchResultsWindowViewModel();
                 var uiDispatcher = new Mock<IUiDispatcher>();
@@ -359,8 +353,7 @@ End Sub
 
                 command.Execute(target);
 
-                messageBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>()), Times.Once);
+                messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
             }
         }
 
@@ -485,9 +478,6 @@ End Sub
                 AssertParserReady(state);
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m =>
-                    m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                        It.IsAny<MessageBoxIcon>())).Returns(DialogResult.OK);
 
                 var vm = new SearchResultsWindowViewModel();
                 var uiDispatcher = new Mock<IUiDispatcher>();
@@ -496,8 +486,7 @@ End Sub
 
                 command.Execute(target);
 
-                messageBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>()), Times.Once);
+                messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
             }
         }
 

diff --git a/RubberduckTests/Commands/RefactorCommandTests.cs b/RubberduckTests/Commands/RefactorCommandTests.cs
@@ -8,6 +8,7 @@
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.Commands
 {

diff --git a/RubberduckTests/Commands/UnitTestCommandTests.cs b/RubberduckTests/Commands/UnitTestCommandTests.cs
@@ -10,6 +10,7 @@
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.Commands
 {

diff --git a/RubberduckTests/QuickFixes/MoveFieldCloserToUsageQuickFixTests.cs b/RubberduckTests/QuickFixes/MoveFieldCloserToUsageQuickFixTests.cs
@@ -6,6 +6,7 @@
 using Rubberduck.Inspections.QuickFixes;
 using Rubberduck.UI;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.QuickFixes
 {

diff --git a/RubberduckTests/QuickFixes/RemoveUnusedParameterQuickFixTests.cs b/RubberduckTests/QuickFixes/RemoveUnusedParameterQuickFixTests.cs
@@ -6,6 +6,7 @@
 using Rubberduck.Inspections.QuickFixes;
 using Rubberduck.UI;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.QuickFixes
 {

diff --git a/RubberduckTests/Refactoring/ExtractInterfaceTests.cs b/RubberduckTests/Refactoring/ExtractInterfaceTests.cs
@@ -10,6 +10,7 @@
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
+using Rubberduck.UI.Refactorings.ExtractInterface;
 
 namespace RubberduckTests.Refactoring
 {
@@ -56,10 +57,6 @@ End Sub
 
                 //Specify Params to remove
                 var model = new ExtractInterfaceModel(state, qualifiedSelection);
-                foreach (var member in model.Members)
-                {
-                    member.IsSelected = true;
-                }
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -165,10 +162,6 @@ End Property
 
                 //Specify Params to remove
                 var model = new ExtractInterfaceModel(state, qualifiedSelection);
-                foreach (var member in model.Members)
-                {
-                    member.IsSelected = true;
-                }
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -253,13 +246,7 @@ End Function
 
                 //Specify Params to remove
                 var model = new ExtractInterfaceModel(state, qualifiedSelection);
-                foreach (var member in model.Members)
-                {
-                    if (!member.FullMemberSignature.Contains("Property"))
-                    {
-                        member.IsSelected = true;
-                    }
-                }
+                model.Members = model.Members.Where(member => !member.FullMemberSignature.Contains("Property")).ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -405,7 +392,7 @@ End Sub
 
                 //Specify Params to remove
                 var model = new ExtractInterfaceModel(state, qualifiedSelection);
-                model.Members.ElementAt(0).IsSelected = true;
+                model.Members = new[]{ model.Members.ElementAt(0) }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -437,7 +424,7 @@ public void Presenter_Reject_ReturnsNull()
                 var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
 
                 var model = new ExtractInterfaceModel(state, qualifiedSelection);
-                model.Members.ElementAt(0).IsSelected = true;
+                model.Members = new[] { model.Members.ElementAt(0) }.ToList();
 
                 var view = new Mock<IRefactoringDialog<ExtractInterfaceViewModel>>();
                 view.Setup(v => v.ViewModel).Returns(new ExtractInterfaceViewModel());