diff options
| author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-12-18 12:37:48 +0300 |
|---|---|---|
| committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-12-18 12:37:48 +0300 |
| commit | dd68992381922d2397b5be056f07f4f6d4eb4431 (patch) | |
| tree | 6f51e1579f920b0e8f45ccb4314cc018f3218403 /main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs | |
| parent | 6f9f0ce2cdc473b15e780eff388049387cab6d79 (diff) | |
| parent | cb1a77e281e838e4a3a4947f99522f6673843cc4 (diff) | |
Merge remote-tracking branch 'origin/master' into roslyn-nogtkshell
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs index 0ae00803fa..960d80e4ba 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/FileSearchCategory.cs @@ -82,8 +82,8 @@ namespace MonoDevelop.Components.MainToolbar public override Task GetResults (ISearchResultCallback searchResultCallback, SearchPopupSearchPattern pattern, CancellationToken token) { - var files = AllFiles.ToList (); return Task.Run (delegate { + var files = AllFiles.ToList (); var matcher = StringMatcher.GetMatcher (pattern.Pattern, false); savedMatches = new Dictionary<string, MatchResult> (); foreach (ProjectFile file in files) { @@ -99,7 +99,7 @@ namespace MonoDevelop.Components.MainToolbar } savedMatches = null; - }); + }, token); } bool MatchName (StringMatcher matcher, string name, out int matchRank) |