Skip to content

Commit 1991689

Browse files
Hosch250Hosch250
committed
Commit
1 parent be3d98c commit 1991689

11 files changed

+361
-377
lines changed

‎RetailCoder.VBE/Inspections/QuickFixes/RemoveUnusedParameterQuickFix.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ public RemoveUnusedParameterQuickFix(ParserRuleContext context, QualifiedSelecti
2727

2828
public override void Fix()
2929
{
30-
using (var dialog = new RemoveParametersDialog())
31-
{
32-
var refactoring = new RemoveParametersRefactoring(_vbe,
33-
new RemoveParametersPresenterFactory(_vbe, dialog, _state, _messageBox));
30+
//using (var dialog = new RemoveParametersDialog())
31+
//{
32+
// var refactoring = new RemoveParametersRefactoring(_vbe,
33+
// new RemoveParametersPresenterFactory(_vbe, dialog, _state, _messageBox));
3434

35-
refactoring.QuickFix(_state, Selection);
36-
}
35+
// refactoring.QuickFix(_state, Selection);
36+
//}
3737
}
3838
}
3939
}

‎RetailCoder.VBE/Rubberduck.csproj

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,10 @@
477477
<Compile Include="UI\Refactorings\AssignedByValParameterQuickFixDialogFactory.cs" />
478478
<Compile Include="UI\Refactorings\IAssignedByValParameterQuickFixDialog.cs" />
479479
<Compile Include="UI\Refactorings\IAssignedByValParameterQuickFixDialogFactory.cs" />
480+
<Compile Include="UI\Refactorings\RemoveParameters\RemoveParametersView.xaml.cs">
481+
<DependentUpon>RemoveParametersView.xaml</DependentUpon>
482+
</Compile>
483+
<Compile Include="UI\Refactorings\RemoveParameters\RemoveParametersViewModel.cs" />
480484
<Compile Include="UI\SelectionChangeService.cs" />
481485
<Compile Include="VersionCheck\IVersionCheck.cs" />
482486
<Compile Include="UI\Command\MenuItems\CommandBars\AppCommandBarBase.cs" />
@@ -864,10 +868,10 @@
864868
<DependentUpon>SimpleListControl.cs</DependentUpon>
865869
</Compile>
866870
<Compile Include="UI\IdentifierReferences\IdentifierReferencesListDockablePresenter.cs" />
867-
<Compile Include="UI\Refactorings\RemoveParametersDialog.cs">
871+
<Compile Include="UI\Refactorings\RemoveParameters\RemoveParametersDialog.cs">
868872
<SubType>Form</SubType>
869873
</Compile>
870-
<Compile Include="UI\Refactorings\RemoveParametersDialog.Designer.cs">
874+
<Compile Include="UI\Refactorings\RemoveParameters\RemoveParametersDialog.Designer.cs">
871875
<DependentUpon>RemoveParametersDialog.cs</DependentUpon>
872876
</Compile>
873877
<Compile Include="Refactorings\ExtractMethod\ExtractMethodPresenter.cs" />
@@ -1110,7 +1114,7 @@
11101114
<EmbeddedResource Include="UI\Refactorings\ExtractMethodDialog.resx">
11111115
<DependentUpon>ExtractMethodDialog.cs</DependentUpon>
11121116
</EmbeddedResource>
1113-
<EmbeddedResource Include="UI\Refactorings\RemoveParametersDialog.resx">
1117+
<EmbeddedResource Include="UI\Refactorings\RemoveParameters\RemoveParametersDialog.resx">
11141118
<DependentUpon>RemoveParametersDialog.cs</DependentUpon>
11151119
</EmbeddedResource>
11161120
<EmbeddedResource Include="UI\Refactorings\RenameDialog.resx">
@@ -1473,6 +1477,10 @@
14731477
<SubType>Designer</SubType>
14741478
<Generator>MSBuild:Compile</Generator>
14751479
</Page>
1480+
<Page Include="UI\Refactorings\RemoveParameters\RemoveParametersView.xaml">
1481+
<Generator>MSBuild:Compile</Generator>
1482+
<SubType>Designer</SubType>
1483+
</Page>
14761484
<Page Include="UI\RegexAssistant\RegexAssistant.xaml">
14771485
<Generator>MSBuild:Compile</Generator>
14781486
<SubType>Designer</SubType>

