Refactoring: use embedded avalon search box.

Author: someone-with-default-username

Nitra.Visualizer/MainWindow.xaml

@@ -13,10 +13,6 @@
     <RoutedUICommand x:Key="UpdateTest"       Text="Update Test" />
     <RoutedUICommand x:Key="RemoveTest"       Text="Remove Test" />
     <RoutedUICommand x:Key="RunTests"         Text="Run Tests" />
-    <RoutedUICommand x:Key="FindNext"         Text="Find Next" />
-    <RoutedUICommand x:Key="FindNextSelected" Text="Find Next Selected" />
-    <RoutedUICommand x:Key="FindPrevSelected" Text="Find Previos Selected" />
-    <RoutedUICommand x:Key="FindPrev"         Text="Find Prev" />
     <RoutedUICommand x:Key="CopyNodeText"     Text="Copy" />
     <RoutedUICommand x:Key="RunTest"          Text="Run test" />
     <RoutedUICommand x:Key="Repars"           Text="Repars code" />
@@ -37,25 +33,12 @@
     <CommandBinding Command="{StaticResource RemoveTest}"       Executed="OnRemoveTest"               CanExecute="CommandBinding_CanRemoveTest" />
     <CommandBinding Command="{StaticResource CopyNodeText}"     Executed="CopyReflectionNodeText" />  
     <CommandBinding Command="{StaticResource RunTest}"          Executed="OnRunTest"                  CanExecute="CommandBinding_CanRunTest" />
-    <CommandBinding Command="{StaticResource FindNext}"         Executed="FindNext_Executed"          CanExecute="CommandBinding_CanExecute" />
-    <CommandBinding Command="{StaticResource FindPrev}"         Executed="FindPrev_Executed"          CanExecute="CommandBinding_CanExecute" />
-    <CommandBinding Command="{StaticResource FindNextSelected}" Executed="FindNext_Executed_Selected" CanExecute="CommandBinding_CanExecute" />
-    <CommandBinding Command="{StaticResource FindPrevSelected}" Executed="FindPrev_Executed_Selected" CanExecute="CommandBinding_CanExecute" />
-    <CommandBinding Command="Open"                              Executed="FileOpenExecuted" />
-    <CommandBinding Command="Find"                              Executed="FindExecuted"               CanExecute="FindCanExecute"/>
   </Window.CommandBindings>
 
   <Window.InputBindings>
-    <KeyBinding Command="{StaticResource FindNext}"         Key="Enter" />
-    <KeyBinding Command="{StaticResource FindNext}"         Key="F3" />
-    <KeyBinding Command="{StaticResource FindNextSelected}" Key="F3"    Modifiers="Control" />
-    <KeyBinding Command="{StaticResource FindPrevSelected}" Key="F3"    Modifiers="Control + Shift" />
-    <KeyBinding Command="{StaticResource FindPrev}"         Key="F3"    Modifiers="Shift" />
-    <KeyBinding Command="{StaticResource FindPrev}"         Key="Enter" Modifiers="Shift"/>
     <KeyBinding Command="{StaticResource Repars}"           Key="R"     Modifiers="Control"/>
   </Window.InputBindings>
 
-
   <Grid>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -163,22 +146,6 @@
         <GridSplitter Grid.Row="1" Grid.Column="0" Width="9" ResizeDirection="Columns" HorizontalAlignment="Right" VerticalAlignment="Stretch" Background="#5700FF00" Margin="0,0,-9,0"  />
         <nitra:NitraTextEditor x:Name="_text" Grid.Row="1" Grid.Column="2" TextChanged="textBox1_TextChanged" MouseHover="textBox1_MouseHover"  MouseHoverStopped="textBox1_MouseHoverStopped" FontFamily="Consolas" FontSize="16" LostFocus="textBox1_LostFocus" GotFocus="textBox1_GotFocus" HighlightLine="textBox1_HighlightLine" KeyDown="_control_KeyDown_resize" />
       </Grid>
