minor fixes. ref.#1974

Author: retailcoder

RetailCoder.VBE/Common/DeclarationExtensions.cs

@@ -456,9 +456,9 @@ public static Declaration FindInterfaceMember(this IEnumerable<Declaration> decl
             var members = FindInterfaceMembers(declarations);
             var matches = members.Where(m => !m.IsBuiltIn && implementation.IdentifierName == m.ComponentName + '_' + m.IdentifierName).ToList();
 
-            return matches.Count > 1 
-                ? matches.SingleOrDefault(m => m.ProjectId == implementation.ProjectId) 
-                : matches.First();
+            return matches.Count > 1
+                ? matches.SingleOrDefault(m => m.ProjectId == implementation.ProjectId)
+                : matches.FirstOrDefault();
         }
 
         public static Declaration FindTarget(this IEnumerable<Declaration> declarations, QualifiedSelection selection)

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -399,7 +399,7 @@
                                   Command="{Binding FindAllImplementationsCommand}"
                                   CommandParameter="{Binding SelectedItem}" />
                         </MenuItem>
-                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SmartIndenterMenu}"
+                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_Indent}"
                                   Command="{Binding IndenterCommand}"
                                   CommandParameter="{Binding SelectedItem}" />
                         <Separator />
@@ -764,7 +764,7 @@
                                 Visibility="{Binding CanExecuteIndenterCommand, Converter={StaticResource BoolToVisibility}, UpdateSourceTrigger=PropertyChanged}"
                                 Command="{Binding IndenterCommand}"
                                 CommandParameter="{Binding SelectedItem}"
-                                Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SmartIndenterMenu}" />
+                                Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_Indent}" />
                         <controls:LinkButton Margin="4"
                                 Visibility="{Binding CanExecuteRenameCommand, Converter={StaticResource BoolToVisibility}}"
                                 Command="{Binding RenameCommand}"

RetailCoder.VBE/UI/Command/FindAllImplementationsCommand.cs

@@ -182,7 +182,7 @@ private IEnumerable<Declaration> FindAllImplementationsOfClass(Declaration targe
             if (target.DeclarationType != DeclarationType.ClassModule)
             {
                 name = string.Empty;
-                return null;
+                return Enumerable.Empty<Declaration>();
             }
 
             var identifiers = declarations as IList<Declaration> ?? declarations.ToList();
@@ -201,7 +201,7 @@ private IEnumerable<Declaration> FindAllImplementationsOfMember(Declaration targ
             if (!target.DeclarationType.HasFlag(DeclarationType.Member))
             {
                 name = string.Empty;
-                return null;
+                return Enumerable.Empty<Declaration>();
             }
 
             var items = declarations as IList<Declaration> ?? declarations.ToList();
@@ -218,6 +218,11 @@ private IEnumerable<Declaration> FindAllImplementationsOfMember(Declaration targ
             }
 
             var member = items.FindInterfaceMember(target);
+            if (member == null)
+            {
+                name = string.Empty;
+                return Enumerable.Empty<Declaration>();
+            }
             name = member.ComponentName + "." + member.IdentifierName;
             return items.FindInterfaceImplementationMembers(member.IdentifierName)
                    .Where(item => item.IdentifierName == member.ComponentName + "_" + member.IdentifierName);

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -1730,4 +1730,7 @@ All our stargazers, likers & followers, for the warm fuzzies
   <data name="TestExplorerMenu_AddTestModule" xml:space="preserve">
     <value>Test M&amp;odule</value>
   </data>
+  <data name="CodeExplorer_Indent" xml:space="preserve">
+    <value>Indent</value>
+  </data>
 </root>

RetailCoder.VBE/UI/RubberduckUI.resx

@@ -12,6 +12,7 @@
 using System.Diagnostics;
 using Rubberduck.VBEditor.Extensions;
 using System.IO;
+using System.Linq;
 using NLog;
 // ReSharper disable LoopCanBeConvertedToQuery
 
@@ -660,10 +661,20 @@ public void Dispose()
         {
             State.ParseRequest -= ReparseRequested;
 
-            if (_cancellationTokens[0] != null)
+            if (_cancellationTokens.Any(cts => cts != null))
             {
-                _cancellationTokens[0].Cancel();
-                _cancellationTokens[0].Dispose();
+                foreach (var cts in _cancellationTokens.ToList())
+                {
+                    try
+                    {
+                        cts.Cancel();
+                        cts.Dispose();
+                    }
+                    finally
+                    {
+                        _cancellationTokens.Remove(cts);
+                    }
+                }
             }
         }
     }