Code cleanup

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj

@@ -290,7 +290,7 @@
     <Compile Include="Rendering\VisualYPosition.cs">
       <DependentUpon>VisualLine.cs</DependentUpon>
     </Compile>
-    <Compile Include="Search\DefaultSearchStrategy.cs" />
+    <Compile Include="Search\RegexSearchStrategy.cs" />
     <Compile Include="Search\DropDownButton.cs" />
     <Compile Include="Search\ISearchStrategy.cs" />
     <Compile Include="Search\SearchCommands.cs" />
@@ -299,6 +299,7 @@
       <DependentUpon>SearchPanel.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Search\SearchStrategyFactory.cs" />
     <Compile Include="Snippets\IActiveElement.cs" />
     <Compile Include="Snippets\SnippetAnchorElement.cs" />
     <Compile Include="Snippets\SnippetEventArgs.cs" />

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/DefaultSearchStrategy.cs

@@ -1,58 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-using ICSharpCode.AvalonEdit.Document;
-using ICSharpCode.AvalonEdit.Editing;
-using ICSharpCode.AvalonEdit.Folding;
-using ICSharpCode.AvalonEdit.Rendering;
-
-namespace ICSharpCode.AvalonEdit.Search
-{
-	class DefaultSearchStrategy : ISearchStrategy
-	{
-		readonly Regex searchPattern;
-		
-		public DefaultSearchStrategy(Regex searchPattern)
-		{
-			this.searchPattern = searchPattern;
-		}
-	
-		public static ISearchStrategy Create(string searchPattern, bool ignoreCase, bool useRegularExpressions, bool matchWholeWords)
-		{
-			if (searchPattern == null)
-				throw new ArgumentNullException("searchPattern");
-			RegexOptions options = RegexOptions.Compiled;
-			if (ignoreCase)
-				options |= RegexOptions.IgnoreCase;
-			if (!useRegularExpressions)
-				searchPattern = Regex.Escape(searchPattern);
-			if (matchWholeWords)
-				searchPattern = "\\b" + searchPattern + "\\b";
-			try {
-				Regex pattern = new Regex(searchPattern, options);
-				return new DefaultSearchStrategy(pattern);
-			} catch (ArgumentException ex) {
-				throw new SearchPatternException(ex.Message, ex);
-			}
-		}
-		
-		public IEnumerable<ISearchResult> FindAll(ITextSource document)
-		{
-			foreach (Match result in searchPattern.Matches(document.Text)) {
-				yield return new SearchResult { StartOffset = result.Index, Length = result.Length };
-			}
-		}
-	}
-}

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/ISearchStrategy.cs

@@ -20,9 +20,11 @@ namespace ICSharpCode.AvalonEdit.Search
 		
 	}
 	
+	[Serializable]
 	public class SearchPatternException : Exception
 	{
-		public SearchPatternException(string message, Exception exception) : base(message, exception)
+		public SearchPatternException(string message, Exception exception)
+			: base(message, exception)
 		{
 		}
 	}

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/RegexSearchStrategy.cs

@@ -0,0 +1,32 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+using ICSharpCode.AvalonEdit.Document;
+
+namespace ICSharpCode.AvalonEdit.Search
+{
+	class RegexSearchStrategy : ISearchStrategy
+	{
+		readonly Regex searchPattern;
+		
+		public RegexSearchStrategy(Regex searchPattern)
+		{
+			this.searchPattern = searchPattern;
+		}
+		
+		public IEnumerable<ISearchResult> FindAll(ITextSource document)
+		{
+			foreach (Match result in searchPattern.Matches(document.Text)) {
+				yield return new SearchResult { StartOffset = result.Index, Length = result.Length };
+			}
+		}
+	}
+	
+	class SearchResult : TextSegment, ISearchResult
+	{
+	}
+}

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchCommands.cs

@@ -25,8 +25,4 @@ namespace ICSharpCode.AvalonEdit.Search
 			new InputGestureCollection { new KeyGesture(Key.F3, ModifierKeys.Shift) }
 		);
 	}
