Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions RetailCoder.VBE/Rubberduck.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,8 @@
<Compile Include="UI\Command\MenuItems\RefactorExtractMethodCommandMenuItem.cs" />
<Compile Include="UI\Command\MenuItems\ParentMenus\RefactoringsParentMenu.cs" />
<Compile Include="UI\Command\MenuItems\RefactorRemoveParametersCommandMenuItem.cs" />
<Compile Include="UI\Command\Refactorings\RefactorRenameParametersCommand.cs" />
<Compile Include="UI\Command\Refactorings\RefactorReorderParametersCommand.cs" />
<Compile Include="UI\Command\RefactorRenameCommand.cs" />
<Compile Include="UI\Command\RefactorReorderParametersCommand.cs" />
<Compile Include="UI\Command\MenuItems\RefactorReorderParametersCommandMenuItem.cs" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
using Microsoft.Vbe.Interop;
using Rubberduck.Parsing;
using Rubberduck.VBEditor;
using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
using System.Runtime.InteropServices;
using Rubberduck.Parsing.Symbols;
using Rubberduck.Refactorings.Rename;
using Rubberduck.UI.Refactorings;

namespace Rubberduck.UI.Command.Refactorings
{
[ComVisible(false)]
public class RefactorRenameParametersCommand : RefactorCommandBase
{
private readonly ICodePaneWrapperFactory _wrapperWrapperFactory;

public RefactorRenameParametersCommand(VBE vbe, IRubberduckParser parser, IActiveCodePaneEditor editor, ICodePaneWrapperFactory wrapperWrapperFactory)
: base (vbe, parser, editor)
{
_wrapperWrapperFactory = wrapperWrapperFactory;
}

public override void Execute(object parameter)
{
if (Vbe.ActiveCodePane == null)
{
return;
}
var codePane = _wrapperWrapperFactory.Create(Vbe.ActiveCodePane);
var selection = new QualifiedSelection(new QualifiedModuleName(codePane.CodeModule.Parent), codePane.Selection);
// duplicates ReorderParameters Implementation until here... extract common method?
// TryGetQualifiedSelection?
var progress = new ParsingProgressPresenter();
var result = progress.Parse(Parser, Vbe.ActiveVBProject);

using (var view = new RenameDialog())
{
var factory = new RenamePresenterFactory(Vbe, view, result, new MessageBox(), _wrapperWrapperFactory);
var refactoring = new RenameRefactoring(factory, Editor, new MessageBox());

var target = parameter as Declaration;
if (target == null)
{
refactoring.Refactor();
}
else
{
refactoring.Refactor(target);
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
using System.Runtime.InteropServices;
using Microsoft.Vbe.Interop;
using Rubberduck.Parsing;
using Rubberduck.Refactorings.ReorderParameters;
using Rubberduck.UI.Refactorings;
using Rubberduck.VBEditor;
using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;

namespace Rubberduck.UI.Command.Refactorings
{
[ComVisible(false)]
class RefactorReorderParametersCommand : RefactorCommandBase
{
private readonly ICodePaneWrapperFactory _wrapperWrapperFactory;

public RefactorReorderParametersCommand(VBE vbe, IRubberduckParser parser, IActiveCodePaneEditor editor, ICodePaneWrapperFactory wrapperWrapperFactory)
: base (vbe, parser, editor)
{
_wrapperWrapperFactory = wrapperWrapperFactory;
}

public override void Execute(object parameter)
{
if (Vbe.ActiveCodePane == null)
{
return;
}
var codePane = _wrapperWrapperFactory.Create(Vbe.ActiveCodePane);
var selection = new QualifiedSelection(new QualifiedModuleName(codePane.CodeModule.Parent), codePane.Selection);
// duplicates ReorderParameters Implementation until here... extract common method?
// TryGetQualifiedSelection?
var progress = new ParsingProgressPresenter();
var result = progress.Parse(Parser, Vbe.ActiveVBProject);

using (var view = new ReorderParametersDialog())
{
var factory = new ReorderParametersPresenterFactory(Editor, view, result, new MessageBox());
var refactoring = new ReorderParametersRefactoring(factory, Editor, new MessageBox());
refactoring.Refactor(selection);
}
}
}
}
8 changes: 1 addition & 7 deletions RetailCoder.VBE/UI/RefactorMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -212,13 +212,7 @@ private void OnRenameButtonClick(CommandBarButton Ctrl, ref bool CancelDefault)
[SuppressMessage("ReSharper", "InconsistentNaming")]
private void OnReorderParametersButtonClick(CommandBarButton Ctrl, ref bool CancelDefault)
{
if (IDE.ActiveCodePane == null)
{
return;
}
var codePane = _wrapperWrapperFactory.Create(IDE.ActiveCodePane);
var selection = new QualifiedSelection(new QualifiedModuleName(codePane.CodeModule.Parent), codePane.Selection);
ReorderParameters(selection);
new RefactorReorderParametersCommand(IDE, _parser, _editor, _wrapperWrapperFactory).Execute(null);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not needed. the whole class is obsolete, dead code ;-)

}

[SuppressMessage("ReSharper", "InconsistentNaming")]
Expand Down