Skip to content

Commit 189b5a3

Browse files
MDoernerMDoerner
committed
Merge branch 'next' into CureBangNotationParsing
2 parents a7b5378 + b9561b7 commit 189b5a3

File tree

123 files changed

+3507
-4562
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+3507
-4562
lines changed

‎Rubberduck.CodeAnalysis/QuickFixes/EncapsulateFieldQuickFix.cs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,36 @@
33
using Rubberduck.Parsing.Inspections.Abstract;
44
using Rubberduck.Parsing.Rewriter;
55
using Rubberduck.Parsing.VBA;
6+
using Rubberduck.Refactorings;
67
using Rubberduck.Refactorings.EncapsulateField;
78
using Rubberduck.SmartIndenter;
8-
using Rubberduck.UI.Refactorings.EncapsulateField;
99
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
1010

1111
namespace Rubberduck.Inspections.QuickFixes
1212
{
1313
public sealed class EncapsulateFieldQuickFix : QuickFixBase
1414
{
15-
private readonly IVBE _vbe;
1615
private readonly RubberduckParserState _state;
16+
private readonly IVBE _vbe;
1717
private readonly IRewritingManager _rewritingManager;
1818
private readonly IIndenter _indenter;
19-
20-
public EncapsulateFieldQuickFix(IVBE vbe, RubberduckParserState state, IIndenter indenter, IRewritingManager rewritingManager)
19+
private readonly IRefactoringPresenterFactory _factory;
20+
21+
public EncapsulateFieldQuickFix(RubberduckParserState state, IVBE vbe, IIndenter indenter, IRefactoringPresenterFactory factory, IRewritingManager rewritingManager)
2122
: base(typeof(EncapsulatePublicFieldInspection))
2223
{
23-
_vbe = vbe;
2424
_state = state;
25+
_vbe = vbe;
2526
_rewritingManager = rewritingManager;
2627
_indenter = indenter;
28+
_factory = factory;
2729
}
2830

2931
//The rewriteSession is optional since it is not used in this particular quickfix because it is a refactoring quickfix.
3032
public override void Fix(IInspectionResult result, IRewriteSession rewriteSession = null)
3133
{
32-
using (var view = new EncapsulateFieldDialog(new EncapsulateFieldViewModel(_state, _indenter)))
33-
{
34-
var factory = new EncapsulateFieldPresenterFactory(_vbe, _state, view);
35-
var refactoring = new EncapsulateFieldRefactoring(_vbe, _indenter, factory, _rewritingManager);
36-
refactoring.Refactor(result.Target);
37-
}
34+
var refactoring = new EncapsulateFieldRefactoring(_state, _vbe, _indenter, _factory, _rewritingManager);
35+
refactoring.Refactor(result.Target);
3836
}
3937

4038
public override string Description(IInspectionResult result)

‎Rubberduck.CodeAnalysis/QuickFixes/RemoveUnusedParameterQuickFix.cs

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
using Rubberduck.Inspections.Abstract;
22
using Rubberduck.Inspections.Concrete;
3-
using Rubberduck.Interaction;
43
using Rubberduck.Parsing.Inspections.Abstract;
54
using Rubberduck.Parsing.Rewriter;
65
using Rubberduck.Parsing.VBA;
6+
using Rubberduck.Refactorings;
77
using Rubberduck.Refactorings.RemoveParameters;
8-
using Rubberduck.UI.Refactorings.RemoveParameters;
98
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
109

1110
namespace Rubberduck.Inspections.QuickFixes
@@ -14,30 +13,23 @@ public sealed class RemoveUnusedParameterQuickFix : QuickFixBase
1413
{
1514
private readonly IVBE _vbe;
1615
private readonly RubberduckParserState _state;
16+
private readonly IRefactoringPresenterFactory _factory;
1717
private readonly IRewritingManager _rewritingManager;
18-
private readonly IMessageBox _messageBox;
1918

20-
public RemoveUnusedParameterQuickFix(IVBE vbe, RubberduckParserState state, IMessageBox messageBox, IRewritingManager rewritingManager)
19+
public RemoveUnusedParameterQuickFix(IVBE vbe, RubberduckParserState state, IRefactoringPresenterFactory factory, IRewritingManager rewritingManager)
2120
: base(typeof(ParameterNotUsedInspection))
2221
{
2322
_vbe = vbe;
2423
_state = state;
24+
_factory = factory;
2525
_rewritingManager = rewritingManager;
26-
_messageBox = messageBox;
2726
}
2827

2928
//The rewriteSession is optional since it is not used in this particular quickfix because it is a refactoring quickfix.
3029
public override void Fix(IInspectionResult result, IRewriteSession rewriteSession = null)
3130
{
32-
using (var dialog = new RemoveParametersDialog(new RemoveParametersViewModel(_state)))
33-
{
34-
var refactoring = new RemoveParametersRefactoring(
35-
_vbe,
36-
new RemoveParametersPresenterFactory(_vbe, dialog, _state, _messageBox),
37-
_rewritingManager);
38-
39-
refactoring.QuickFix(_state, result.QualifiedSelection);
40-
}
31+
var refactoring = new RemoveParametersRefactoring(_state, _vbe, _factory, _rewritingManager);
32+
refactoring.QuickFix(_state, result.QualifiedSelection);
4133
}
4234

4335
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.RemoveUnusedParameterQuickFix;

‎Rubberduck.CodeAnalysis/QuickFixes/RenameDeclarationQuickFix.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
using Rubberduck.Parsing.Inspections.Abstract;
77
using Rubberduck.Parsing.Rewriter;
88
using Rubberduck.Parsing.VBA;
9+
using Rubberduck.Refactorings;
910
using Rubberduck.Refactorings.Rename;
1011
using Rubberduck.Resources;
11-
using Rubberduck.UI.Refactorings.Rename;
1212
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
1313

1414
namespace Rubberduck.Inspections.QuickFixes
@@ -19,8 +19,9 @@ public sealed class RenameDeclarationQuickFix : QuickFixBase
1919
private readonly RubberduckParserState _state;
2020
private readonly IRewritingManager _rewritingManager;
2121
private readonly IMessageBox _messageBox;
22-
23-
public RenameDeclarationQuickFix(IVBE vbe, RubberduckParserState state, IMessageBox messageBox, IRewritingManager rewritingManager)
22+
private readonly IRefactoringPresenterFactory _factory;
23+
24+
public RenameDeclarationQuickFix(IVBE vbe, RubberduckParserState state, IMessageBox messageBox, IRefactoringPresenterFactory factory, IRewritingManager rewritingManager)
2425
: base(typeof(HungarianNotationInspection),
2526
typeof(UseMeaningfulNameInspection),
2627
typeof(DefaultProjectNameInspection),
@@ -31,17 +32,14 @@ public RenameDeclarationQuickFix(IVBE vbe, RubberduckParserState state, IMessage
3132
_state = state;
3233
_rewritingManager = rewritingManager;
3334
_messageBox = messageBox;
35+
_factory = factory;
3436
}
3537

3638
//The rewriteSession is optional since it is not used in this particular quickfix because it is a refactoring quickfix.
3739
public override void Fix(IInspectionResult result, IRewriteSession rewriteSession = null)
3840
{
39-
using (var view = new RenameDialog(new RenameViewModel(_state)))
40-
{
41-
var factory = new RenamePresenterFactory(_vbe, view, _state);
42-
var refactoring = new RenameRefactoring(_vbe, factory, _messageBox, _state, _state.ProjectsProvider, _rewritingManager);
43-
refactoring.Refactor(result.Target);
44-
}
41+
var refactoring = new RenameRefactoring(_vbe, _factory, _messageBox, _state, _state.ProjectsProvider, _rewritingManager);
42+
refactoring.Refactor(result.Target);
4543
}
4644

4745
public override string Description(IInspectionResult result)

‎Rubberduck.Core/Refactorings/ExtractMethod/ExtractMethodPresenterFactory.cs

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesDialog.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Rubberduck.UI.AddRemoveReferences
66
{
7-
public partial class AddRemoveReferencesDialog : Form, IRefactoringDialog<AddRemoveReferencesViewModel>
7+
public partial class AddRemoveReferencesDialog : Form
88
{
99
public AddRemoveReferencesViewModel ViewModel { get; }
1010

‎Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesPresenter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ public interface IAddRemoveReferencesPresenter
1515

1616
public class AddRemoveReferencesPresenter : IAddRemoveReferencesPresenter
1717
{
18-
private readonly IRefactoringDialog<AddRemoveReferencesViewModel> _view;
18+
private readonly AddRemoveReferencesDialog _view;
1919

20-
public AddRemoveReferencesPresenter(IRefactoringDialog<AddRemoveReferencesViewModel> view)
20+
public AddRemoveReferencesPresenter(AddRemoveReferencesDialog view)
2121
{
2222
_view = view;
2323
Model = _view.ViewModel.Model;

‎Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesPresenterFactory.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Rubberduck.AddRemoveReferences;
88
using Rubberduck.Parsing.Symbols;
99
using Rubberduck.Parsing.VBA;
10-
using Rubberduck.Refactorings;
1110
using Rubberduck.Settings;
1211
using Rubberduck.SettingsProvider;
1312
using Rubberduck.VBEditor;
@@ -16,7 +15,7 @@
1615

1716
namespace Rubberduck.UI.AddRemoveReferences
1817
{
19-
public interface IAddRemoveReferencesPresenterFactory : IRefactoringPresenterFactory<AddRemoveReferencesPresenter>
18+
public interface IAddRemoveReferencesPresenterFactory
2019
{
2120
AddRemoveReferencesPresenter Create(ProjectDeclaration project);
2221
}

‎Rubberduck.Core/UI/CodeExplorer/Commands/RenameCommand.cs

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
using System;
22
using System.Collections.Generic;
3-
using NLog;
43
using Rubberduck.Interaction;
54
using Rubberduck.Navigation.CodeExplorer;
65
using Rubberduck.Parsing.Rewriter;
76
using Rubberduck.Parsing.VBA;
7+
using Rubberduck.Refactorings;
88
using Rubberduck.Refactorings.Rename;
9-
using Rubberduck.UI.Command;
10-
using Rubberduck.UI.Refactorings;
11-
using Rubberduck.UI.Refactorings.Rename;
129
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
1310

1411
namespace Rubberduck.UI.CodeExplorer.Commands
1512
{
16-
public class RenameCommand : CodeExplorerCommandBase, IDisposable
13+
public sealed class RenameCommand : CodeExplorerCommandBase
1714
{
1815
private static readonly Type[] ApplicableNodes =
1916
{
@@ -24,20 +21,19 @@ public class RenameCommand : CodeExplorerCommandBase, IDisposable
2421

2522
private readonly IVBE _vbe;
2623
private readonly RubberduckParserState _state;
27-
private readonly IRewritingManager _rewritingManager;
28-
private readonly IRefactoringDialog<RenameViewModel> _view;
24+
private readonly IRefactoringPresenterFactory _factory;
2925
private readonly IMessageBox _msgBox;
26+
private readonly IRewritingManager _rewritingManager;
3027

31-
public RenameCommand(IVBE vbe, IRefactoringDialog<RenameViewModel> view, RubberduckParserState state, IMessageBox msgBox, IRewritingManager rewritingManager)
28+
public RenameCommand(IVBE vbe, RubberduckParserState state, IMessageBox msgBox, IRefactoringPresenterFactory factory, IRewritingManager rewritingManager)
3229
{
3330
_vbe = vbe;
3431
_state = state;
3532
_rewritingManager = rewritingManager;
36-
_view = view;
3733
_msgBox = msgBox;
3834
}
3935

40-
public sealed override IEnumerable<Type> ApplicableNodeTypes => ApplicableNodes;
36+
public override IEnumerable<Type> ApplicableNodeTypes => ApplicableNodes;
4137

4238
protected override bool EvaluateCanExecute(object parameter)
4339
{
@@ -53,28 +49,8 @@ protected override void OnExecute(object parameter)
5349
return;
5450
}
5551

56-
var factory = new RenamePresenterFactory(_vbe, _view, _state);
57-
var refactoring = new RenameRefactoring(_vbe, factory, _msgBox, _state, _state.ProjectsProvider, _rewritingManager);
58-
52+
var refactoring = new RenameRefactoring(_vbe, _factory, _msgBox, _state, _state.ProjectsProvider, _rewritingManager);
5953
refactoring.Refactor(node.Declaration);
6054
}
61-
62-
public void Dispose()
63-
{
64-
Dispose(true);
65-
GC.SuppressFinalize(this);
66-
}
67-
68-
private bool _isDisposed;
69-
protected virtual void Dispose(bool disposing)
70-
{
71-
if (_isDisposed || !disposing)
72-
{
73-
return;
74-
}
75-
76-
_view?.Dispose();
77-
_isDisposed = true;
78-
}
7955
}
8056
}

‎Rubberduck.Core/UI/Command/Refactorings/CodePaneRefactorRenameCommand.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Rubberduck.Parsing.Rewriter;
44
using Rubberduck.Parsing.Symbols;
55
using Rubberduck.Parsing.VBA;
6+
using Rubberduck.Refactorings;
67
using Rubberduck.Refactorings.Rename;
78
using Rubberduck.UI.Refactorings.Rename;
89
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
@@ -15,13 +16,15 @@ public class CodePaneRefactorRenameCommand : RefactorCommandBase
1516
private readonly RubberduckParserState _state;
1617
private readonly IRewritingManager _rewritingManager;
1718
private readonly IMessageBox _messageBox;
19+
private readonly IRefactoringPresenterFactory _factory;
1820

19-
public CodePaneRefactorRenameCommand(IVBE vbe, RubberduckParserState state, IMessageBox messageBox, IRewritingManager rewritingManager)
21+
public CodePaneRefactorRenameCommand(IVBE vbe, RubberduckParserState state, IMessageBox messageBox, IRefactoringPresenterFactory factory, IRewritingManager rewritingManager)
2022
: base (vbe)
2123
{
2224
_state = state;
2325
_rewritingManager = rewritingManager;
2426
_messageBox = messageBox;
27+
_factory = factory;
2528
}
2629

2730
protected override bool EvaluateCanExecute(object parameter)
@@ -67,14 +70,9 @@ protected override void OnExecute(object parameter)
6770
{
6871
return;
6972
}
70-
71-
using (var view = new RenameDialog(new RenameViewModel(_state)))
72-
{
73-
var factory = new RenamePresenterFactory(Vbe, view, _state);
74-
var refactoring = new RenameRefactoring(Vbe, factory, _messageBox, _state, _state.ProjectsProvider, _rewritingManager);
75-
76-
refactoring.Refactor(target);
77-
}
73+
74+
var refactoring = new RenameRefactoring(Vbe, _factory, _messageBox, _state, _state.ProjectsProvider, _rewritingManager);
75+
refactoring.Refactor(target);
7876
}
7977
}
8078
}

‎Rubberduck.Core/UI/Command/Refactorings/FormDesignerRefactorRenameCommand.cs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
using Rubberduck.Parsing.Rewriter;
55
using Rubberduck.Parsing.Symbols;
66
using Rubberduck.Parsing.VBA;
7+
using Rubberduck.Refactorings;
78
using Rubberduck.Refactorings.Rename;
8-
using Rubberduck.UI.Refactorings.Rename;
99
using Rubberduck.VBEditor;
1010
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
1111

@@ -17,13 +17,15 @@ public class FormDesignerRefactorRenameCommand : RefactorCommandBase
1717
private readonly RubberduckParserState _state;
1818
private readonly IRewritingManager _rewritingManager;
1919
private readonly IMessageBox _messageBox;
20+
private readonly IRefactoringPresenterFactory _factory;
2021

21-
public FormDesignerRefactorRenameCommand(IVBE vbe, RubberduckParserState state, IMessageBox messageBox, IRewritingManager rewritingManager)
22+
public FormDesignerRefactorRenameCommand(IVBE vbe, RubberduckParserState state, IMessageBox messageBox, IRefactoringPresenterFactory factory, IRewritingManager rewritingManager)
2223
: base (vbe)
2324
{
2425
_state = state;
2526
_rewritingManager = rewritingManager;
2627
_messageBox = messageBox;
28+
_factory = factory;
2729
}
2830

2931
protected override bool EvaluateCanExecute(object parameter)
@@ -34,18 +36,13 @@ protected override bool EvaluateCanExecute(object parameter)
3436

3537
protected override void OnExecute(object parameter)
3638
{
37-
using (var view = new RenameDialog(new RenameViewModel(_state)))
39+
var refactoring = new RenameRefactoring(Vbe, _factory, _messageBox, _state, _state.ProjectsProvider, _rewritingManager);
40+
var target = GetTarget();
41+
if (target != null)
3842
{
39-
var factory = new RenamePresenterFactory(Vbe, view, _state);
40-
var refactoring = new RenameRefactoring(Vbe, factory, _messageBox, _state, _state.ProjectsProvider, _rewritingManager);
41-
42-
var target = GetTarget();
43-
44-
if (target != null)
45-
{
46-
refactoring.Refactor(target);
47-
}
43+
refactoring.Refactor(target);
4844
}
45+
4946
}
5047

5148
private Declaration GetTarget(QualifiedModuleName? qualifiedModuleName = null)

0 commit comments

Comments
 (0)