-	
-	class SearchResult : TextSegment, ISearchResult
-	{
-	}
 }

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchPanel.xaml

@@ -1,44 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <UserControl x:Class="ICSharpCode.AvalonEdit.Search.SearchPanel" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:ICSharpCode.AvalonEdit.Search" FocusManager.IsFocusScope="True" PreviewKeyDown="SearchLayerKeyDown">
-	<UserControl.Resources>
-		<BitmapImage x:Key="PrevImage" UriSource="prev.png" />
-		<BitmapImage x:Key="NextImage" UriSource="next.png" />
-	</UserControl.Resources>
 	<Border Background="White" BorderBrush="DimGray" BorderThickness="1" HorizontalAlignment="Right" VerticalAlignment="Top" Cursor="Arrow">
-		<Grid>
+		<StackPanel Orientation="Horizontal">
-			<Grid.RowDefinitions>
+			<TextBox x:FieldModifier="private" Name="searchTextBox" Focusable="True" Width="100" Height="24" Margin="3,3,3,0" PreviewKeyDown="SearchLayerKeyDown" AcceptsTab="True">
-				<RowDefinition Height="Auto" />
+				<TextBox.Text>
-				<RowDefinition Height="Auto" />
+					<Binding Path="SearchPattern" UpdateSourceTrigger="PropertyChanged">
-			</Grid.RowDefinitions>
+						<Binding.ValidationRules>
-			<StackPanel Orientation="Horizontal" Margin="3">
+							<ExceptionValidationRule />
-				<TextBox Name="searchTextBox" Focusable="True" Width="100" Height="24" Margin="3,3,3,0" TextChanged="SearchTextBoxTextChanged" PreviewKeyDown="SearchLayerKeyDown" />
+						</Binding.ValidationRules>
-				<local:DropDownButton Height="24">
+					</Binding>
-					<local:DropDownButton.DropDownContent>
+				</TextBox.Text>
-						<Popup StaysOpen="False">
+			</TextBox>
-							<Border Background="White" BorderBrush="DimGray" BorderThickness="1">
+			<local:DropDownButton Height="24">
-								<StackPanel Orientation="Vertical">
+				<local:DropDownButton.DropDownContent>
-									<CheckBox x:FieldModifier="private" x:Name="matchCase" Content="Match case" Margin="3"  />
+					<Popup StaysOpen="False">
-									<CheckBox x:FieldModifier="private" x:Name="wholeWords" Content="Match whole words" Margin="3" />
+						<Border Background="White" BorderBrush="DimGray" BorderThickness="1">
-									<CheckBox x:FieldModifier="private" x:Name="useRegex" Content="Use Regular Expressions" Margin="3" />
+							<StackPanel Orientation="Vertical">
-								</StackPanel>
+								<CheckBox x:FieldModifier="private" x:Name="matchCase" Content="Match case" Margin="3"  />
-							</Border>
+								<CheckBox x:FieldModifier="private" x:Name="wholeWords" Content="Match whole words" Margin="3" />
-						</Popup>
+								<CheckBox x:FieldModifier="private" x:Name="useRegex" Content="Use Regular Expressions" Margin="3" />
-					</local:DropDownButton.DropDownContent>
+							</StackPanel>
-				</local:DropDownButton>
+						</Border>
-				<Button Margin="3" Height="24" Width="24" Command="local:SearchCommands.FindPrevious" ToolTip="Find Next (Ctrl+F3)">
+					</Popup>
-					<Image Width="16" Height="16" Stretch="Fill" Source="{StaticResource PrevImage}" />
+				</local:DropDownButton.DropDownContent>
-				</Button>
+			</local:DropDownButton>
-				<Button Margin="3" Height="24" Width="24" Command="local:SearchCommands.FindNext" ToolTip="Find Next (F3)">
+			<Button Margin="3" Height="24" Width="24" Command="local:SearchCommands.FindPrevious" ToolTip="Find Next (Shift+F3)">
-					<Image Width="16" Height="16" Stretch="Fill" Source="{StaticResource NextImage}" />
+				<Image Width="16" Height="16" Stretch="Fill" Source="prev.png" />
-				</Button>
+			</Button>
-				<Button Click="CloseClick" Margin="3" Height="16" Width="16" VerticalContentAlignment="Top" HorizontalContentAlignment="Left">
+			<Button Margin="3" Height="24" Width="24" Command="local:SearchCommands.FindNext" ToolTip="Find Next (F3)">
-					<Grid>
+				<Image Width="16" Height="16" Stretch="Fill" Source="next.png" />
-						<Line X1="2" Y1="2" X2="8" Y2="8" Stroke="Black" StrokeThickness="1" />
+			</Button>
-						<Line X1="8" Y1="2" X2="2" Y2="8" Stroke="Black" StrokeThickness="1" />
+			<Button Click="CloseClick" HorizontalAlignment="Right" VerticalAlignment="Top" Height="16" Width="16">
-					</Grid>
+				<Grid>
-				</Button>
+					<Line X1="2" Y1="2" X2="8" Y2="8" Stroke="Black" StrokeThickness="1" />
-			</StackPanel>
+					<Line X1="8" Y1="2" X2="2" Y2="8" Stroke="Black" StrokeThickness="1" />
-			<TextBlock Name="messageView" Grid.Row="1" Margin="3" Visibility="Collapsed" TextWrapping="Wrap" />
+				</Grid>
-		</Grid>
+			</Button>
+		</StackPanel>
 	</Border>
 </UserControl>

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchPanel.xaml.cs

