diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2016-08-01 12:21:12 +0300 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2016-08-01 12:21:12 +0300 |
| commit | 5f255f4283a31a29cd94582080dd15590539e616 (patch) | |
| tree | a6675a3f7155be3401bb714ab506202d8c6c94c1 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles | |
| parent | 25dcd78ef88a647de5251a8466ffe4022be4b6a7 (diff) | |
| parent | b46436808d73749244a3be546db625e9a3653d92 (diff) | |
Merge branch 'master' into maceditor
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchProgressMonitor.cs | 2 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchProgressMonitor.cs index b81f308070..96c990a9f5 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchProgressMonitor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchProgressMonitor.cs @@ -112,7 +112,7 @@ namespace MonoDevelop.Ide.FindInFiles outputPad.WriteText (msg + "\n"); foreach (var msg in Errors) - outputPad.WriteText (msg.Message + "\n"); + outputPad.WriteText (msg.DisplayMessage + "\n"); outputPad.EndProgress (); base.OnCompleted (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs index 72e6f41dd3..6d5c373e40 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs @@ -348,7 +348,7 @@ namespace MonoDevelop.Ide.FindInFiles while (idx > 0) { idx += "foreground=\"".Length; - result.Append (markup.Substring (offset, idx - offset)); + result.Append (markup, offset, idx - offset); if (idx + 7 >= markup.Length) { offset = idx; break; @@ -364,7 +364,7 @@ namespace MonoDevelop.Ide.FindInFiles result.Append (colorStr); idx = markup.IndexOf ("foreground=\"", idx, StringComparison.Ordinal); } - result.Append (markup.Substring (offset, markup.Length - offset)); + result.Append (markup, offset, markup.Length - offset); return result.ToString (); } public static string ColorToPangoMarkup (Gdk.Color color) @@ -903,7 +903,7 @@ namespace MonoDevelop.Ide.FindInFiles markupBuilder.Append ("</span>"); opened = false; } - markupBuilder.Append (textMarkup.Substring(j + 1)); + markupBuilder.Append (textMarkup, j + 1, textMarkup.Length - j - 1); return ColorMarkupBackground (markupBuilder.ToString (), i, endIndex, searchColor); } continue; @@ -916,7 +916,7 @@ namespace MonoDevelop.Ide.FindInFiles markupBuilder.Append ("</span>"); opened = false; } - markupBuilder.Append (textMarkup.Substring (j)); + markupBuilder.Append (textMarkup, j, textMarkup.Length - j); closed = true; break; } |