-
-      <Grid Grid.Row="1" Visibility="Visible" Name="_findGrid">
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition Width="191*" />
-          <ColumnDefinition Width="617*" />
-          <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <TextBox Name="_findText" HorizontalAlignment="Stretch" Grid.ColumnSpan="2" />
-        <StackPanel Orientation="Horizontal" Grid.Column="2">
-          <Button Content="Prev" Height="23" Name="_findPrev"   Margin="3,2,3,2" Command="{StaticResource FindPrev}" />
-          <Button Content="Next" Height="23" Name="_findNext" Margin="3,2,3,2" Command="{StaticResource FindNext}" />
-          <CheckBox Content="Match case" Height="16" Name="_findMatchCase"  Margin="3,2,3,2" />
-          <CheckBox Content="Match whole word" Height="16" Name="_findMatchWholeWord"  Margin="3,2,3,2" />
-          <Button Content="Close" Height="23" Name="_findClose"  Margin="3,2,3,2" Click="_findClose_Click" />
-        </StackPanel>
-      </Grid>
     </Grid>
     <GridSplitter Grid.Row="1" Height="8" ResizeDirection="Rows" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Background="#5700FF00" />
     <TabControl Name="_tabControl" Grid.Row="2" SelectionChanged="_tabControl_SelectionChanged">

Nitra.Visualizer/MainWindow.xaml.cs

@@ -81,7 +81,6 @@ public MainWindow()
       _configComboBox.SelectedItem = config == "Release" ? "Release" : "Debug";
 
       _tabControl.SelectedIndex = _settings.ActiveTabIndex;
-      _findGrid.Visibility      = System.Windows.Visibility.Collapsed;
       _foldingStrategy          = new NitraFoldingStrategy();
       _textBox1Tooltip          = new ToolTip { PlacementTarget = _text };
       _parseTimer               = new Timer { AutoReset = false, Enabled = false, Interval = 300 };
@@ -560,116 +559,12 @@ private void textBox1_MouseHoverStopped(object sender, MouseEventArgs e)
       _textBox1Tooltip.IsOpen = false;
     }
 
-    private void FindCanExecute(object sender, CanExecuteRoutedEventArgs e)
-    {
-      e.CanExecute = true;
-      e.Handled = true;
-    }
-
-    private void FindExecuted(object sender, ExecutedRoutedEventArgs e)
-    {
-      _findGrid.Visibility = System.Windows.Visibility.Visible;
-      _findText.Focus();
-      e.Handled = true;
-    }
-
-    private void _findClose_Click(object sender, RoutedEventArgs e)
-    {
-      _findGrid.Visibility = System.Windows.Visibility.Collapsed;
-    }
-
     private void CommandBinding_CanExecute(object sender, CanExecuteRoutedEventArgs e)
     {
       e.CanExecute = true;
       e.Handled = true;
     }
 