@@ -34,12 +34,35 @@ namespace ICSharpCode.AvalonEdit.Search
 		public bool MatchCase { get { return matchCase.IsChecked == true; } }
 		public bool WholeWords { get { return wholeWords.IsChecked == true; } }
 		
+		string searchPattern;
+		ISearchStrategy strategy;
+		
+		public string SearchPattern {
+			get { return searchPattern; }
+			set {
+				searchPattern = value;
+				UpdateSearch();
+			}
+		}
+
+		void UpdateSearch(bool throwException = true)
+		{
+			if (!string.IsNullOrEmpty(searchPattern)) {
+				try {
+					strategy = SearchStrategyFactory.Create(searchPattern, !MatchCase, UseRegex, WholeWords);
+					DoSearch(true);
+				} catch (SearchPatternException ex) {
+					if (throwException) throw;
+				}
+			}
+		}
+		
 		public SearchPanel(TextArea textArea)
 		{
 			if (textArea == null)
 				throw new ArgumentNullException("textArea");
 			this.textArea = textArea;
-			
+			DataContext = this;
 			InitializeComponent();
 			
 			textArea.TextView.Layers.Add(this);
@@ -50,18 +73,13 @@ namespace ICSharpCode.AvalonEdit.Search
 			textArea.Document.TextChanged += delegate { DoSearch(false); };
 			this.Loaded += delegate { searchTextBox.Focus(); };
 			
-			useRegex.Checked += delegate { DoSearch(true); };
+			useRegex.Checked += delegate { UpdateSearch(false); };
-			matchCase.Checked += delegate { DoSearch(true); };
+			matchCase.Checked += delegate { UpdateSearch(false); };
-			wholeWords.Checked += delegate { DoSearch(true); };
+			wholeWords.Checked += delegate { UpdateSearch(false); };
 			
-			useRegex.Unchecked += delegate { DoSearch(true); };
+			useRegex.Unchecked += delegate { UpdateSearch(false); };
-			matchCase.Unchecked += delegate { DoSearch(true); };
+			matchCase.Unchecked += delegate { UpdateSearch(false); };
-			wholeWords.Unchecked += delegate { DoSearch(true); };
+			wholeWords.Unchecked += delegate { UpdateSearch(false); };
-		}
-
-		void SearchTextBoxTextChanged(object sender, TextChangedEventArgs e)
-		{
-			DoSearch(true);
 		}
 		
 		/// <summary>
