Final Attempt at #5810

Jonpix · Jonpix · commit ba2038d93a50 · 2021-06-15T21:41:36.000+01:00
diff --git a/Rubberduck.Core/UI/Command/Refactorings/Notifiers/PromoteToParameterFailedNotifier.cs b/Rubberduck.Core/UI/Command/Refactorings/Notifiers/PromoteToParameterFailedNotifier.cs
@@ -2,7 +2,7 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
-using Rubberduck.Refactorings.Exceptions.IntroduceParameter;
+using Rubberduck.Refactorings.Exceptions.PromoteToParameter;
 using Rubberduck.CodeAnalysis.Inspections.Extensions;
 
 namespace Rubberduck.UI.Command.Refactorings.Notifiers
@@ -13,15 +13,15 @@ public PromoteToParameterFailedNotifier(IMessageBox messageBox)
             : base(messageBox)
         { }
 
-        protected override string Caption => RefactoringsUI.IntroduceParameter_Caption;
+        protected override string Caption => RefactoringsUI.PromoteToParameter_Caption;
 
         protected override string Message(RefactoringException exception)
         {
             switch (exception)
             {
                 case TargetDeclarationIsNotContainedInAMethodException targetNotInMethod:
                     Logger.Warn(targetNotInMethod);
-                    return string.Format(RefactoringsUI.IntroduceParameterFailed_TargetNotContainedInMethod,
+                    return string.Format(RefactoringsUI.PromoteToParameterFailed_TargetNotContainedInMethod,
                         targetNotInMethod.TargetDeclaration.QualifiedName);
                 case InvalidDeclarationTypeException invalidDeclarationType:
                     Logger.Warn(invalidDeclarationType);
diff --git a/Rubberduck.Core/UI/Command/Refactorings/RefactorPromoteToParameterCommand.cs b/Rubberduck.Core/UI/Command/Refactorings/RefactorPromoteToParameterCommand.cs
@@ -1,6 +1,6 @@
 ﻿using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.Refactorings.IntroduceParameter;
+using Rubberduck.Refactorings.PromoteToParameter;
 using Rubberduck.UI.Command.Refactorings.Notifiers;
 using Rubberduck.VBEditor.Utility;
 
diff --git a/Rubberduck.Refactorings/Exceptions/PromoteToParameter/TargetDeclarationIsNotContainedInAMethodException.cs b/Rubberduck.Refactorings/Exceptions/PromoteToParameter/TargetDeclarationIsNotContainedInAMethodException.cs
@@ -1,6 +1,6 @@
 ﻿using Rubberduck.Parsing.Symbols;
 
-namespace Rubberduck.Refactorings.Exceptions.IntroduceParameter
+namespace Rubberduck.Refactorings.Exceptions.PromoteToParameter
 {
     public class TargetDeclarationIsNotContainedInAMethodException : InvalidTargetDeclarationException
     {
diff --git a/Rubberduck.Refactorings/PromoteToParameter/PromoteToParameterModel.cs b/Rubberduck.Refactorings/PromoteToParameter/PromoteToParameterModel.cs
@@ -1,6 +1,6 @@
 ﻿using Rubberduck.Parsing.Symbols;
 
-namespace Rubberduck.Refactorings.IntroduceParameter
+namespace Rubberduck.Refactorings.PromoteToParameter
 {
     public class PromoteToParameterModel : IRefactoringModel
     {
diff --git a/Rubberduck.Refactorings/PromoteToParameter/PromoteToParameterRefactoring.cs b/Rubberduck.Refactorings/PromoteToParameter/PromoteToParameterRefactoring.cs
@@ -1,14 +1,11 @@
 ﻿using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
-using Rubberduck.Refactorings.Exceptions.IntroduceParameter;
-using Rubberduck.Resources;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.Utility;
 
-namespace Rubberduck.Refactorings.IntroduceParameter
+namespace Rubberduck.Refactorings.PromoteToParameter
 {
     public class PromoteToParameterRefactoring : RefactoringBase
     {
diff --git a/Rubberduck.Refactorings/PromoteToParameter/PromoteToParameterRefactoringAction.cs b/Rubberduck.Refactorings/PromoteToParameter/PromoteToParameterRefactoringAction.cs
@@ -1,12 +1,12 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
-using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 
-namespace Rubberduck.Refactorings.IntroduceParameter
+
+namespace Rubberduck.Refactorings.PromoteToParameter
 {
     public class PromoteToParameterRefactoringAction : RefactoringActionBase<PromoteToParameterModel>
     {
diff --git a/Rubberduck.Resources/Menus/RubberduckMenus.Designer.cs b/Rubberduck.Resources/Menus/RubberduckMenus.Designer.cs
diff --git a/Rubberduck.Resources/Menus/RubberduckMenus.cs.resx b/Rubberduck.Resources/Menus/RubberduckMenus.cs.resx
@@ -189,7 +189,7 @@
   <data name="RefactorMenu_IntroduceField" xml:space="preserve">
     <value>Představit Po&amp;le</value>
   </data>
-  <data name="RefactorMenu_IntroduceParameter" xml:space="preserve">
+  <data name="RefactorMenu_PromoteToParameter" xml:space="preserve">
     <value>Představit &amp;Parametr</value>
   </data>
   <data name="RefactorMenu_MoveCloserToUsage" xml:space="preserve">
diff --git a/Rubberduck.Resources/Menus/RubberduckMenus.de.resx b/Rubberduck.Resources/Menus/RubberduckMenus.de.resx
@@ -204,7 +204,7 @@
   <data name="RefactorMenu_IntroduceField" xml:space="preserve">
     <value>&amp;Feld einführen</value>
   </data>
-  <data name="RefactorMenu_IntroduceParameter" xml:space="preserve">
+  <data name="RefactorMenu_PromoteToParameter" xml:space="preserve">
     <value>Parameter e&amp;inführen</value>
   </data>
   <data name="RefactorMenu_MoveCloserToUsage" xml:space="preserve">
diff --git a/Rubberduck.Resources/Menus/RubberduckMenus.es.resx b/Rubberduck.Resources/Menus/RubberduckMenus.es.resx
@@ -219,7 +219,7 @@
   <data name="RefactorMenu_IntroduceField" xml:space="preserve">
     <value>Introducir &amp;campo</value>
   </data>
-  <data name="RefactorMenu_IntroduceParameter" xml:space="preserve">
+  <data name="RefactorMenu_PromoteToParameter" xml:space="preserve">
     <value>Introducir &amp;Parametro</value>
   </data>
   <data name="RefactorMenu_MoveCloserToUsage" xml:space="preserve">
diff --git a/Rubberduck.Resources/Menus/RubberduckMenus.fr.resx b/Rubberduck.Resources/Menus/RubberduckMenus.fr.resx
@@ -204,7 +204,7 @@
   <data name="RefactorMenu_IntroduceField" xml:space="preserve">
     <value>Introduire un &amp;champ</value>
   </data>
-  <data name="RefactorMenu_IntroduceParameter" xml:space="preserve">
+  <data name="RefactorMenu_PromoteToParameter" xml:space="preserve">
     <value>Introduire un &amp;paramètre</value>
   </data>
   <data name="RefactorMenu_MoveCloserToUsage" xml:space="preserve">
diff --git a/Rubberduck.Resources/Menus/RubberduckMenus.it.resx b/Rubberduck.Resources/Menus/RubberduckMenus.it.resx
@@ -190,7 +190,7 @@
   <data name="RefactorMenu_IntroduceField" xml:space="preserve">
     <value>Introduci &amp;Campo</value>
   </data>
-  <data name="RefactorMenu_IntroduceParameter" xml:space="preserve">
+  <data name="RefactorMenu_PromoteToParameter" xml:space="preserve">
     <value>Introduci &amp;Parametro</value>
   </data>
   <data name="RefactorMenu_MoveCloserToUsage" xml:space="preserve">
diff --git a/Rubberduck.Resources/Menus/RubberduckMenus.resx b/Rubberduck.Resources/Menus/RubberduckMenus.resx
@@ -219,7 +219,7 @@
   <data name="RefactorMenu_IntroduceField" xml:space="preserve">
     <value>Introduce &amp;Field</value>
   </data>
-  <data name="RefactorMenu_IntroduceParameter" xml:space="preserve">
+  <data name="RefactorMenu_PromoteToParameter" xml:space="preserve">
     <value>Introduce &amp;Parameter</value>
   </data>
   <data name="RefactorMenu_MoveCloserToUsage" xml:space="preserve">
diff --git a/RubberduckTests/Commands/RefactorCommands/PromoteToParameterCommandTests.cs b/RubberduckTests/Commands/RefactorCommands/PromoteToParameterCommandTests.cs
@@ -1,9 +1,10 @@
-﻿using Moq;
+﻿using System.ComponentModel;
+using Moq;
 using NUnit.Framework;
 using Rubberduck.Interaction;
 using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.Refactorings.IntroduceParameter;
+using Rubberduck.Refactorings.PromoteToParameter;
 using Rubberduck.UI.Command;
 using Rubberduck.UI.Command.Refactorings;
 using Rubberduck.UI.Command.Refactorings.Notifiers;
@@ -46,7 +47,7 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
             var selectedDeclarationProvider = new SelectedDeclarationProvider(selectionService, state);
             var baseRefactoring = new PromoteToParameterRefactoringAction(state, rewritingManager);
             var refactoring = new PromoteToParameterRefactoring(baseRefactoring, msgBox, selectionService, selectedDeclarationProvider);
-            var notifier = new IntroduceParameterFailedNotifier(msgBox);
+            var notifier = new PromoteToParameterFailedNotifier(msgBox);
             return new RefactorPromoteToParameterCommand(refactoring, notifier, state, selectionService, selectedDeclarationProvider);
         }
 
diff --git a/RubberduckTests/Refactoring/PromoteToParameterTests.cs b/RubberduckTests/Refactoring/PromoteToParameterTests.cs
@@ -2,7 +2,6 @@
 using NUnit.Framework;
 using Moq;
 using Rubberduck.Parsing.Symbols;
-using Rubberduck.Refactorings.IntroduceParameter;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers;
 using RubberduckTests.Mocks;
@@ -11,7 +10,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Exceptions;
-using Rubberduck.Refactorings.Exceptions.IntroduceParameter;
+using Rubberduck.Refactorings.PromoteToParameter;
 using Rubberduck.VBEditor.Utility;
 
 namespace RubberduckTests.Refactoring

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Rubberduck.Parsing.Symbols;`
`2`	`2`
`3`		`-namespace Rubberduck.Refactorings.Exceptions.IntroduceParameter`
	`3`	`+namespace Rubberduck.Refactorings.Exceptions.PromoteToParameter`
`4`	`4`	`{`
`5`	`5`	`public class TargetDeclarationIsNotContainedInAMethodException : InvalidTargetDeclarationException`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Rubberduck.Parsing.Symbols;`
`2`	`2`
`3`		`-namespace Rubberduck.Refactorings.IntroduceParameter`
	`3`	`+namespace Rubberduck.Refactorings.PromoteToParameter`
`4`	`4`	`{`
`5`	`5`	`public class PromoteToParameterModel : IRefactoringModel`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.Linq;`
`3`		`-using Rubberduck.Parsing;`
`4`	`3`	`using Rubberduck.Parsing.Grammar;`
`5`	`4`	`using Rubberduck.Parsing.Rewriter;`
`6`	`5`	`using Rubberduck.Parsing.Symbols;`
`7`	`6`	`using Rubberduck.Parsing.VBA;`
`8`	`7`
`9`		`-namespace Rubberduck.Refactorings.IntroduceParameter`
	`8`	`+`
	`9`	`+namespace Rubberduck.Refactorings.PromoteToParameter`
`10`	`10`	`{`
`11`	`11`	`public class PromoteToParameterRefactoringAction : RefactoringActionBase<PromoteToParameterModel>`
`12`	`12`	`{`