Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Krüger <mikkrg@microsoft.com>2018-04-16 13:31:36 +0300
committerMike Krüger <mikkrg@microsoft.com>2018-04-16 13:31:36 +0300
commit27c053bec2bd5edec79a210482db4d2ab0b9cfe0 (patch)
tree51c718cbaa7862912cff2320ada16a6d96deb53f /main/src/core
parent6dda883bd60ddcb086d94b72f9e2d2ea27e56ec3 (diff)
Fixes issue #4393 Error in text editor The original error should be
already fixed (the line numbers indicate it). However the text editor errors should be printed to the log and not the console. This had historical reasons because the editor was stand alone and had no connection to the Core/Ide and no own logging capabilities.
Diffstat (limited to 'main/src/core')
-rw-r--r--main/src/core/Mono.TextEditor.Shared/Mono.TextEditor.Highlighting/XmlReadHelper.cs5
-rw-r--r--main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Actions/ClipboardActions.cs2
-rw-r--r--main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Document/DiffTracker.cs5
-rw-r--r--main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/EditMode.cs3
-rw-r--r--main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorData.cs3
-rw-r--r--main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs5
6 files changed, 14 insertions, 9 deletions
diff --git a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor.Highlighting/XmlReadHelper.cs b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor.Highlighting/XmlReadHelper.cs
index bdf9ab1eb7..0f671a295e 100644
--- a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor.Highlighting/XmlReadHelper.cs
+++ b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor.Highlighting/XmlReadHelper.cs
@@ -29,6 +29,7 @@
using System;
using System.Collections.Generic;
using System.Xml;
+using MonoDevelop.Core;
namespace Mono.TextEditor.Highlighting
{
@@ -81,7 +82,7 @@ namespace Mono.TextEditor.Highlighting
case XmlNodeType.EndElement:
if (endNodes.Contains (reader.LocalName))
return;
- Console.WriteLine ("Unknown end node: " + reader.LocalName + " valid end nodes are: " + ConcatString (endNodes));
+ LoggingService.LogWarning ("Unknown end node: " + reader.LocalName + " valid end nodes are: " + ConcatString (endNodes));
break;
case XmlNodeType.Element:
if (!didReadStartNode && endNodes.Contains (reader.LocalName)) {
@@ -90,7 +91,7 @@ namespace Mono.TextEditor.Highlighting
}
bool validNode = callback (data);
if (!validNode)
- Console.WriteLine ("Unknown node: " + reader.LocalName);
+ LoggingService.LogWarning ("Unknown node: " + reader.LocalName);
if (data.SkipNextRead)
goto skip;
break;
diff --git a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Actions/ClipboardActions.cs b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Actions/ClipboardActions.cs
index c0894e600b..43841a7f85 100644
--- a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Actions/ClipboardActions.cs
+++ b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Actions/ClipboardActions.cs
@@ -214,7 +214,7 @@ namespace Mono.TextEditor
try {
copyData = pasteHandler.GetCopyData (segment.Offset, segment.Length);
} catch (Exception e) {
- Console.WriteLine ("Exception while getting copy data:" + e);
+ LoggingService.LogError ("Exc eption while getting copy data:" + e);
}
}
break;
diff --git a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Document/DiffTracker.cs b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Document/DiffTracker.cs
index 2246c19076..3312353b4e 100644
--- a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Document/DiffTracker.cs
+++ b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Document/DiffTracker.cs
@@ -25,6 +25,7 @@
// THE SOFTWARE.
using System;
using Mono.TextEditor.Utils;
+using MonoDevelop.Core;
using MonoDevelop.Ide.Editor;
namespace Mono.TextEditor
@@ -85,7 +86,7 @@ namespace Mono.TextEditor
var lineNumber = startLine.LineNumber;
lineStates.RemoveRange (lineNumber, endRemoveLine.LineNumber - lineNumber);
} catch (Exception ex) {
- Console.WriteLine ("error while DiffTracker.TrackDocument_TextChanging:" + ex);
+ LoggingService.LogError ("error while DiffTracker.TrackDocument_TextChanging:" + ex);
}
}
}
@@ -112,7 +113,7 @@ namespace Mono.TextEditor
if (trackDocument != null)
trackDocument.CommitMultipleLineUpdate (lineNumber, lineNumber + insertedLines);
} catch (Exception ex) {
- Console.WriteLine ("error while DiffTracker.TrackDocument_TextChanged:" + ex);
+ LoggingService.LogError ("error while DiffTracker.TrackDocument_TextChanged:" + ex);
}
}
}
diff --git a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/EditMode.cs b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/EditMode.cs
index 6667e35639..6cb52fdf3b 100644
--- a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/EditMode.cs
+++ b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/EditMode.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
using Gdk;
using MonoDevelop.Components;
using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core;
using Microsoft.CodeAnalysis.Text;
namespace Mono.TextEditor
@@ -228,7 +229,7 @@ namespace Mono.TextEditor
var sb = new System.Text.StringBuilder ("Error while executing actions ");
foreach (var action in actions)
sb.AppendFormat (" {0}", action);
- Console.WriteLine (sb.ToString () + ": " + e);
+ LoggingService.LogError (sb.ToString () + ": " + e);
}
}
diff --git a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorData.cs b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorData.cs
index 48dfa4bf99..15331a2d0d 100644
--- a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorData.cs
+++ b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorData.cs
@@ -31,6 +31,7 @@ using System.IO;
using System.Diagnostics;
using Mono.TextEditor.Highlighting;
using Xwt.Drawing;
+using MonoDevelop.Core;
using MonoDevelop.Core.Text;
using MonoDevelop.Ide.Editor;
using MonoDevelop.Ide.Editor.Extension;
@@ -1418,7 +1419,7 @@ namespace Mono.TextEditor
try {
newText = TextPasteHandler.FormatPlainText (offset, text, copyData);
} catch (Exception e) {
- Console.WriteLine ("Text paste handler exception:" + e);
+ LoggingService.LogError ("Text paste handler exception:" + e);
newText = text;
}
if (newText != text) {
diff --git a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs
index 7e9e50ae55..7a0985fea5 100644
--- a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs
+++ b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs
@@ -26,6 +26,7 @@
using System;
using System.Diagnostics;
+using MonoDevelop.Core;
using Mono.TextEditor.Highlighting;
using MonoDevelop.Ide.Editor.Highlighting;
@@ -396,7 +397,7 @@ namespace Mono.TextEditor
try {
font = Pango.FontDescription.FromString (FontName);
} catch {
- Console.WriteLine ("Could not load font: {0}", FontName);
+ LoggingService.LogError ("Could not load font: {0}", FontName);
}
if (font == null || String.IsNullOrEmpty (font.Family))
font = Pango.FontDescription.FromString (DEFAULT_FONT);
@@ -427,7 +428,7 @@ namespace Mono.TextEditor
if (!string.IsNullOrEmpty (GutterFontName))
gutterFont = Pango.FontDescription.FromString (GutterFontName);
} catch {
- Console.WriteLine ("Could not load gutter font: {0}", GutterFontName);
+ LoggingService.LogError ("Could not load gutter font: {0}", GutterFontName);
}
if (gutterFont == null || String.IsNullOrEmpty (gutterFont.Family))
gutterFont = Gtk.Widget.DefaultStyle.FontDescription.Copy ();