Merge branch 'next' into next

retailcoder · web-flow · commit cfe112484a56 · 2017-10-14T00:33:57.000-04:00
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
 using NLog;
@@ -21,6 +22,7 @@
 using System.Windows;
 
 // ReSharper disable CanBeReplacedWithTryCastAndCheckForNull
+// ReSharper disable ExplicitCallerInfoArgument
 
 namespace Rubberduck.Navigation.CodeExplorer
 {
@@ -99,54 +101,45 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st
 
             SetNameSortCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>
             {
-                if ((bool)param == true)
+                if ((bool)param)
                 {
                     SortByName = (bool)param;
                     SortByCodeOrder = !(bool)param;
                 }
-            }, param =>
-            {
-                return SortByName ? false : true;
-            });
+            }, param => !SortByName);
 
             SetCodeOrderSortCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>
             {
-                if ((bool)param == true)
+                if ((bool)param)
                 {
                     SortByCodeOrder = (bool)param;
                     SortByName = !(bool)param;
-                };
-            }, param => 
-            {
-                return SortByCodeOrder ? false : true;
-            });
+                }
+            }, param => !SortByCodeOrder);
         }
 
         private CodeExplorerItemViewModel _selectedItem;
         public CodeExplorerItemViewModel SelectedItem
         {
-            get { return _selectedItem; }
+            get => _selectedItem;
             set
             {
                 _selectedItem = value;
                 OnPropertyChanged();
 
-                // ReSharper disable ExplicitCallerInfoArgument
                 OnPropertyChanged("CanExecuteIndenterCommand");
                 OnPropertyChanged("CanExecuteRenameCommand");
                 OnPropertyChanged("CanExecuteFindAllReferencesCommand");
                 OnPropertyChanged("ExportVisibility");
                 OnPropertyChanged("ExportAllVisibility");
                 OnPropertyChanged("PanelTitle");
                 OnPropertyChanged("Description");
-
-                // ReSharper restore ExplicitCallerInfoArgument
             }
         }
 
         public bool SortByName
         {
-            get { return _windowSettings.CodeExplorer_SortByName; }
+            get => _windowSettings.CodeExplorer_SortByName;
             set
             {
                 if (_windowSettings.CodeExplorer_SortByName == value)
@@ -166,7 +159,7 @@ public bool SortByName
 
         public bool SortByCodeOrder
         {
-            get { return _windowSettings.CodeExplorer_SortByCodeOrder; }
+            get => _windowSettings.CodeExplorer_SortByCodeOrder;
             set
             {
                 if (_windowSettings.CodeExplorer_SortByCodeOrder == value)
@@ -192,7 +185,7 @@ public bool SortByCodeOrder
 
         public bool GroupByType
         {
-            get { return _windowSettings.CodeExplorer_GroupByType; }
+            get => _windowSettings.CodeExplorer_GroupByType;
             set
             {
                 if (_windowSettings.CodeExplorer_GroupByType != value)
@@ -207,10 +200,22 @@ public bool GroupByType
             }
         }
 
+        private bool _canSearch;
+
+        public bool CanSearch
+        {
+            get => _canSearch;
+            set
+            {
+                _canSearch = value;
+                OnPropertyChanged();
+            }
+        }
+
         private bool _isBusy;
         public bool IsBusy
         {
-            get { return _isBusy; }
+            get => _isBusy;
             set
             {
                 _isBusy = value;
@@ -277,15 +282,17 @@ public string Description
         private ObservableCollection<CodeExplorerItemViewModel> _projects;
         public ObservableCollection<CodeExplorerItemViewModel> Projects
         {
-            get { return _projects; }
+            get => _projects;
             set
             {
                 ReorderChildNodes(value);
                 _projects = new ObservableCollection<CodeExplorerItemViewModel>(value.OrderBy(o => o.NameWithSignature));
-                
+                CanSearch = _projects.Any();
+
                 OnPropertyChanged();
                 // Once a Project has been set, show the TreeView
                 OnPropertyChanged("TreeViewVisibility");
+                OnPropertyChanged("CanSearch");
             }
         }
 
diff --git a/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml b/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml
@@ -291,6 +291,7 @@
 
             <Style x:Key="XButtonStyle" TargetType="Button">
                 <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="Content" Value="✕"/>
                 <Setter Property="BorderThickness" Value="0"/>
                 <Setter Property="HorizontalContentAlignment" Value="Center"/>
                 <Setter Property="VerticalContentAlignment" Value="Center"/>
@@ -490,10 +491,32 @@
             </ToolBar>
         </ToolBarTray>
 
-        <TextBox Grid.Row="1" TextChanged="SearchBox_OnTextChanged" VerticalContentAlignment="Center" Name="SearchBox"></TextBox>
-        <Image Grid.Row="1" Source="{StaticResource SearchImage}" HorizontalAlignment="Right" VerticalAlignment="Center" MaxHeight="16" Margin="0,0,1,0" MouseDown="SearchIcon_OnMouseDown" Visibility="{Binding ElementName=SearchBox, Path=Text.Length, Converter={StaticResource StringHasValueToVisibility}}" />
-        <Button Grid.Row="1" Style="{StaticResource XButtonStyle}" HorizontalAlignment="Right" VerticalAlignment="Center" Height="18" Width="18" Margin="0,1,1,0" Visibility="{Binding ElementName=SearchBox, Path=Text.Length, Converter={StaticResource StringHasNoValueToVisibility}}" Click="ButtonBase_OnClick">✕</Button>
+        <Border Grid.Row="1" 
+                BorderBrush="{StaticResource {x:Static SystemColors.ControlBrushKey}}" 
+                BorderThickness="1">
+            <Grid>
+                <TextBox x:Name="SearchBox"
+                         VerticalContentAlignment="Center"
+                         IsEnabled="{Binding CanSearch}"
+                         MinHeight="20"
+                         PreviewKeyDown="SearchBox_OnPreviewKeyDown"
+                         TextChanged="SearchBox_OnTextChanged" />
         
+                <Image Source="{StaticResource SearchImage}" 
+                       HorizontalAlignment="Right" VerticalAlignment="Center" 
+                       MaxHeight="16" Margin="0,0,1,0" 
+                       IsEnabled="{Binding CanSearch}"
+                       Visibility="{Binding ElementName=SearchBox, Path=Text.Length, Converter={StaticResource StringHasValueToVisibility}}"
+                       MouseDown="SearchIcon_OnMouseDown" />
+        
+                <Button Style="{StaticResource XButtonStyle}" 
+                        HorizontalAlignment="Right" VerticalAlignment="Center" 
+                        Height="18" Width="18" Margin="0,1,1,0" 
+                        IsEnabled="{Binding CanSearch}"
+                        Visibility="{Binding ElementName=SearchBox, Path=Text.Length, Converter={StaticResource StringHasNoValueToVisibility}}" 
+                        Click="ButtonBase_OnClick" />
+            </Grid>
+        </Border>
         <controls:EmptyUIRefresh Grid.Row="2" />
 
         <TreeView x:Name="ProjectTree"
diff --git a/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml.cs b/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml.cs
@@ -43,9 +43,22 @@ private void SearchIcon_OnMouseDown(object sender, MouseButtonEventArgs e)
         }
 
         private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+        {
+            ClearSearchBox();
+        }
+
+        private void ClearSearchBox()
         {
             SearchBox.Text = string.Empty;
             SearchBox.Focus();
         }
+
+        private void SearchBox_OnPreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                ClearSearchBox();
+            }
+        }
     }
 }
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/CodeExplorerCommandMenuItem.cs b/RetailCoder.VBE/UI/Command/MenuItems/CodeExplorerCommandMenuItem.cs
@@ -1,3 +1,4 @@
+using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
 
 namespace Rubberduck.UI.Command.MenuItems
@@ -9,6 +10,8 @@ public CodeExplorerCommandMenuItem(CommandBase command)
         {
         }
 
+        public override bool EvaluateCanExecute(RubberduckParserState state) => true;
+
         public override string Key => "RubberduckMenu_CodeExplorer";
         public override int DisplayOrder => (int)NavigationMenuItemDisplayOrder.CodeExplorer;
     }
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/CommandMenuItemBase.cs b/RetailCoder.VBE/UI/Command/MenuItems/CommandMenuItemBase.cs
@@ -47,7 +47,7 @@ public virtual Func<string> ToolTipText
         /// <remarks>Returns <c>true</c> if not overridden.</remarks>
         public virtual bool EvaluateCanExecute(RubberduckParserState state)
         {
-            return state != null && _command.CanExecute(state);
+            return state != null && (_command?.CanExecute(state) ?? false);
         }
 
         public virtual ButtonStyle ButtonStyle => ButtonStyle.IconAndCaption;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Collections.ObjectModel;`
	`4`	`+using System.Diagnostics.CodeAnalysis;`
`4`	`5`	`using System.Globalization;`
`5`	`6`	`using System.Linq;`
`6`	`7`	`using NLog;`
`@@ -21,6 +22,7 @@`
`21`	`22`	`using System.Windows;`
`22`	`23`
`23`	`24`	`// ReSharper disable CanBeReplacedWithTryCastAndCheckForNull`
	`25`	`+// ReSharper disable ExplicitCallerInfoArgument`