‎RetailCoder.VBE/UI/Command/Refactorings/RefactorRemoveParametersCommand.cs

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -34,43 +34,41 @@ public RefactorRemoveParametersCommand(IVBE vbe, RubberduckParserState state, IM
3434

3535
protected override bool CanExecuteImpl(object parameter)
3636
{
37+
return true;
3738
var pane = Vbe.ActiveCodePane;
39+
if (pane.IsWrappingNullReference || _state.Status != ParserState.Ready)
3840
{
39-
if (pane.IsWrappingNullReference || _state.Status != ParserState.Ready)
40-
{
41-
return false;
42-
}
43-
44-
var selection = pane.GetQualifiedSelection();
45-
var member = _state.AllUserDeclarations.FindTarget(selection.Value, ValidDeclarationTypes);
46-
if (member == null)
47-
{
48-
return false;
49-
}
41+
return false;
42+
}
5043

51-
var parameters = _state.AllUserDeclarations.Where(item => item.DeclarationType == DeclarationType.Parameter && member.Equals(item.ParentScopeDeclaration)).ToList();
52-
return member.DeclarationType == DeclarationType.PropertyLet || member.DeclarationType == DeclarationType.PropertySet
53-
? parameters.Count > 1
54-
: parameters.Any();
44+
var selection = pane.GetQualifiedSelection();
45+
var member = _state.AllUserDeclarations.FindTarget(selection.Value, ValidDeclarationTypes);
46+
if (member == null)
47+
{
48+
return false;
5549
}
50+
51+
var parameters = _state.AllUserDeclarations.Where(item => item.DeclarationType == DeclarationType.Parameter && member.Equals(item.ParentScopeDeclaration)).ToList();
52+
return member.DeclarationType == DeclarationType.PropertyLet || member.DeclarationType == DeclarationType.PropertySet
53+
? parameters.Count > 1
54+
: parameters.Any();
5655
}
5756

5857
protected override void ExecuteImpl(object parameter)
5958
{
60-
var pane = Vbe.ActiveCodePane;
59+
/*var pane = Vbe.ActiveCodePane;
60+
if (pane.IsWrappingNullReference)
6161
{
62-
if (pane.IsWrappingNullReference)
63-
{
64-
return;
65-
}
62+
return;
63+
}
6664
67-
var selection = pane.GetQualifiedSelection();
68-
using (var view = new RemoveParametersDialog())
69-
{
70-
var factory = new RemoveParametersPresenterFactory(Vbe, view, _state, _msgbox);
71-
var refactoring = new RemoveParametersRefactoring(Vbe, factory);
72-
refactoring.Refactor(selection.Value);
73-
}
65+
var selection = pane.GetQualifiedSelection();*/
66+
using (var view = new RemoveParametersDialog())
67+
{
68+
//var factory = new RemoveParametersPresenterFactory(Vbe, view, _state, _msgbox);
69+
//var refactoring = new RemoveParametersRefactoring(Vbe, factory);
70+
//refactoring.Refactor(selection.Value);
71+
view.ShowDialog();
7472
}
7573
}
7674
}

‎RetailCoder.VBE/UI/Refactorings/RemoveParameters/RemoveParametersDialog.Designer.cs

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

