Skip to content

Commit 87eb028

Browse files
retailcoderretailcoder
authored
Merge pull request #5810 from Jonpix/next
Changes "introduce parameter" to "promote to parameter", both in code and UI.
2 parents fcf3fe9 + 7361897 commit 87eb028

25 files changed

+128
-130
lines changed

‎Rubberduck.Core/UI/Command/MenuItems/ParentMenus/RefactoringsParentMenu.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public enum RefactoringsMenuItemDisplayOrder
2323
ReorderParameters,
2424
MoveCloserToUsage,
2525
EncapsulateField,
26-
IntroduceParameter,
26+
PromoteToParameter,
2727
IntroduceField,
2828
MoveToFolder,
2929
MoveContainingFolder,

‎Rubberduck.Core/UI/Command/MenuItems/RefactorIntroduceParameterCommandMenuItem.cs renamed to ‎Rubberduck.Core/UI/Command/MenuItems/RefactorPromoteToParameterCommandMenuItem.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
namespace Rubberduck.UI.Command.MenuItems
77
{
8-
public class RefactorIntroduceParameterCommandMenuItem : CommandMenuItemBase
8+
public class RefactorPromoteToParameterCommandMenuItem : CommandMenuItemBase
99
{
10-
public RefactorIntroduceParameterCommandMenuItem (RefactorIntroduceParameterCommand command)
10+
public RefactorPromoteToParameterCommandMenuItem (RefactorPromoteToParameterCommand command)
1111
: base(command)
1212
{
1313
}
1414

15-
public override string Key => "RefactorMenu_IntroduceParameter";
16-
public override int DisplayOrder => (int)RefactoringsMenuItemDisplayOrder.IntroduceParameter;
15+
public override string Key => "RefactorMenu_PromoteToParameter";
16+
public override int DisplayOrder => (int)RefactoringsMenuItemDisplayOrder.PromoteToParameter;
1717
public override bool BeginGroup => true;
1818

1919
public override Image Image => Resources.CommandBarIcons.PromoteLocal;

‎Rubberduck.Core/UI/Command/Refactorings/Notifiers/IntroduceParameterFailedNotifier.cs renamed to ‎Rubberduck.Core/UI/Command/Refactorings/Notifiers/PromoteToParameterFailedNotifier.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
using Rubberduck.Parsing.Symbols;
33
using Rubberduck.Refactorings;
44
using Rubberduck.Refactorings.Exceptions;
5-
using Rubberduck.Refactorings.Exceptions.IntroduceParameter;
5+
using Rubberduck.Refactorings.Exceptions.PromoteToParameter;
66
using Rubberduck.CodeAnalysis.Inspections.Extensions;
77

88
namespace Rubberduck.UI.Command.Refactorings.Notifiers
99
{
10-
public class IntroduceParameterFailedNotifier : RefactoringFailureNotifierBase
10+
public class PromoteToParameterFailedNotifier : RefactoringFailureNotifierBase
1111
{
12-
public IntroduceParameterFailedNotifier(IMessageBox messageBox)
12+
public PromoteToParameterFailedNotifier(IMessageBox messageBox)
1313
: base(messageBox)
1414
{ }
1515

16-
protected override string Caption => RefactoringsUI.IntroduceParameter_Caption;
16+
protected override string Caption => RefactoringsUI.PromoteToParameter_Caption;
1717

1818
protected override string Message(RefactoringException exception)
1919
{
2020
switch (exception)
2121
{
2222
case TargetDeclarationIsNotContainedInAMethodException targetNotInMethod:
2323
Logger.Warn(targetNotInMethod);
24-
return string.Format(RefactoringsUI.IntroduceParameterFailed_TargetNotContainedInMethod,
24+
return string.Format(RefactoringsUI.PromoteToParameterFailed_TargetNotContainedInMethod,
2525
targetNotInMethod.TargetDeclaration.QualifiedName);
2626
case InvalidDeclarationTypeException invalidDeclarationType:
2727
Logger.Warn(invalidDeclarationType);

‎Rubberduck.Core/UI/Command/Refactorings/RefactorIntroduceParameterCommand.cs renamed to ‎Rubberduck.Core/UI/Command/Refactorings/RefactorPromoteToParameterCommand.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
using Rubberduck.Parsing.Symbols;
22
using Rubberduck.Parsing.VBA;
3-
using Rubberduck.Refactorings.IntroduceParameter;
3+
using Rubberduck.Refactorings.PromoteToParameter;
44
using Rubberduck.UI.Command.Refactorings.Notifiers;
55
using Rubberduck.VBEditor.Utility;
66

77
namespace Rubberduck.UI.Command.Refactorings
88
{
9-
public class RefactorIntroduceParameterCommand : RefactorCodePaneCommandBase
9+
public class RefactorPromoteToParameterCommand : RefactorCodePaneCommandBase
1010
{
1111
private readonly RubberduckParserState _state;
1212
private readonly ISelectedDeclarationProvider _selectedDeclarationProvider;
1313

14-
public RefactorIntroduceParameterCommand (
15-
IntroduceParameterRefactoring refactoring,
16-
IntroduceParameterFailedNotifier introduceParameterFailedNotifier,
14+
public RefactorPromoteToParameterCommand (
15+
PromoteToParameterRefactoring refactoring,
16+
PromoteToParameterFailedNotifier introduceParameterFailedNotifier,
1717
RubberduckParserState state,
1818
ISelectionProvider selectionProvider,
1919
ISelectedDeclarationProvider selectedDeclarationProvider)

‎Rubberduck.Main/Root/RubberduckIoCInstaller.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ private Type[] RefactoringsMenuItems()
727727
typeof(RefactorExtractMethodCommandMenuItem),
728728
typeof(RefactorReorderParametersCommandMenuItem),
729729
typeof(RefactorRemoveParametersCommandMenuItem),
730-
typeof(RefactorIntroduceParameterCommandMenuItem),
730+
typeof(RefactorPromoteToParameterCommandMenuItem),
731731
typeof(RefactorIntroduceFieldCommandMenuItem),
732732
typeof(RefactorEncapsulateFieldCommandMenuItem),
733733
typeof(RefactorMoveCloserToUsageCommandMenuItem),

‎Rubberduck.Refactorings/Exceptions/IntroduceParameter/TargetDeclarationIsNotContainedInAMethodException.cs renamed to ‎Rubberduck.Refactorings/Exceptions/PromoteToParameter/TargetDeclarationIsNotContainedInAMethodException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Rubberduck.Parsing.Symbols;
22

3-
namespace Rubberduck.Refactorings.Exceptions.IntroduceParameter
3+
namespace Rubberduck.Refactorings.Exceptions.PromoteToParameter
44
{
55
public class TargetDeclarationIsNotContainedInAMethodException : InvalidTargetDeclarationException
66
{

‎Rubberduck.Refactorings/IntroduceParameter/IntroduceParameterModel.cs renamed to ‎Rubberduck.Refactorings/PromoteToParameter/PromoteToParameterModel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
using Rubberduck.Parsing.Symbols;
22

3-
namespace Rubberduck.Refactorings.IntroduceParameter
3+
namespace Rubberduck.Refactorings.PromoteToParameter
44
{
5-
public class IntroduceParameterModel : IRefactoringModel
5+
public class PromoteToParameterModel : IRefactoringModel
66
{
77
public Declaration Target { get; }
88
public ModuleBodyElementDeclaration EnclosingMember { get; }
99

10-
public IntroduceParameterModel(Declaration target, ModuleBodyElementDeclaration enclosingMember)
10+
public PromoteToParameterModel(Declaration target, ModuleBodyElementDeclaration enclosingMember)
1111
{
1212
Target = target;
1313
EnclosingMember = enclosingMember;

‎Rubberduck.Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs renamed to ‎Rubberduck.Refactorings/PromoteToParameter/PromoteToParameterRefactoring.cs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
using Rubberduck.Interaction;
22
using Rubberduck.Parsing.Symbols;
33
using Rubberduck.Parsing.VBA;
4-
using Rubberduck.Refactorings;
54
using Rubberduck.Refactorings.Exceptions;
6-
using Rubberduck.Refactorings.Exceptions.IntroduceParameter;
7-
using Rubberduck.Resources;
5+
using Rubberduck.Refactorings.Exceptions.PromoteToParameter;
86
using Rubberduck.VBEditor;
97
using Rubberduck.VBEditor.Utility;
108

11-
namespace Rubberduck.Refactorings.IntroduceParameter
9+
namespace Rubberduck.Refactorings.PromoteToParameter
1210
{
13-
public class IntroduceParameterRefactoring : RefactoringBase
11+
public class PromoteToParameterRefactoring : RefactoringBase
1412
{
15-
private readonly IRefactoringAction<IntroduceParameterModel> _refactoringAction;
13+
private readonly IRefactoringAction<PromoteToParameterModel> _refactoringAction;
1614
private readonly ISelectedDeclarationProvider _selectedDeclarationProvider;
1715
private readonly IMessageBox _messageBox;
1816

19-
public IntroduceParameterRefactoring(
20-
IntroduceParameterRefactoringAction refactoringAction,
17+
public PromoteToParameterRefactoring(
18+
PromoteToParameterRefactoringAction refactoringAction,
2119
IMessageBox messageBox,
2220
ISelectionProvider selectionProvider,
2321
ISelectedDeclarationProvider selectedDeclarationProvider)
@@ -71,10 +69,10 @@ private void PromoteVariable(Declaration target)
7169
_refactoringAction.Refactor(model);
7270
}
7371

74-
private IntroduceParameterModel Model(Declaration target)
72+
private PromoteToParameterModel Model(Declaration target)
7573
{
7674
var enclosingMember = _selectedDeclarationProvider.SelectedMember(target.QualifiedSelection);
77-
return new IntroduceParameterModel(target, enclosingMember);
75+
return new PromoteToParameterModel(target, enclosingMember);
7876
}
7977

8078
private bool PromptIfMethodImplementsInterface(Declaration targetVariable)
@@ -93,11 +91,11 @@ private bool PromptIfMethodImplementsInterface(Declaration targetVariable)
9391
return true;
9492
}
9593

96-
var message = string.Format(RefactoringsUI.IntroduceParameter_PromptIfTargetIsInterface,
94+
var message = string.Format(RefactoringsUI.PromoteToParameter_PromptIfTargetIsInterface,
9795
functionDeclaration.IdentifierName, interfaceImplementation.ComponentName,
9896
interfaceImplementation.IdentifierName);
9997

100-
return _messageBox.Question(message, RefactoringsUI.IntroduceParameter_Caption);
98+
return _messageBox.Question(message, RefactoringsUI.PromoteToParameter_Caption);
10199
}
102100
}
103101
}

‎Rubberduck.Refactorings/IntroduceParameter/IntroduceParameterRefactoringAction.cs renamed to ‎Rubberduck.Refactorings/PromoteToParameter/PromoteToParameterRefactoringAction.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,20 @@
66
using Rubberduck.Parsing.Symbols;
77
using Rubberduck.Parsing.VBA;
88

9-
namespace Rubberduck.Refactorings.IntroduceParameter
9+
10+
namespace Rubberduck.Refactorings.PromoteToParameter
1011
{
11-
public class IntroduceParameterRefactoringAction : RefactoringActionBase<IntroduceParameterModel>
12+
public class PromoteToParameterRefactoringAction : RefactoringActionBase<PromoteToParameterModel>
1213
{
1314
private readonly IDeclarationFinderProvider _declarationFinderProvider;
1415

15-
public IntroduceParameterRefactoringAction(IDeclarationFinderProvider declarationFinderProvider, IRewritingManager rewritingManager)
16+
public PromoteToParameterRefactoringAction(IDeclarationFinderProvider declarationFinderProvider, IRewritingManager rewritingManager)
1617
: base(rewritingManager)
1718
{
1819
_declarationFinderProvider = declarationFinderProvider;
1920
}
2021

21-
protected override void Refactor(IntroduceParameterModel model, IRewriteSession rewriteSession)
22+
protected override void Refactor(PromoteToParameterModel model, IRewriteSession rewriteSession)
2223
{
2324
var target = model.Target;
2425
UpdateSignature(target, model.EnclosingMember, rewriteSession);

‎Rubberduck.Refactorings/RefactoringsUI.Designer.cs

Lines changed: 28 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)