`24`	`26`
`25`	`27`	`namespace Rubberduck.Navigation.CodeExplorer`
`26`	`28`	`{`
`@@ -99,54 +101,45 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st`
`99`	`101`
`100`	`102`	`SetNameSortCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>`
`101`	`103`	`{`
`102`		`- if ((bool)param == true)`
	`104`	`+ if ((bool)param)`
`103`	`105`	`{`
`104`	`106`	`SortByName = (bool)param;`
`105`	`107`	`SortByCodeOrder = !(bool)param;`
`106`	`108`	`}`
`107`		`- }, param =>`
`108`		`- {`
`109`		`- return SortByName ? false : true;`
`110`		`- });`
	`109`	`+ }, param => !SortByName);`
`111`	`110`
`112`	`111`	`SetCodeOrderSortCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>`
`113`	`112`	`{`
`114`		`- if ((bool)param == true)`
	`113`	`+ if ((bool)param)`
`115`	`114`	`{`
`116`	`115`	`SortByCodeOrder = (bool)param;`
`117`	`116`	`SortByName = !(bool)param;`
`118`		`- };`
`119`		`- }, param =>`
`120`		`- {`
`121`		`- return SortByCodeOrder ? false : true;`
`122`		`- });`
	`117`	`+ }`
	`118`	`+ }, param => !SortByCodeOrder);`
