Skip to content

Commit 332994f

Browse files
committed
A bunch more tests
1 parent 836d459 commit 332994f

File tree

5 files changed

+1023
-15
lines changed

5 files changed

+1023
-15
lines changed

RetailCoder.VBE/UI/Command/Refactorings/RefactorIntroduceFieldCommand.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public RefactorIntroduceFieldCommand (VBE vbe, RubberduckParserState state)
1818

1919
protected override bool CanExecuteImpl(object parameter)
2020
{
21-
if (Vbe.ActiveCodePane == null || _state.Status != ParserState.Ready)
21+
if (_state.Status != ParserState.Ready)
2222
{
2323
return false;
2424
}
@@ -31,9 +31,7 @@ protected override bool CanExecuteImpl(object parameter)
3131

3232
var target = _state.AllUserDeclarations.FindVariable(selection.Value);
3333

34-
var canExecute = target != null && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);
35-
36-
return canExecute;
34+
return target != null && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);
3735
}
3836

3937
protected override void ExecuteImpl(object parameter)

RetailCoder.VBE/UI/Command/Refactorings/RefactorIntroduceParameterCommand.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public RefactorIntroduceParameterCommand (VBE vbe, RubberduckParserState state)
1818

1919
protected override bool CanExecuteImpl(object parameter)
2020
{
21-
if (Vbe.ActiveCodePane == null || _state.Status != ParserState.Ready)
21+
if (_state.Status != ParserState.Ready)
2222
{
2323
return false;
2424
}
@@ -31,9 +31,7 @@ protected override bool CanExecuteImpl(object parameter)
3131

3232
var target = _state.AllUserDeclarations.FindVariable(selection.Value);
3333

34-
var canExecute = target != null && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);
35-
36-
return canExecute;
34+
return target != null && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);
3735
}
3836

3937
protected override void ExecuteImpl(object parameter)

RetailCoder.VBE/UI/Command/Refactorings/RefactorMoveCloserToUsageCommand.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@ protected override bool CanExecuteImpl(object parameter)
3434
}
3535

3636
var target = _state.FindSelectedDeclaration(Vbe.ActiveCodePane);
37-
var canExecute = target != null
37+
return target != null
3838
&& (target.DeclarationType == DeclarationType.Variable || target.DeclarationType == DeclarationType.Constant)
3939
&& target.References.Any();
40-
41-
return canExecute;
4240
}
4341

4442
protected override void ExecuteImpl(object parameter)

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@ protected override bool CanExecuteImpl(object parameter)
4545
}
4646

4747
var parameters = _state.AllUserDeclarations.Where(item => item.DeclarationType == DeclarationType.Parameter && member.Equals(item.ParentScopeDeclaration)).ToList();
48-
var canExecute = (member.DeclarationType == DeclarationType.PropertyLet || member.DeclarationType == DeclarationType.PropertySet)
48+
return member.DeclarationType == DeclarationType.PropertyLet || member.DeclarationType == DeclarationType.PropertySet
4949
? parameters.Count > 1
5050
: parameters.Any();
51-
52-
return canExecute;
5351
}
5452

5553
protected override void ExecuteImpl(object parameter)

0 commit comments

Comments
 (0)