-    private void FindNext_Executed(object sender, ExecutedRoutedEventArgs e)
-    {
-      FindNext();
-    }
-
-    private void FindPrev_Executed(object sender, ExecutedRoutedEventArgs e)
-    {
-      FindPrev();
-    }
-
-    private void FindNext()
-    {
-      var option = GetMatchCaseOption();
-      var toFind = _findText.Text;
-      var text   = _text.Text;
-      var index  = _text.SelectionStart + _text.SelectionLength - 1;
-
-      do
-      {
-        if (index < text.Length)
-          index++;
-        index = text.IndexOf(toFind, index, option);
-      }
-      while (index >= 0 && !IsWholeWord(text, index, toFind.Length));
-
-      var found = index >= 0;
-      if (found)
-      {
-        _text.Select(index, toFind.Length);
-        _text.ScrollToLine(_text.TextArea.Caret.Line);
-      }
-      else
-        _status.Text = "Can't find '" + toFind + "'.";
-    }
-
-    private void FindPrev()
-    {
-      var option = GetMatchCaseOption();
-      var toFind = _findText.Text;
-      var text = _text.Text;
-      var index = _text.SelectionStart;
-
-      do
-      {
-        if (index > 0)
-          index--;
-        index = text.LastIndexOf(toFind, index, option);
-      }
-      while (index >= 0 && !IsWholeWord(text, index, toFind.Length));
-
-      var found = index >= 0;
-
-      if (found)
-      {
-        _text.Select(index, toFind.Length);
-        _text.ScrollToLine(_text.TextArea.Caret.Line);
-      }
-      else
-        _status.Text = "Can't find '" + toFind + "'.";
-    }
-
-    private bool IsWholeWord(string text, int start, int length)
-    {
-      if (!(_findMatchWholeWord.IsChecked ?? false))
-        return true;
-
-      var end = start + length - 1;
-
-      if (end < text.Length)
-        if (char.IsLetterOrDigit(text[end]) || text[end] == '_')
-          if (char.IsLetterOrDigit(text[end + 1]) || text[end + 1] == '_')
-            return false;
-
-      if (start > 0)
-        if (char.IsLetterOrDigit(text[start]) || text[start] == '_')
-          if (char.IsLetterOrDigit(text[start - 1]) || text[start - 1] == '_')
-            return false;
-
-      return true;
-    }
-
-    private StringComparison GetMatchCaseOption()
-    {
-      return _findMatchCase.IsChecked ?? false ? StringComparison.InvariantCulture : StringComparison.InvariantCultureIgnoreCase;
-    }
-
     private void _tabControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
     {
       UpdateInfo();
@@ -1240,94 +1135,6 @@ private static bool IsSplicable(ParseResult parseResult)
     {
       return parseResult.RuleParser.Descriptor.Grammar.IsSplicable;
     }
-    
-    private void FindNext_Executed_Selected(object sender, ExecutedRoutedEventArgs e)
-    {
-      FindSelected(next: true);
-    }
-
-    private void FindPrev_Executed_Selected(object sender, ExecutedRoutedEventArgs e)
-    {
-      FindSelected(next: false);
-    }
-
-    private void FindSelected(bool next)
-    {
-      if (_text.SelectionLength > 0)
-      {
-        _findText.Text = _text.SelectedText;
-        
-        if (next)
-          FindNext();
-        else
-          FindPrev();
-      }
-      else
-      {
-        var line = _text.Document.Lines[_text.TextArea.Caret.Line - 1];
-        var text = _text.Document.GetText(line.Offset, line.Length);
-        var startIndex = Math.Min(_text.TextArea.Caret.Column - 1, text.Length - 1);
-        var firstCh = text[startIndex];
-        int patternStartIndex;
-        string searchPattern = IsIdentifier(firstCh)
-          ? ExtractIdentifier(text, startIndex, out patternStartIndex)
-          : ExtractNotEmpty(text, startIndex, out patternStartIndex);
-
-        if (!string.IsNullOrWhiteSpace(searchPattern))
-        {
-          _findText.Text = searchPattern;
-          _text.Select(line.Offset + patternStartIndex, searchPattern.Length);
-
-          if (next)
-            FindNext();
-          else
-          {
-            _text.TextArea.Caret.Column = patternStartIndex + 1;
-            FindPrev();
-          }
-        }
-      }
-    }
-
-    public static string ExtractNotEmpty(string text, int startIndex, out int patternStartIndex)
-    {
-      return ExtractString(text, startIndex, char.IsWhiteSpace, out patternStartIndex);
-    }
-
-    public static string ExtractIdentifier(string text, int startIndex, out int patternStartIndex)
-    {
-      return ExtractString(text, startIndex, ch => !IsIdentifier(ch), out patternStartIndex);
-    }
-
-    public static string ExtractString(string text, int startIndex, Func<char, bool> predicate, out int patternStartIndex)
-    {
-      int i = startIndex;
-      for (; i > 0; i--)
-      {
-        var ch = text[i];
-        if (predicate(ch))
-        {
-          i++;
-          break;
-        }
-      }
-
-      int j = startIndex;
-      for (; j < text.Length; j++)
-      {
-        var ch = text[j];
-        if (predicate(ch))
-          break;
-      }
-
-      patternStartIndex = i;
-      return text.Substring(i, j - i);
-    }
-
-    private static bool IsIdentifier(char ch)
-    {
-      return char.IsLetterOrDigit(ch) || ch == '_';
-    }
 
     private void _control_KeyDown_resize(object sender, KeyEventArgs e)
     {

Nitra.Visualizer/Nitra.Visualizer.csproj

@@ -117,6 +117,7 @@
       <DependentUpon>AddTest.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="NitraSearchInputHandler.cs" />
     <Compile Include="Rendering\ReflectionStructColorConverter.cs" />
     <Compile Include="Rendering\GrammarRenderer.cs" />
     <Compile Include="TreeViewItemBehavior.cs" />