`123`	`119`	`}`
`124`	`120`
`125`	`121`	`private CodeExplorerItemViewModel _selectedItem;`
`126`	`122`	`public CodeExplorerItemViewModel SelectedItem`
`127`	`123`	`{`
`128`		`- get { return _selectedItem; }`
	`124`	`+ get => _selectedItem;`
`129`	`125`	`set`
`130`	`126`	`{`
`131`	`127`	`_selectedItem = value;`
`132`	`128`	`OnPropertyChanged();`
`133`	`129`
`134`		`- // ReSharper disable ExplicitCallerInfoArgument`
`135`	`130`	`OnPropertyChanged("CanExecuteIndenterCommand");`
`136`	`131`	`OnPropertyChanged("CanExecuteRenameCommand");`
`137`	`132`	`OnPropertyChanged("CanExecuteFindAllReferencesCommand");`
`138`	`133`	`OnPropertyChanged("ExportVisibility");`
`139`	`134`	`OnPropertyChanged("ExportAllVisibility");`
`140`	`135`	`OnPropertyChanged("PanelTitle");`
`141`	`136`	`OnPropertyChanged("Description");`
`142`		`-`
`143`		`- // ReSharper restore ExplicitCallerInfoArgument`
`144`	`137`	`}`
`145`	`138`	`}`
`146`	`139`
`147`	`140`	`public bool SortByName`
`148`	`141`	`{`
`149`		`- get { return _windowSettings.CodeExplorer_SortByName; }`
	`142`	`+ get => _windowSettings.CodeExplorer_SortByName;`
`150`	`143`	`set`
`151`	`144`	`{`
`152`	`145`	`if (_windowSettings.CodeExplorer_SortByName == value)`
`@@ -166,7 +159,7 @@ public bool SortByName`
`166`	`159`
`167`	`160`	`public bool SortByCodeOrder`
`168`	`161`	`{`
`169`		`- get { return _windowSettings.CodeExplorer_SortByCodeOrder; }`
	`162`	`+ get => _windowSettings.CodeExplorer_SortByCodeOrder;`
`170`	`163`	`set`
`171`	`164`	`{`
`172`	`165`	`if (_windowSettings.CodeExplorer_SortByCodeOrder == value)`
`@@ -192,7 +185,7 @@ public bool SortByCodeOrder`
`192`	`185`
`193`	`186`	`public bool GroupByType`
`194`	`187`	`{`
`195`		`- get { return _windowSettings.CodeExplorer_GroupByType; }`
	`188`	`+ get => _windowSettings.CodeExplorer_GroupByType;`
