diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2013-05-03 13:32:15 +0400 |
|---|---|---|
| committer | Duncan Mak <duncan.mak@xamarin.com> | 2013-05-10 23:13:03 +0400 |
| commit | fd96c44d878d1e176954e062c9ee658c6fe7d47b (patch) | |
| tree | faab1a8acda7c5e4b6a834262514e48d799635a6 | |
| parent | 1290a574be8a7761bc82229479fd233e11192d06 (diff) | |
[Ide] Fixed find in files.
3 files changed, 6 insertions, 6 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FilterOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FilterOptions.cs index 189b23bc79..48f1c14fbd 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FilterOptions.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FilterOptions.cs @@ -31,10 +31,10 @@ namespace MonoDevelop.Ide.FindInFiles { public class FilterOptions { - private static readonly char [] separators = {';'}; + static readonly char [] separators = {';'}; - private string file_mask; - private string [] split_file_masks; + string file_mask; + string [] split_file_masks; public string FileMask { get { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs index 553c21f096..7dd6852078 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs @@ -770,7 +770,6 @@ namespace MonoDevelop.Ide.FindInFiles string pattern = comboboxentryFind.Entry.Text; FilterOptions options = GetFilterOptions (); - if (!find.ValidatePattern (options, pattern)) { MessageService.ShowError (GettextCatalog.GetString ("Search pattern is invalid")); return; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs index 2c0e1269b7..2a7ada1b35 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs @@ -183,7 +183,7 @@ namespace MonoDevelop.Ide.FindInFiles { foreach (Document document in IdeApp.Workbench.Documents) { monitor.Log.WriteLine (GettextCatalog.GetString ("Looking in '{0}'", document.FileName)); - if (!string.IsNullOrEmpty (document.FileName)) + if (!string.IsNullOrEmpty (document.FileName) && filterOptions.NameMatches (document.FileName)) yield return new FileProvider (document.FileName); } } @@ -246,7 +246,8 @@ namespace MonoDevelop.Ide.FindInFiles if (Path.GetFileName (fileName).StartsWith (".", StringComparison.Ordinal)) continue; } - + if (!filterOptions.NameMatches (fileName)) + continue; if (!IncludeBinaryFiles && !DesktopService.GetFileIsText (fileName)) continue; yield return fileName; |