[Ide] Introduced static TextMarkerFactory class for creating text

markers.

6 files changed, 16 insertions, 16 deletions

diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
index e1d191bcdb..d8ca0d79bc 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
@@ -1066,7 +1066,7 @@ namespace MonoDevelop.AssemblyBrowser
 				string text = inspectEditor.GetTextAt (seg.Offset, seg.Length);
 				if (text != null && text.Length == 1 && !(char.IsLetter (text [0]) || text [0] == '…'))
 					continue;
-				var marker = inspectEditor.MarkerHost.CreateLinkMarker (seg.Offset, seg.Length, delegate (LinkRequest request) {
+				var marker = TextMarkerFactory.CreateLinkMarker (inspectEditor, seg.Offset, seg.Length, delegate (LinkRequest request) {
 					var link = GetLink (seg);
 					if (link == null)
 						return;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
index 38d418c4f8..2ba574d2b7 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
@@ -64,7 +64,7 @@ namespace MonoDevelop.Debugger
 			sw = new Gtk.ScrolledWindow ();
 			editor = DocumentFactory.CreateNewEditor ();
 			editor.IsReadOnly = true;
-			asmMarker = editor.MarkerHost.CreateAsmLineMarker ();
+			asmMarker = TextMarkerFactory.CreateAsmLineMarker (editor);
 
 			editor.Options.ShowLineNumberMargin = false;
 			
@@ -80,7 +80,7 @@ namespace MonoDevelop.Debugger
 			
 			sw.Sensitive = false;
 			
-			currentDebugLineMarker = editor.MarkerHost.CreateCurrentDebugLineTextMarker ();
+			currentDebugLineMarker = TextMarkerFactory.CreateCurrentDebugLineTextMarker (editor);
 			DebuggingService.StoppedEvent += OnStop;
 		}
 		
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
index 94a8eac8e6..def54bdf7b 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
@@ -228,7 +228,7 @@ namespace MonoDevelop.AnalysisCore.Gui
 						if (start >= end)
 							continue;
 						if (currentResult.InspectionMark == IssueMarker.GrayOut) {
-							var marker = editor.MarkerHost.CreateGenericTextSegmentMarker (TextSegmentMarkerEffect.GrayOut, TextSegment.FromBounds (start, end));
+							var marker = TextMarkerFactory.CreateGenericTextSegmentMarker (editor, TextSegmentMarkerEffect.GrayOut, TextSegment.FromBounds (start, end));
 							marker.IsVisible = currentResult.Underline;
 							marker.Tag = currentResult;
 							editor.AddMarker (marker);
@@ -237,7 +237,7 @@ namespace MonoDevelop.AnalysisCore.Gui
 //							editor.Parent.QueueDraw ();
 						} else {
 							var effect = currentResult.InspectionMark == IssueMarker.DottedLine ? TextSegmentMarkerEffect.DottedLine : TextSegmentMarkerEffect.WavedLine;
-							var marker = editor.MarkerHost.CreateGenericTextSegmentMarker (effect, TextSegment.FromBounds (start, end));
+							var marker = TextMarkerFactory.CreateGenericTextSegmentMarker (editor, effect, TextSegment.FromBounds (start, end));
 							marker.Color = GetColor (editor, currentResult);
 							marker.IsVisible = currentResult.Underline;
 							marker.Tag = currentResult;
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
index 157ed396a1..918c07be46 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
@@ -464,7 +464,7 @@ namespace MonoDevelop.CodeActions
 			RemoveWidget ();
 			currentSmartTagBegin = smartTagLocBegin;
 			var line = Editor.GetLine (smartTagLocBegin.Line);
-			currentSmartTag = Editor.MarkerHost.CreateSmartTagMarker ((line.NextLine ?? line).Offset, smartTagLocBegin);
+			currentSmartTag = TextMarkerFactory.CreateSmartTagMarker (Editor, (line.NextLine ?? line).Offset, smartTagLocBegin);
 			currentSmartTag.MouseHover += delegate(object sender, TextMarkerMouseEventArgs args) {
 				if (currentSmartTag.IsInsideSmartTag (args.X, args.Y)) {
 					args.OverwriteCursor = null;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
index d4bced15d7..1e2574f493 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
@@ -66,7 +66,7 @@ namespace MonoDevelop.SourceEditor
 		ICompletionWidget,  ISplittable, IFoldable, IToolboxDynamicProvider, IEncodedTextContent,
 		ICustomFilteringToolboxConsumer, IZoomable, ITextEditorResolver, ITextEditorDataProvider,
 		ICodeTemplateHandler, ICodeTemplateContextProvider, ISupportsProjectReload, IPrintable,
-	ITextEditorImpl, IEditorActionHost, IMarkerHost, IUndoHandler
+	ITextEditorImpl, IEditorActionHost, ITextMarkerFactory, IUndoHandler
 	{
 		readonly SourceEditorWidget widget;
 		bool isDisposed = false;
@@ -2934,7 +2934,7 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 
-		IMarkerHost ITextEditorImpl.MarkerHost {
+		ITextMarkerFactory ITextEditorImpl.TextMarkerFactory {
 			get {
 				return this;
 			}
@@ -3122,33 +3122,33 @@ namespace MonoDevelop.SourceEditor
 		 
 		#region ISegmentMarkerHost implementation
 
-		ITextSegmentMarker IMarkerHost.CreateUsageMarker (Usage usage)
+		ITextSegmentMarker ITextMarkerFactory.CreateUsageMarker (Usage usage)
 		{
 			return new UsageSegmentMarker (usage);
 		}
 
-		IUrlTextLineMarker IMarkerHost.CreateUrlTextMarker (IDocumentLine line, string value, MonoDevelop.Ide.Editor.UrlType url, string syntax, int startCol, int endCol)
+		IUrlTextLineMarker ITextMarkerFactory.CreateUrlTextMarker (IDocumentLine line, string value, MonoDevelop.Ide.Editor.UrlType url, string syntax, int startCol, int endCol)
 		{
 			return new UrlTextLineMarker (TextEditor.Document, line, value, (Mono.TextEditor.UrlType)url, syntax, startCol, endCol);
 		}
 
-		ICurrentDebugLineTextMarker IMarkerHost.CreateCurrentDebugLineTextMarker ()
+		ICurrentDebugLineTextMarker ITextMarkerFactory.CreateCurrentDebugLineTextMarker ()
 		{
 			return new CurrentDebugLineTextMarker (TextEditor);
 		}
 
-		ITextLineMarker IMarkerHost.CreateAsmLineMarker ()
+		ITextLineMarker ITextMarkerFactory.CreateAsmLineMarker ()
 		{
 			return new AsmLineMarker ();
 		}
 
-		IUnitTestMarker IMarkerHost.CreateUnitTestMarker (UnitTestMarkerHost host, UnitTestLocation unitTestLocation)
+		IUnitTestMarker ITextMarkerFactory.CreateUnitTestMarker (UnitTestMarkerHost host, UnitTestLocation unitTestLocation)
 		{
 			return new UnitTestMarker (TextEditor, host, unitTestLocation);
 		}
 
 
-		IGenericTextSegmentMarker IMarkerHost.CreateGenericTextSegmentMarker (TextSegmentMarkerEffect effect, int offset, int length)
+		IGenericTextSegmentMarker ITextMarkerFactory.CreateGenericTextSegmentMarker (TextSegmentMarkerEffect effect, int offset, int length)
 		{
 			switch (effect) {
 			case TextSegmentMarkerEffect.DottedLine:
@@ -3166,7 +3166,7 @@ namespace MonoDevelop.SourceEditor
 			return new LinkMarker (offset, length, activateLink);
 		}
 
-		ISmartTagMarker IMarkerHost.CreateSmartTagMarker (int offset, MonoDevelop.Ide.Editor.DocumentLocation realLocation)
+		ISmartTagMarker ITextMarkerFactory.CreateSmartTagMarker (int offset, MonoDevelop.Ide.Editor.DocumentLocation realLocation)
 		{
 			return new SmartTagMarker (offset, realLocation);
 		}
diff --git a/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs b/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs
index 73bc579ad6..8a6a9e8676 100644
--- a/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs
+++ b/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs
@@ -89,7 +89,7 @@ namespace MonoDevelop.NUnit
 					foreach (var foundTest in foundTests) {
 						if (token.IsCancellationRequested)
 							return;
-						var unitTestMarker = Editor.MarkerHost.CreateUnitTestMarker (new UnitTestMarkerHostImpl (this), foundTest);
+						var unitTestMarker = TextMarkerFactory.CreateUnitTestMarker (Editor, new UnitTestMarkerHostImpl (this), foundTest);
 						currentMarker.Add (unitTestMarker);
 						Editor.AddMarker (foundTest.LineNumber, unitTestMarker);
 					}