‎RetailCoder.VBE/UI/Refactorings/RemoveParameters/RemoveParametersDialog.cs

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Drawing;
4+
using System.Linq;
5+
using System.Windows.Forms;
6+
using Rubberduck.Refactorings.RemoveParameters;
7+
8+
namespace Rubberduck.UI.Refactorings
9+
{
10+
public partial class RemoveParametersDialog : Form//, IRemoveParametersDialog
11+
{
12+
public RemoveParametersDialog()
13+
{
14+
InitializeComponent();
15+
}
16+
17+
//public List<Parameter> Parameters { get; set; }
18+
//private Parameter _selectedItem;
19+
20+
//public RemoveParametersDialog()
21+
//{
22+
// InitializeComponent();
23+
// InitializeCaptions();
24+
25+
// MethodParametersGrid.SelectionChanged += MethodParametersGrid_SelectionChanged;
26+
// MethodParametersGrid.CellMouseDoubleClick += MethodParametersGrid_CellMouseDoubleClick;
27+
//}
28+
29+
//private void InitializeCaptions()
30+
//{
31+
// OkButton.Text = RubberduckUI.OK;
32+
// CancelDialogButton.Text = RubberduckUI.CancelButtonText;
33+
// Text = RubberduckUI.RemoveParamsDialog_Caption;
34+
// TitleLabel.Text = RubberduckUI.RemoveParamsDialog_TitleText;
35+
// InstructionsLabel.Text = RubberduckUI.RemoveParamsDialog_InstructionsLabelText;
36+
// RemoveButton.Text = RubberduckUI.Remove;
37+
// RestoreButton.Text = RubberduckUI.Restore;
38+
//}
39+
40+
//private void MethodParametersGrid_SelectionChanged(object sender, EventArgs e)
41+
//{
42+
// SelectionChanged();
43+
//}
44+
45+
//public void InitializeParameterGrid()
46+
//{
47+
// MethodParametersGrid.AutoGenerateColumns = false;
48+
// MethodParametersGrid.Columns.Clear();
49+
// MethodParametersGrid.DataSource = Parameters;
50+
// MethodParametersGrid.AlternatingRowsDefaultCellStyle.BackColor = Color.Lavender;
51+
// MethodParametersGrid.MultiSelect = false;
52+
// MethodParametersGrid.AllowUserToResizeRows = false;
53+
// MethodParametersGrid.AllowDrop = true;
54+
// MethodParametersGrid.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
55+
56+
// var column = new DataGridViewTextBoxColumn
57+
// {
58+
// Name = "Parameter",
59+
// DataPropertyName = "Name",
60+
// HeaderText = RubberduckUI.Parameter,
61+
// ReadOnly = true,
62+
// AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
63+
// };
64+
65+
// MethodParametersGrid.Columns.Add(column);
66+
//}
67+
68+
//private void MarkAsRemovedParam()
69+
//{
70+
// if (_selectedItem != null)
71+
// {
72+
// var indexOfRemoved = Parameters.FindIndex(item => item == _selectedItem);
73+
74+
// Parameters.ElementAt(indexOfRemoved).IsRemoved = true;
75+
// MethodParametersGrid.Rows[indexOfRemoved].DefaultCellStyle.Font = new Font(Font, FontStyle.Strikeout);
76+
77+
// SelectionChanged();
78+
// }
79+
//}
80+
81+
//private void MarkAsRestoredParam() // really just un-mark as removed, but [tag:naming-is-hard]
82+
//{
83+
// if (_selectedItem != null)
84+
// {
85+
// var indexOfRemoved = Parameters.FindIndex(item => item == _selectedItem);
86+
87+
// Parameters.ElementAt(indexOfRemoved).IsRemoved = false;
88+
// MethodParametersGrid.Rows[indexOfRemoved].DefaultCellStyle.Font = new Font(Font, FontStyle.Regular);
89+
90+
// SelectionChanged();
91+
// }
92+
//}
93+
94+
//private void RemoveButtonClicked(object sender, EventArgs e)
95+
//{
96+
// MarkAsRemovedParam();
97+
//}
98+
99+
//private void RestoreButtonClicked(object sender, EventArgs e)
100+
//{
101+
// MarkAsRestoredParam();
102+
//}
103+
104+
//private void MethodParametersGrid_CellMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e)
105+
//{
106+
// if (_selectedItem == null) { return; }
107+
108+
// if (_selectedItem.IsRemoved)
109+
// {
110+
// MarkAsRestoredParam();
111+
// }
112+
// else
113+
// {
114+
// MarkAsRemovedParam();
115+
// }
116+
//}
117+
118+
//private int GetFirstSelectedRowIndex(int index)
119+
//{
120+
// return MethodParametersGrid.SelectedRows[index].Index;
121+
//}
122+
123+
//private void SelectionChanged()
124+
//{
125+
// _selectedItem = MethodParametersGrid.SelectedRows.Count == 0
126+
// ? null
127+
// : (Parameter)MethodParametersGrid.SelectedRows[0].DataBoundItem;
128+
129+
// RemoveButton.Enabled = _selectedItem != null && !_selectedItem.IsRemoved;
130+
// RestoreButton.Enabled = _selectedItem != null && _selectedItem.IsRemoved;
131+
//}
132+
}
133+
}

‎RetailCoder.VBE/UI/Refactorings/RemoveParametersDialog.resx renamed to ‎RetailCoder.VBE/UI/Refactorings/RemoveParameters/RemoveParametersDialog.resx

File renamed without changes.

0 commit comments

Comments
 (0)