Skip to content

Commit 6d56231

Browse files
MDoernerMDoerner
committed
Merge branch 'next' into ExtractMtMRefsFromState
2 parents b1fa2a0 + 9dd6be3 commit 6d56231

File tree

79 files changed

+630
-436
lines changed

Some content is hidden

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

79 files changed

+630
-436
lines changed

‎RetailCoder.VBE/REfactorings/Rename/RenameRefactorBase.cs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,20 @@ public interface IRename
1616

1717
public abstract class RenameRefactorBase : IRename
1818
{
19-
private readonly RubberduckParserState _state;
20-
private List<QualifiedModuleName> _modulesToRewrite;
19+
private readonly List<QualifiedModuleName> _modulesToRewrite;
2120

22-
public RenameRefactorBase(RenameModel model)
21+
protected RenameRefactorBase()
2322
{
2423
_modulesToRewrite = new List<QualifiedModuleName>();
2524
}
2625

27-
public RenameRefactorBase(RubberduckParserState state)
26+
protected RenameRefactorBase(RubberduckParserState state)
2827
{
29-
_state = state;
28+
State = state;
3029
_modulesToRewrite = new List<QualifiedModuleName>();
3130
}
3231

33-
public RubberduckParserState State { get { return _state; } }
32+
public RubberduckParserState State { get; }
3433

3534
public void Rewrite()
3635
{
@@ -44,15 +43,15 @@ public void Rewrite()
4443

4544
public abstract string ErrorMessage { get; }
4645

47-
public virtual bool RequestParseAfterRename { get { return true; } }
46+
public virtual bool RequestParseAfterRename => true;
4847

4948
public void RenameUsages(Declaration target, string newName)
5049
{
5150
var modules = target.References.GroupBy(r => r.QualifiedModuleName);
5251
foreach (var grouping in modules)
5352
{
5453
_modulesToRewrite.Add(grouping.Key);
55-
var rewriter = _state.GetRewriter(grouping.Key);
54+
var rewriter = State.GetRewriter(grouping.Key);
5655
foreach (var reference in grouping)
5756
{
5857
rewriter.Replace(reference.Context, newName);
@@ -63,11 +62,11 @@ public void RenameUsages(Declaration target, string newName)
6362
public void RenameDeclaration(Declaration target, string newName)
6463
{
6564
_modulesToRewrite.Add(target.QualifiedName.QualifiedModuleName);
66-
var rewriter = _state.GetRewriter(target.QualifiedName.QualifiedModuleName);
65+
var rewriter = State.GetRewriter(target.QualifiedName.QualifiedModuleName);
6766

6867
if (target.DeclarationType.HasFlag(DeclarationType.Property))
6968
{
70-
var members = _state.DeclarationFinder.MatchName(target.IdentifierName)
69+
var members = State.DeclarationFinder.MatchName(target.IdentifierName)
7170
.Where(item => item.ProjectId == target.ProjectId
7271
&& item.ComponentName == target.ComponentName
7372
&& item.DeclarationType.HasFlag(DeclarationType.Property));

‎RetailCoder.VBE/REfactorings/Rename/RenameRefactorControl.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ public RenameRefactorControl(RubberduckParserState state)
1313
: base(state) { _errorMessage = string.Empty; }
1414

1515
private string _errorMessage;
16-
override public string ErrorMessage { get { return _errorMessage; } }
16+
public override string ErrorMessage => _errorMessage;
1717

18-
override public void Rename(Declaration controlDeclaration, string newControlName)
18+
public override void Rename(Declaration controlDeclaration, string newControlName)
1919
{
2020
_errorMessage = string.Format(RubberduckUI.RenameDialog_ControlRenameError, controlDeclaration.IdentifierName);
2121

‎RetailCoder.VBE/REfactorings/Rename/RenameRefactorDefault.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ public RenameRefactorDefault(RubberduckParserState state)
1010
: base(state) { _errorMessage = string.Empty; }
1111

1212
private string _errorMessage;
13-
override public string ErrorMessage { get { return _errorMessage; } }
13+
public override string ErrorMessage => _errorMessage;
1414

15-
override public void Rename(Declaration renameTarget, string newName)
15+
public override void Rename(Declaration renameTarget, string newName)
1616
{
1717
_errorMessage = string.Format(RubberduckUI.RenameDialog_DefaultRenameError, renameTarget.IdentifierName);
1818

‎RetailCoder.VBE/REfactorings/Rename/RenameRefactorEvent.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ public RenameRefactorEvent(RubberduckParserState state)
1313
: base(state) { _errorMessage = string.Empty; }
1414

1515
private string _errorMessage;
16-
override public string ErrorMessage { get { return _errorMessage; } }
16+
public override string ErrorMessage => _errorMessage;
1717

18-
override public void Rename(Declaration eventDeclaration, string newName)
18+
public override void Rename(Declaration eventDeclaration, string newName)
1919
{
2020
_errorMessage = string.Format(RubberduckUI.RenameDialog_EventRenameError, eventDeclaration.IdentifierName);
2121
Debug.Assert(eventDeclaration.DeclarationType == DeclarationType.Event, "Resolving User Selection to Declaration Failed");

‎RetailCoder.VBE/REfactorings/Rename/RenameRefactorInterface.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ public RenameRefactorInterface(RubberduckParserState state)
1212
: base(state) { _errorMessage = string.Empty; }
1313

1414
private string _errorMessage;
15-
override public string ErrorMessage { get { return _errorMessage; } }
15+
public override string ErrorMessage => _errorMessage;
1616

17-
override public void Rename(Declaration renameTarget, string newName)
17+
public override void Rename(Declaration renameTarget, string newName)
1818
{
1919
_errorMessage = string.Format(RubberduckUI.RenameDialog_InterfaceRenameError, renameTarget.IdentifierName);
2020

‎RetailCoder.VBE/REfactorings/Rename/RenameRefactorModule.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ public class RenameRefactorModule : RenameRefactorBase
1111
public RenameRefactorModule(RubberduckParserState state)
1212
: base(state) { }
1313

14-
override public string ErrorMessage { get { return RubberduckUI.RenameDialog_ModuleRenameError; } }
14+
public override string ErrorMessage => RubberduckUI.RenameDialog_ModuleRenameError;
1515

16-
public override bool RequestParseAfterRename { get { return false; } }
16+
public override bool RequestParseAfterRename => false;
1717

18-
override public void Rename(Declaration renameTarget, string newName)
18+
public override void Rename(Declaration renameTarget, string newName)
1919
{
2020
var component = renameTarget.QualifiedName.QualifiedModuleName.Component;
2121
var module = component.CodeModule;

‎RetailCoder.VBE/REfactorings/Rename/RenameRefactorProject.cs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,22 @@ public class RenameRefactorProject : RenameRefactorBase
99
private readonly RenameModel _model;
1010

1111
public RenameRefactorProject(RenameModel model)
12-
: base(model)
1312
{
1413
_model = model;
1514
}
1615

16+
public override string ErrorMessage => RubberduckUI.RenameDialog_ProjectRenameError;
1717

18-
public override string ErrorMessage { get { return RubberduckUI.RenameDialog_ProjectRenameError; } }
19-
20-
public override bool RequestParseAfterRename { get { return false; } }
18+
public override bool RequestParseAfterRename => false;
2119

2220
public override void Rename(Declaration renameTarget, string newName)
2321
{
2422
var projects = _model.VBE.VBProjects;
2523
var project = projects.SingleOrDefault(p => p.HelpFile == _model.Target.ProjectId);
24+
25+
if (project != null)
2626
{
27-
if (project != null)
28-
{
29-
project.Name = newName;
30-
}
27+
project.Name = newName;
3128
}
3229
}
3330
}

‎RetailCoder.VBE/REfactorings/Rename/RenameRefactorProperty.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ public RenameRefactorProperty(RubberduckParserState state)
1212
: base(state) { _errorMessage = string.Empty; }
1313

1414
private string _errorMessage;
15-
override public string ErrorMessage { get { return _errorMessage; } }
15+
public override string ErrorMessage => _errorMessage;
1616

17-
override public void Rename(Declaration renameTarget, string newName)
17+
public override void Rename(Declaration renameTarget, string newName)
1818
{
1919
_errorMessage = string.Format(RubberduckUI.RenameDialog_PropertyRenameError, renameTarget.IdentifierName); ;
2020

21-
var members = State.AllUserDeclarations.Named(renameTarget.IdentifierName)
21+
var members = State.DeclarationFinder.MatchName(renameTarget.IdentifierName)
2222
.Where(item => item.ProjectId == renameTarget.ProjectId
2323
&& item.ComponentName == renameTarget.ComponentName
2424
&& item.DeclarationType.HasFlag(DeclarationType.Property));

‎RetailCoder.VBE/REfactorings/Rename/RenameRefactorPropertyParameter.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ public RenameRefactorPropertyParameter(RubberduckParserState state)
1111
: base(state) { _errorMessage = string.Empty; }
1212

1313
private string _errorMessage;
14-
override public string ErrorMessage { get { return _errorMessage; } }
14+
public override string ErrorMessage => _errorMessage;
1515

16-
override public void Rename(Declaration renameTarget, string newName)
16+
public override void Rename(Declaration renameTarget, string newName)
1717
{
1818
_errorMessage = string.Format(RubberduckUI.RenameDialog_PropertyParameterRenameError, renameTarget.IdentifierName, renameTarget.ParentDeclaration.IdentifierName);
1919

20-
var parameters = State.AllUserDeclarations.Where(d =>
21-
d.DeclarationType == DeclarationType.Parameter
22-
&& d.ParentDeclaration.DeclarationType.HasFlag(DeclarationType.Property)
20+
var parameters = State.DeclarationFinder.UserDeclarations(DeclarationType.Parameter).Where(d =>
21+
d.ParentDeclaration.DeclarationType.HasFlag(DeclarationType.Property)
2322
&& d.IdentifierName == renameTarget.IdentifierName);
2423

2524
foreach (var param in parameters)

‎RetailCoder.VBE/Refactorings/EncapsulateField/EncapsulateFieldModel.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class EncapsulateFieldModel
1111
{
1212
public RubberduckParserState State { get; }
1313

14-
public Declaration TargetDeclaration { get; private set; }
14+
public Declaration TargetDeclaration { get; }
1515

1616
public string PropertyName { get; set; }
1717
public string ParameterName { get; set; }
@@ -22,9 +22,7 @@ public class EncapsulateFieldModel
2222
public EncapsulateFieldModel(RubberduckParserState state, QualifiedSelection selection)
2323
{
2424
State = state;
25-
IList<Declaration> declarations = state.AllUserDeclarations
26-
.Where(d => d.DeclarationType == DeclarationType.Variable)
27-
.ToList();
25+
IList<Declaration> declarations = state.DeclarationFinder.UserDeclarations(DeclarationType.Variable).ToList();
2826

2927
TargetDeclaration = declarations.FindVariable(selection);
3028
}

0 commit comments

Comments
 (0)