`196`	`189`	`set`
`197`	`190`	`{`
`198`	`191`	`if (_windowSettings.CodeExplorer_GroupByType != value)`
`@@ -207,10 +200,22 @@ public bool GroupByType`
`207`	`200`	`}`
`208`	`201`	`}`
`209`	`202`
	`203`	`+ private bool _canSearch;`
	`204`	`+`
	`205`	`+ public bool CanSearch`
	`206`	`+ {`
	`207`	`+ get => _canSearch;`
	`208`	`+ set`
	`209`	`+ {`
	`210`	`+ _canSearch = value;`
	`211`	`+ OnPropertyChanged();`
	`212`	`+ }`
	`213`	`+ }`
	`214`	`+`
`210`	`215`	`private bool _isBusy;`
`211`	`216`	`public bool IsBusy`
`212`	`217`	`{`
`213`		`- get { return _isBusy; }`
	`218`	`+ get => _isBusy;`
`214`	`219`	`set`
`215`	`220`	`{`
`216`	`221`	`_isBusy = value;`
`@@ -277,15 +282,17 @@ public string Description`
`277`	`282`	`private ObservableCollection<CodeExplorerItemViewModel> _projects;`
`278`	`283`	`public ObservableCollection<CodeExplorerItemViewModel> Projects`
`279`	`284`	`{`
`280`		`- get { return _projects; }`
	`285`	`+ get => _projects;`
`281`	`286`	`set`
`282`	`287`	`{`
`283`	`288`	`ReorderChildNodes(value);`
`284`	`289`	`_projects = new ObservableCollection<CodeExplorerItemViewModel>(value.OrderBy(o => o.NameWithSignature));`
`285`		`-`
	`290`	`+ CanSearch = _projects.Any();`
	`291`	`+`
`286`	`292`	`OnPropertyChanged();`
`287`	`293`	`// Once a Project has been set, show the TreeView`
`288`	`294`	`OnPropertyChanged("TreeViewVisibility");`
	`295`	`+ OnPropertyChanged("CanSearch");`
`289`	`296`	`}`
`290`	`297`	`}`
`291`	`298`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,22 @@ private void SearchIcon_OnMouseDown(object sender, MouseButtonEventArgs e)`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`private void ButtonBase_OnClick(object sender, RoutedEventArgs e)`
	`46`	`+ {`
	`47`	`+ ClearSearchBox();`
	`48`	`+ }`
	`49`	`+`
	`50`	`+ private void ClearSearchBox()`
`46`	`51`	`{`
`47`	`52`	`SearchBox.Text = string.Empty;`
`48`	`53`	`SearchBox.Focus();`
`49`	`54`	`}`
	`55`	`+`
	`56`	`+ private void SearchBox_OnPreviewKeyDown(object sender, KeyEventArgs e)`
	`57`	`+ {`
	`58`	`+ if (e.Key == Key.Escape)`
	`59`	`+ {`
	`60`	`+ ClearSearchBox();`
	`61`	`+ }`
	`62`	`+ }`
`50`	`63`	`}`
`51`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using Rubberduck.Parsing.VBA;`
`1`	`2`	`using Rubberduck.UI.Command.MenuItems.ParentMenus;`
`2`	`3`
`3`	`4`	`namespace Rubberduck.UI.Command.MenuItems`
`@@ -9,6 +10,8 @@ public CodeExplorerCommandMenuItem(CommandBase command)`
`9`	`10`	`{`
`10`	`11`	`}`
`11`	`12`
	`13`	`+ public override bool EvaluateCanExecute(RubberduckParserState state) => true;`
	`14`	`+`
`12`	`15`	`public override string Key => "RubberduckMenu_CodeExplorer";`
`13`	`16`	`public override int DisplayOrder => (int)NavigationMenuItemDisplayOrder.CodeExplorer;`
`14`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public virtual Func<string> ToolTipText`
`47`	`47`	`/// <remarks>Returns <c>true</c> if not overridden.</remarks>`
`48`	`48`	`public virtual bool EvaluateCanExecute(RubberduckParserState state)`
`49`	`49`	`{`
`50`		`- return state != null && _command.CanExecute(state);`
	`50`	`+ return state != null && (_command?.CanExecute(state) ?? false);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public virtual ButtonStyle ButtonStyle => ButtonStyle.IconAndCaption;`