Merge pull request #4006 from Vogel612/project-splicing

Splice Off Rubberduck.Refactorings from Rubberduck.Core, see #3862
rubberduck-vba · May 26, 2018 · 960fb85 · 960fb85
2 parents 5db0eab + 3fedf3d
commit 960fb85
Show file tree

Hide file tree

Showing 105 changed files with 990 additions and 762 deletions.
diff --git a/Rubberduck.API/app.config b/Rubberduck.API/app.config
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+        <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Rubberduck.Core/App.cs b/Rubberduck.Core/App.cs
@@ -3,13 +3,12 @@
 using Infralution.Localization.Wpf;
 using NLog;
 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 System.Windows.Forms;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
@@ -155,7 +154,8 @@ private void LoadConfig()
             catch (CultureNotFoundException exception)
             {
                 Logger.Error(exception, "Error Setting Culture for Rubberduck");
-                _messageBox.Show(exception.Message, "Rubberduck", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                // not accessing resources here, because setting resource culture literally just failed.
+                _messageBox.NotifyError(exception.Message, "Rubberduck");
                 _config.UserSettings.GeneralSettings.Language.Code = currentCulture.Name;
                 _configService.SaveConfiguration(_config);
             }
@@ -190,9 +190,7 @@ private void CheckForLegacyIndenterSettings()
                 {
                     return;
                 }
-                var response =
-                    _messageBox.Show(Resources.RubberduckUI.SmartIndenter_LegacySettingPrompt, "Rubberduck", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-                if (response == DialogResult.Yes)
+                if (_messageBox.Question(Resources.RubberduckUI.SmartIndenter_LegacySettingPrompt, "Rubberduck"))
                 {
                     Logger.Trace("Attempting to load legacy Smart Indenter settings.");
                     _config.UserSettings.IndenterSettings.LoadLegacyFromRegistry();

diff --git a/Rubberduck.Core/Properties/AssemblyInfo.cs b/Rubberduck.Core/Properties/AssemblyInfo.cs
@@ -14,7 +14,9 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: InternalsVisibleTo("Rubberduck.Main")]
+// internals visible for testing and mocking
 [assembly: InternalsVisibleTo("RubberduckTests")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
 
 // Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar 
 // für COM-Komponenten.  Wenn Sie auf einen Typ in dieser Assembly von 

diff --git a/Rubberduck.Core/Rubberduck.Core.csproj b/Rubberduck.Core/Rubberduck.Core.csproj
diff --git a/Rubberduck.Core/UI/CodeExplorer/Commands/RemoveCommand.cs b/Rubberduck.Core/UI/CodeExplorer/Commands/RemoveCommand.cs
@@ -3,7 +3,9 @@
 using System.Linq;
 using System.Windows.Forms;
 using NLog;
+using Rubberduck.Interaction;
 using Rubberduck.Navigation.CodeExplorer;
+using Rubberduck.Resources.CodeExplorer;
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.SafeComWrappers;
@@ -54,16 +56,15 @@ protected override bool EvaluateCanExecute(object parameter)
 
         protected override void OnExecute(object parameter)
         {
-            var message = string.Format("Do you want to export '{0}' before removing?", ((CodeExplorerComponentViewModel)parameter).Name);
-            var result = _messageBox.Show(message, "Rubberduck Export Prompt", MessageBoxButtons.YesNoCancel,
-                    MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button1);
+            var message = string.Format(CodeExplorerUI.ExportBeforeRemove_Prompt, ((CodeExplorerComponentViewModel)parameter).Name);
+            var result = _messageBox.Confirm(message, CodeExplorerUI.ExportBeforeRemove_Caption, true);
 
-            if (result == DialogResult.Cancel)
+            if (!result.HasValue)
             {
                 return;
             }
 
-            if (result == DialogResult.Yes && !ExportFile((CodeExplorerComponentViewModel)parameter))
+            if (result.Value && !ExportFile((CodeExplorerComponentViewModel)parameter))
             {
                 return;
             }

diff --git a/Rubberduck.Core/UI/CodeExplorer/Commands/RenameCommand.cs b/Rubberduck.Core/UI/CodeExplorer/Commands/RenameCommand.cs
@@ -1,5 +1,6 @@
 using System;
 using NLog;
+using Rubberduck.Interaction;
 using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Rename;

diff --git a/Rubberduck.Core/UI/Command/AddTestModuleCommand.cs b/Rubberduck.Core/UI/Command/AddTestModuleCommand.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using NLog;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Settings;
 using Rubberduck.UnitTesting;
@@ -236,7 +237,7 @@ protected override void OnExecute(object parameter)
             }
             catch (Exception ex)
             {
-                _messageBox.Show(TestExplorer.Command_AddTestModule_Error);
+                _messageBox.Message(TestExplorer.Command_AddTestModule_Error);
                 Logger.Warn("Unable to add test module. An exception was thrown.");
                 Logger.Warn(ex);
             }

diff --git a/Rubberduck.Core/UI/Command/FindAllImplementationsCommand.cs b/Rubberduck.Core/UI/Command/FindAllImplementationsCommand.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Windows.Forms;
 using NLog;
 using Rubberduck.Common;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.UIContext;
@@ -133,7 +133,7 @@ protected override void OnExecute(object parameter)
             var viewModel = CreateViewModel(declaration);
             if (!viewModel.SearchResults.Any())
             {
-                _messageBox.Show(string.Format(RubberduckUI.AllReferences_NoneFound, declaration.IdentifierName), RubberduckUI.Rubberduck, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                _messageBox.NotifyWarn(string.Format(RubberduckUI.AllReferences_NoneFound, declaration.IdentifierName), RubberduckUI.Rubberduck);
                 return;
             }
 

diff --git a/Rubberduck.Core/UI/Command/FindAllReferencesCommand.cs b/Rubberduck.Core/UI/Command/FindAllReferencesCommand.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Windows.Forms;
 using NLog;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
@@ -137,7 +137,7 @@ protected override void OnExecute(object parameter)
             var viewModel = CreateViewModel(declaration);
             if (!viewModel.SearchResults.Any())
             {
-                _messageBox.Show(string.Format(RubberduckUI.AllReferences_NoneFound, declaration.IdentifierName), RubberduckUI.Rubberduck, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                _messageBox.NotifyWarn(string.Format(RubberduckUI.AllReferences_NoneFound, declaration.IdentifierName), RubberduckUI.Rubberduck);
                 return;
             }
 

diff --git a/Rubberduck.Core/UI/Command/Refactorings/CodePaneRefactorRenameCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/CodePaneRefactorRenameCommand.cs
@@ -1,4 +1,5 @@
 using System.Runtime.InteropServices;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Rename;

diff --git a/Rubberduck.Core/UI/Command/Refactorings/FormDesignerRefactorRenameCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/FormDesignerRefactorRenameCommand.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Runtime.InteropServices;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Rename;

diff --git a/Rubberduck.Core/UI/Command/Refactorings/ProjectExplorerRefactorRenameCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/ProjectExplorerRefactorRenameCommand.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Runtime.InteropServices;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Rename;

diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorExtractInterfaceCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorExtractInterfaceCommand.cs
@@ -2,12 +2,14 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using Antlr4.Runtime;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.ExtractInterface;
 using Rubberduck.UI.Refactorings;
+using Rubberduck.UI.Refactorings.ExtractInterface;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.Command.Refactorings

diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorImplementInterfaceCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorImplementInterfaceCommand.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using Rubberduck.Common;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.ImplementInterface;

diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorIntroduceFieldCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorIntroduceFieldCommand.cs
@@ -1,8 +1,8 @@
 using Rubberduck.Common;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.IntroduceField;
-using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.Command.Refactorings

diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorIntroduceParameterCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorIntroduceParameterCommand.cs
@@ -1,4 +1,5 @@
 using Rubberduck.Common;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.IntroduceParameter;

diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorMoveCloserToUsageCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorMoveCloserToUsageCommand.cs
@@ -1,8 +1,8 @@
 using System.Linq;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.MoveCloserToUsage;
-using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.Command.Refactorings

diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorRemoveParametersCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorRemoveParametersCommand.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using Rubberduck.Common;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.RemoveParameters;

diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorReorderParametersCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorReorderParametersCommand.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using Rubberduck.Common;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.ReorderParameters;
 using Rubberduck.UI.Refactorings.ReorderParameters;
-using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.Command.Refactorings

diff --git a/Rubberduck.Core/UI/Command/ReparseCommand.cs b/Rubberduck.Core/UI/Command/ReparseCommand.cs
@@ -4,6 +4,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using NLog;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
@@ -70,9 +71,7 @@ private bool VerifyCompileOnDemand()
         {
             if (_vbeSettings.CompileOnDemand)
             {
-                return DialogResult.Yes == _messageBox.Show(RubberduckUI.Command_Reparse_CompileOnDemandEnabled,
-                           RubberduckUI.Command_Reparse_CompileOnDemandEnabled_Caption, MessageBoxButtons.YesNo,
-                           MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button2);
+                return _messageBox.ConfirmYesNo(RubberduckUI.Command_Reparse_CompileOnDemandEnabled, RubberduckUI.Command_Reparse_CompileOnDemandEnabled_Caption, false);
             }
 
             return true;
@@ -107,12 +106,12 @@ private bool PromptUserToContinue(List<string> failedNames)
         {
             var formattedList = string.Concat(Environment.NewLine, Environment.NewLine,
                 string.Join(Environment.NewLine, failedNames));
-            var result = _messageBox.Show(
+            // FIXME using Exclamation instead of warning now... 
+            return _messageBox.ConfirmYesNo(
                 string.Format(RubberduckUI.Command_Reparse_CannotCompile,
                     formattedList),
-                RubberduckUI.Command_Reparse_CannotCompile_Caption, MessageBoxButtons.YesNo,
-                MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2);
-            return result == DialogResult.Yes;
+                RubberduckUI.Command_Reparse_CannotCompile_Caption, false);
+
         }
     }
 }
diff --git a/Rubberduck.Core/UI/Command/VersionCheckCommand.cs b/Rubberduck.Core/UI/Command/VersionCheckCommand.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Diagnostics;
-using System.Windows.Forms;
 using NLog;
+using Rubberduck.Interaction;
 using Rubberduck.VersionCheck;
 using Rubberduck.Resources;
 
@@ -55,8 +55,7 @@ await _versionCheck
         private void PromptAndBrowse(Version latestVersion)
         {
             var prompt = string.Format(RubberduckUI.VersionCheck_NewVersionAvailable, latestVersion);
-            if (_prompt.Show(prompt, RubberduckUI.Rubberduck, MessageBoxButtons.YesNo, MessageBoxIcon.Information) ==
-                DialogResult.No)
+            if (!_prompt.Question(prompt, RubberduckUI.Rubberduck))
             {
                 return;
             }