Skip to content

Commit 0d028fc

Browse files
Hosch250retailcoder
authored andcommitted
Fix a few CanExecute implementations (#1609)
1 parent c5bacb2 commit 0d028fc

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

RetailCoder.VBE/UI/Command/FindAllImplementationsCommand.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,11 @@ public FindAllImplementationsCommand(INavigateCommand navigateCommand, IMessageB
3838

3939
public override bool CanExecute(object parameter)
4040
{
41-
if (_vbe.ActiveCodePane == null && _state.Status != ParserState.Ready)
41+
if (_vbe.ActiveCodePane == null || _state.Status != ParserState.Ready)
4242
{
4343
return false;
4444
}
4545

46-
// todo: make this work for Code/Project Explorer context menus too (may require a new command implementation)
4746
var target = FindTarget(parameter);
4847
var canExecute = target != null;
4948

RetailCoder.VBE/UI/Command/FindAllReferencesCommand.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@ public FindAllReferencesCommand(INavigateCommand navigateCommand, IMessageBox me
3535

3636
public override bool CanExecute(object parameter)
3737
{
38-
if (_vbe.ActiveCodePane == null && _state.Status != ParserState.Ready)
38+
if (_vbe.ActiveCodePane == null || _state.Status != ParserState.Ready)
3939
{
4040
return false;
4141
}
42-
43-
// todo: make this work for Code/Project Explorer context menus too (may require a new command implementation)
42+
4443
var target = FindTarget(parameter);
4544
var canExecute = target != null;
4645

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public override bool CanExecute(object parameter)
4545
return false;
4646
}
4747

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public override bool CanExecute(object parameter)
4949
return false;
5050
}
5151

52-
var parameters = _state.AllUserDeclarations.Where(item => member.Equals(item.ParentScopeDeclaration)).ToList();
52+
var parameters = _state.AllUserDeclarations.Where(item => item.DeclarationType == DeclarationType.Parameter && member.Equals(item.ParentScopeDeclaration)).ToList();
5353
var canExecute = (member.DeclarationType == DeclarationType.PropertyLet || member.DeclarationType == DeclarationType.PropertySet)
5454
? parameters.Count > 2
5555
: parameters.Count > 1;

0 commit comments

Comments
 (0)