@@ -98,31 +116,26 @@ namespace ICSharpCode.AvalonEdit.Search
 				SetResult(result);
 			}
 		}
+		
+		ToolTip messageView = new ToolTip { Placement = PlacementMode.Bottom };
 
 		void DoSearch(bool changeSelection)
 		{
 			renderer.CurrentResults.Clear();
 			currentResult = null;
-			messageView.Visibility = Visibility.Collapsed;
+			if (!string.IsNullOrEmpty(SearchPattern)) {
-			if (!string.IsNullOrEmpty(searchTextBox.Text)) {
+				int offset = textArea.Caret.Offset;
-				try {
+				if (changeSelection) {
-					ISearchStrategy strategy = DefaultSearchStrategy.Create(searchTextBox.Text, !MatchCase, UseRegex, WholeWords);
+					textArea.Selection = SimpleSelection.Empty;
-					int offset = textArea.Caret.Offset;
+				}
-					if (changeSelection) {
+				foreach (SearchResult result in strategy.FindAll(textArea.Document)) {
-						textArea.Selection = SimpleSelection.Empty;
+					if (currentResult == null && result.StartOffset >= offset) {
-					}
+						currentResult = result;
-					foreach (SearchResult result in strategy.FindAll(textArea.Document)) {
+						if (changeSelection) {
-						if (currentResult == null && result.StartOffset >= offset) {
+							SetResult(result);
-							currentResult = result;
-							if (changeSelection) {
-								SetResult(result);
-							}
 						}
-						renderer.CurrentResults.Add(result);
 					}
-				} catch (SearchPatternException ex) {
+					renderer.CurrentResults.Add(result);
-					messageView.Text = "Error: " + ex.Message;
-					messageView.Visibility = Visibility.Visible;
 				}
 			}
 			textArea.TextView.InvalidateLayer(KnownLayer.Selection);
@@ -140,8 +153,21 @@ namespace ICSharpCode.AvalonEdit.Search
 		
 		void SearchLayerKeyDown(object sender, KeyEventArgs e)
 		{
-			if (e.Key == Key.Escape) {
+			switch (e.Key) {
-				CloseClick(sender, e);
+				case Key.Enter:
+					try {
+						messageView.IsOpen = false;
+						messageView.Content = null;
+						UpdateSearch();
+					} catch (SearchPatternException ex) {
+						messageView.Content = "Error: " + ex.Message;
+						messageView.PlacementTarget = searchTextBox;
+						messageView.IsOpen = true;
+					}
+					break;
+				case Key.Escape:
+					CloseClick(sender, e);
+					break;
 			}
 		}
 		
@@ -149,6 +175,7 @@ namespace ICSharpCode.AvalonEdit.Search
 		{
 			textArea.TextView.Layers.Remove(this);
 			textArea.TextView.BackgroundRenderers.Remove(renderer);
+			messageView.IsOpen = false;
 		}
 	}
 }

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchStrategyFactory.cs

@@ -0,0 +1,30 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Text.RegularExpressions;
+
+namespace ICSharpCode.AvalonEdit.Search
+{
+	public class SearchStrategyFactory
+	{
+		public static ISearchStrategy Create(string searchPattern, bool ignoreCase, bool useRegularExpressions, bool matchWholeWords)
+		{
+			if (searchPattern == null)
+				throw new ArgumentNullException("searchPattern");
+			RegexOptions options = RegexOptions.Compiled | RegexOptions.Multiline;
+			if (ignoreCase)
+				options |= RegexOptions.IgnoreCase;
+			if (!useRegularExpressions)
+				searchPattern = Regex.Escape(searchPattern);
+			if (matchWholeWords)
+				searchPattern = "\\b" + searchPattern + "\\b";
+			try {
+				Regex pattern = new Regex(searchPattern, options);
+				return new RegexSearchStrategy(pattern);
+			} catch (ArgumentException ex) {
+				throw new SearchPatternException(ex.Message, ex);
+			}
+		}
+	}
+}