finalized FindAllReferences logic (message when no references found, navigate directly when only one reference is found)

Author: retailcoder

RetailCoder.VBE/UI/Command/FindAllReferencesCommand.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Windows.Forms;
 using Microsoft.Vbe.Interop;
 using Rubberduck.Navigation;
 using Rubberduck.Parsing.Symbols;
@@ -17,14 +18,16 @@ namespace Rubberduck.UI.Command
     public class FindAllReferencesCommand : CommandBase
     {
         private readonly INavigateCommand _navigateCommand;
+        private readonly IMessageBox _messageBox;
         private readonly RubberduckParserState _state;
         private readonly IActiveCodePaneEditor _editor;
         private readonly ISearchResultsWindowViewModel _viewModel;
         private readonly SearchResultPresenterInstanceManager _presenterService;
 
-        public FindAllReferencesCommand(INavigateCommand navigateCommand, RubberduckParserState state, IActiveCodePaneEditor editor, ISearchResultsWindowViewModel viewModel, SearchResultPresenterInstanceManager presenterService)
+        public FindAllReferencesCommand(INavigateCommand navigateCommand, IMessageBox messageBox, RubberduckParserState state, IActiveCodePaneEditor editor, ISearchResultsWindowViewModel viewModel, SearchResultPresenterInstanceManager presenterService)
         {
             _navigateCommand = navigateCommand;
+            _messageBox = messageBox;
             _state = state;
             _editor = editor;
             _viewModel = viewModel;
@@ -45,6 +48,18 @@ public override void Execute(object parameter)
             }
 
             var viewModel = CreateViewModel(declaration);
+            if (!viewModel.SearchResults.Any())
+            {
+                _messageBox.Show(string.Format(RubberduckUI.AllReferences_NoneFound, declaration.IdentifierName), RubberduckUI.Rubberduck, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                return;
+            }
+
+            if (viewModel.SearchResults.Count == 1)
+            {
+                _navigateCommand.Execute(viewModel.SearchResults[0].GetNavigationArgs());
+                return;
+            }
+
             _viewModel.AddTab(viewModel);
             _viewModel.SelectedTab = viewModel;
 
@@ -65,7 +80,7 @@ private SearchResultsViewModel CreateViewModel(Declaration declaration)
                 new SearchResultItem(
                     reference.QualifiedModuleName.QualifyMemberName(reference.ParentScope.Split('.').Last()),
                     reference.Selection,
-                    reference.Context.GetText()));
+                    _editor.GetLines(reference.Selection)));
 
             var viewModel = new SearchResultsViewModel(_navigateCommand,
                 string.Format(RubberduckUI.SearchResults_AllReferencesTabFormat, declaration.IdentifierName), results);

RetailCoder.VBE/UI/Controls/SearchResultsViewModel.cs

@@ -50,8 +50,6 @@ public SearchResultItem SelectedItem
             }
         }
 
-        public INavigateCommand NavigateCommand { get {return _navigateCommand; } }
-
         private void ExecuteCloseCommand(object parameter)
         {
             OnClose();
@@ -67,6 +65,7 @@ private void OnClose()
             }
         }
 
+        public INavigateCommand NavigateCommand { get { return _navigateCommand; } }
         INavigateSource INavigateSelection.SelectedItem { get { return SelectedItem; } }
     }
 }

RetailCoder.VBE/UI/Controls/SearchView.xaml

@@ -41,9 +41,9 @@
                                            ItemsSource="{Binding SearchResultsSource.View}"
                                            SelectedItem="{Binding SelectedItem}">
                         <DataGrid.Columns>
-                            <DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SearchResults_ModuleName}" Binding="{Binding QualifiedMemberName.QualifiedModuleName}" />
                             <DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SearchResults_MemberName}" Binding="{Binding QualifiedMemberName.MemberName}" />
-                            <DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SearchResults_Location}" Binding="{Binding Selection}" Width="*" />
+                            <DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SearchResults_Line}" Binding="{Binding Selection.StartLine}" />
+                            <DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SearchResults_Context}" Binding="{Binding ResultText}" Width="*" />
                         </DataGrid.Columns>
                     </controls:GroupingGrid>
                 </DataTemplate>

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -1317,9 +1317,8 @@ All our stargazers, likers & followers, for the warm fuzzies
   <data name="SearchResults_Caption" xml:space="preserve">
     <value>Search Results</value>
   </data>
-  <data name="SearchResults_Location" xml:space="preserve">
-    <value>Location</value>
-    <comment>The line and column in the code module, in L1C1 notation</comment>
+  <data name="SearchResults_Line" xml:space="preserve">
+    <value>Line</value>
   </data>
   <data name="SearchResults_MemberName" xml:space="preserve">
     <value>Member</value>
@@ -1329,8 +1328,8 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
     <value>Module</value>
     <comment>The qualified module name, e.g. "Project1.Module1"</comment>
   </data>
-  <data name="SearchResults_Result" xml:space="preserve">
-    <value>Result</value>
+  <data name="SearchResults_Context" xml:space="preserve">
+    <value>Context</value>
     <comment>A column to display the search result itself</comment>
   </data>
   <data name="SearchResults_AllImplementationsTabFormat" xml:space="preserve">
@@ -1341,4 +1340,7 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
     <value>All references: '{0}'</value>
     <comment>0: declaration.identifiername</comment>
   </data>
+  <data name="Rubberduck" xml:space="preserve">
+    <value>Rubberduck</value>
+  </data>
 </root>