Skip to content

Commit e8fd573

Browse files
committed
Opportunistic updates
Use pattern matching Simplify default expression Use auto property Use IEnumerable<T>. ToList() removed as ubsequent calls use IEnumerable<T>.
1 parent 3b63eb9 commit e8fd573

File tree

5 files changed

+11
-13
lines changed

5 files changed

+11
-13
lines changed

Rubberduck.Core/UI/Command/MenuItems/CommandMenuItemBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public virtual bool EvaluateCanExecute(RubberduckParserState state)
5454
public virtual bool HiddenWhenDisabled => false;
5555
public virtual bool IsVisible => true;
5656
public virtual bool BeginGroup => false;
57-
public virtual int DisplayOrder => default(int);
57+
public virtual int DisplayOrder => default;
5858
public virtual Image Image => null;
5959
public virtual Image Mask => null;
6060
}

Rubberduck.Core/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,7 @@ private ICommandBarControl InitializeChildControl(ICommandMenuItem item)
201201

202202
private void child_Click(object sender, CommandBarButtonClickEventArgs e)
203203
{
204-
var item = _items.Select(kvp => kvp.Key).SingleOrDefault(menu => e.Tag.EndsWith(menu.GetType().Name)) as ICommandMenuItem;
205-
if (item == null)
204+
if (!(_items.Select(kvp => kvp.Key).SingleOrDefault(menu => e.Tag.EndsWith(menu.GetType().Name)) is ICommandMenuItem item))
206205
{
207206
return;
208207
}

Rubberduck.Parsing/VBA/RubberduckParserState.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -581,25 +581,24 @@ public ParserState GetModuleState(QualifiedModuleName module)
581581
return _moduleStates.GetOrAdd(module, new ModuleState(ParserState.Pending)).State;
582582
}
583583

584-
private readonly object _statusLockObject = new object();
585-
private ParserState _status;
586-
public ParserState Status => _status;
584+
private readonly object _statusLockObject = new object();
585+
public ParserState Status { get; private set; }
587586

588587
private void SetStatusWithCancellation(ParserState value, CancellationToken token)
589588
{
590-
if (_status != value)
589+
if (Status != value)
591590
{
592-
var oldStatus = _status;
593-
_status = value;
594-
OnStateChanged(this, token, _status, oldStatus);
591+
var oldStatus = Status;
592+
Status = value;
593+
OnStateChanged(this, token, Status, oldStatus);
595594
}
596595
}
597596

598597
public void SetStatusAndFireStateChanged(object requestor, ParserState status, CancellationToken token)
599598
{
600599
if (Status == status)
601600
{
602-
OnStateChanged(requestor, token, status, _status);
601+
OnStateChanged(requestor, token, status, Status);
603602
}
604603
else
605604
{

Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private void AddExposedAttribute(IVBComponents components, IVBComponent interfac
171171

172172
private void AddInterfaceMembersToClass(ExtractInterfaceModel model, IModuleRewriter rewriter)
173173
{
174-
_implementInterfaceRefactoring.Refactor(model.SelectedMembers.Select(m => m.Member).ToList(), rewriter, model.InterfaceName);
174+
_implementInterfaceRefactoring.Refactor(model.SelectedMembers.Select(m => m.Member), rewriter, model.InterfaceName);
175175
}
176176

177177
private string GetInterfaceModuleBody(ExtractInterfaceModel model)

Rubberduck.Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public override void Refactor(Declaration target)
7979
throw new NotSupportedException();
8080
}
8181

82-
internal void Refactor(List<Declaration> members, IModuleRewriter rewriter, string interfaceName)
82+
internal void Refactor(IEnumerable<Declaration> members, IModuleRewriter rewriter, string interfaceName)
8383
{
8484
AddItems(members, rewriter, interfaceName);
8585
}

0 commit comments

Comments
 (0)