Merge pull request #2036 from Hosch250/Issue1973

Find Symbol bug fixes

Author: retailcoder

RetailCoder.VBE/UI/FindSymbol/FindSymbolControl.xaml

@@ -5,7 +5,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Rubberduck.UI.FindSymbol"
              mc:Ignorable="d" 
-             d:DesignHeight="24" d:DesignWidth="270">
+             d:DesignHeight="24" d:DesignWidth="270"
+             d:DataContext="{d:DesignInstance {x:Type local:FindSymbolViewModel}, IsDesignTimeCreatable=False}">
 
     <UserControl.CommandBindings>
         <CommandBinding Command="local:FindSymbolControl.GoCommand" 
@@ -19,22 +20,16 @@
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="32" />
         </Grid.ColumnDefinitions>
-        
+
         <ComboBox IsEditable="True"
                   ItemsSource="{Binding MatchResults}"
-                  SelectedItem="{Binding SelectedItem, UpdateSourceTrigger=PropertyChanged}"
+                  SelectedItem="{Binding SelectedItem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                   IsTextSearchCaseSensitive="False"
                   IsTextSearchEnabled="True"
-                  TextSearch.Text="{Binding SearchString, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged}"
+                  Text="{Binding SearchString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                   TextSearch.TextPath="IdentifierName"
                   PreviewKeyDown="UIElement_OnPreviewKeyDown">
-            
-            <!--<ComboBox.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <VirtualizingStackPanel />
-                </ItemsPanelTemplate>
-            </ComboBox.ItemsPanel>-->
-    
+
             <ComboBox.ItemTemplate>
                 <DataTemplate DataType="local:SearchResult">
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
@@ -46,8 +41,7 @@
             </ComboBox.ItemTemplate>
         </ComboBox>
 
-        <Button Grid.Column="1"
-                Command="local:FindSymbolControl.GoCommand">
+        <Button Grid.Column="1" Command="local:FindSymbolControl.GoCommand">
             <Image Height="16" Source="pack://application:,,,/Rubberduck;component/Resources/arrow.png" />
         </Button>
 

RetailCoder.VBE/UI/FindSymbol/FindSymbolViewModel.cs

@@ -23,13 +23,8 @@ public FindSymbolViewModel(IEnumerable<Declaration> declarations, DeclarationIco
         {
             _declarations = declarations;
             _cache = cache;
-            var initialResults = _declarations
-                .Where(declaration => !ExcludedTypes.Contains(declaration.DeclarationType))
-                .OrderBy(declaration => declaration.IdentifierName.ToLowerInvariant())
-                .Select(declaration => new SearchResult(declaration, cache[declaration]))
-                .ToList();
-
-            MatchResults = new ObservableCollection<SearchResult>(initialResults);
+            
+            Search(string.Empty);
         }
 
         public event EventHandler<NavigateCodeEventArgs> Navigate;
@@ -59,47 +54,76 @@ public void OnNavigate()
 
         private void Search(string value)
         {
+            if (string.IsNullOrWhiteSpace(value))
+            {
+                MatchResults = new ObservableCollection<SearchResult>();
+                return;
+            }
+
             var lower = value.ToLowerInvariant();
             var results = _declarations
                 .Where(declaration => !ExcludedTypes.Contains(declaration.DeclarationType)
-                                        && (string.IsNullOrEmpty(value) || declaration.IdentifierName.ToLowerInvariant().Contains(lower)))
+                                      && (string.IsNullOrEmpty(value) || declaration.IdentifierName.ToLowerInvariant().Contains(lower)))
                 .OrderBy(declaration => declaration.IdentifierName.ToLowerInvariant())
-                .Select(declaration => new SearchResult(declaration, _cache[declaration]))
-                .ToList();
+                .Select(declaration => new SearchResult(declaration, _cache[declaration]));
 
             MatchResults = new ObservableCollection<SearchResult>(results);
         }
 
         private string _searchString;
-
         public string SearchString
         {
             get { return _searchString; }
             set
             {
-                _searchString = value; 
-                Search(value);
+                if (_searchString != value)
+                {
+                    _searchString = value;
+                    Search(value);
+                }
             }
         }
 
         private SearchResult _selectedItem;
-
         public SearchResult SelectedItem
         {
             get { return _selectedItem; }
             set 
-            { 
-                _selectedItem = value; 
-                OnPropertyChanged();
+            {
+                if (_selectedItem != value)
+                {
+                    _selectedItem = value;
+                    OnPropertyChanged();
+                }
             }
         }
 
         private ObservableCollection<SearchResult> _matchResults;
-
         public ObservableCollection<SearchResult> MatchResults
         {
             get { return _matchResults; }
-            set { _matchResults = value; OnPropertyChanged(); }
+            set
+            {
+                var oldSelectedItem = SelectedItem;
+
+                _matchResults = value;
+
+                // save the selection when the user clicks on one of the drop-down items and the search results are updated
+                if (oldSelectedItem != null)
+                {
+                    var newSelectedItem = value.FirstOrDefault(s => s.Declaration == oldSelectedItem.Declaration);
+
+                    if (newSelectedItem != null)
+                    {
+                        _selectedItem = newSelectedItem;
+                        _searchString = newSelectedItem.IdentifierName;
+                        
+                        OnPropertyChanged("SelectedItem");
+                    }
+                }
+
+                OnPropertyChanged();
+            }
         }
 
         public event PropertyChangedEventHandler PropertyChanged;