Merge branch 'roslyn-previews'

8 files changed, 40 insertions, 14 deletions

diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs
index 58d93b729e..43312f2deb 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs
@@ -562,9 +562,17 @@ namespace Mono.TextEditor.Highlighting
 		public ChunkStyle DiffHeaderNew { get; private set; }
 
 		public const string DiffLocationKey = "Diff Location";
-		[ColorDescription(DiffLocationKey)] //not defined
+		[ColorDescription (DiffLocationKey)] //not defined
 		public ChunkStyle DiffLocation { get; private set; }
 
+		public const string PreviewDiffRemovedKey = "Preview Diff Removed Line";
+		[ColorDescription (PreviewDiffRemovedKey)] //not defined
+		public ChunkStyle PreviewDiffRemoved { get; private set; }
+
+		public const string PreviewDiffAddeddKey = "Preview Diff Added Line";
+		[ColorDescription (PreviewDiffAddeddKey)] //not defined
+		public ChunkStyle PreviewDiffAddedd { get; private set; }
+
 		public const string HtmlAttributeNameKey = "Html Attribute Name";
 		[ColorDescription(HtmlAttributeNameKey, VSSetting="HTML Attribute")]
 		public ChunkStyle HtmlAttributeName { get; private set; }
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextLineMarker.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextLineMarker.cs
index 0e87da7b3b..1322576b53 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextLineMarker.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextLineMarker.cs
@@ -29,12 +29,12 @@ using Mono.TextEditor.Highlighting;
 
 namespace Mono.TextEditor
 {
-	public interface IExtendingTextLineMarker 
+	public interface IExtendingTextLineMarker
 	{
 		double GetLineHeight (MonoTextEditor editor);
 		void Draw (MonoTextEditor editor, Cairo.Context cr, int lineNr, Cairo.Rectangle lineArea);
 	}
-	
+
 	public interface IActionTextLineMarker
 	{
 		/// <returns>
@@ -45,13 +45,13 @@ namespace Mono.TextEditor
 
 		void MouseHover (MonoTextEditor editor, MarginMouseEventArgs args, TextLineMarkerHoverResult result);
 	}
-	
-	public class TextLineMarkerHoverResult 
+
+	public class TextLineMarkerHoverResult
 	{
 		bool isCursorSet;
 
 		public bool HasCursor {
-			get { return isCursorSet;}
+			get { return isCursorSet; }
 		}
 
 		Gdk.Cursor cursor;
@@ -66,11 +66,11 @@ namespace Mono.TextEditor
 		}
 		public string TooltipMarkup { get; set; }
 	}
-	
+
 	[Flags]
 	public enum TextLineMarkerFlags
 	{
-		None           = 0,
+		None = 0,
 		DrawsSelection = 1
 	}
 
@@ -106,7 +106,7 @@ namespace Mono.TextEditor
 	public class TextLineMarker
 	{
 		DocumentLine lineSegment;
-		
+
 		public DocumentLine LineSegment {
 			get {
 				return lineSegment;
@@ -115,7 +115,7 @@ namespace Mono.TextEditor
 				lineSegment = value;
 			}
 		}
-		
+
 		public virtual TextLineMarkerFlags Flags {
 			get;
 			set;
@@ -124,8 +124,8 @@ namespace Mono.TextEditor
 		public object Tag {
 			get;
 			set;
-		}		
-		
+		}
+
 		bool isVisible = true;
 		public virtual bool IsVisible {
 			get { return isVisible; }
@@ -135,11 +135,11 @@ namespace Mono.TextEditor
 		public TextLineMarker ()
 		{
 		}
-		
+
 		public virtual void Draw (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics)
 		{
 		}
-		
+
 		public virtual ChunkStyle GetStyle (ChunkStyle baseStyle)
 		{
 			return baseStyle;
diff --git a/main/src/core/Mono.Texteditor/Styles/DarkStyle.json b/main/src/core/Mono.Texteditor/Styles/DarkStyle.json
index 2f3d61b77c..0624585cf9 100644
--- a/main/src/core/Mono.Texteditor/Styles/DarkStyle.json
+++ b/main/src/core/Mono.Texteditor/Styles/DarkStyle.json
@@ -232,6 +232,9 @@
 		{ "name": "Diff Header(New)", "fore": "chameleon1", "weight": "bold" },
 		{ "name": "Diff Location", "fore": "chameleon1", "weight": "bold" },
 
+		{ "name": "Preview Diff Removed Line", "fore": "#5c2c2c", "back": "#dcb4b4" },
+		{ "name": "Preview Diff Added Line", "fore": "#235423", "back": "#a4d9a4" },
+
 		{ "name": "Css Comment", "fore": "aluminium4", "weight": "bold" },
 		{ "name": "Css Property Name", "fore": "aluminium1", "weight": "bold" },
 		{ "name": "Css Property Value", "fore": "butter2", "weight": "bold" },
diff --git a/main/src/core/Mono.Texteditor/Styles/GruvboxStyle.json b/main/src/core/Mono.Texteditor/Styles/GruvboxStyle.json
index 5f530cbf8c..b5cb647654 100644
--- a/main/src/core/Mono.Texteditor/Styles/GruvboxStyle.json
+++ b/main/src/core/Mono.Texteditor/Styles/GruvboxStyle.json
@@ -216,6 +216,9 @@
 		{ "name": "Diff Header(New)", "fore": "#008000", "weight": "bold" },
 		{ "name": "Diff Location", "fore": "#FB8B00", "weight": "bold" },
 
+		{ "name": "Preview Diff Removed Line", "fore": "#5c2c2c", "back": "#dcb4b4" },
+		{ "name": "Preview Diff Added Line", "fore": "#235423", "back": "#a4d9a4" },
+
 		{ "name": "Css Comment", "fore": "comment", "weight": "bold" },
 		{ "name": "Css Property Name", "fore": "black", "weight": "bold" },
 		{ "name": "Css Property Value", "fore": "bright-green", "weight": "bold" },
diff --git a/main/src/core/Mono.Texteditor/Styles/LightStyle.json b/main/src/core/Mono.Texteditor/Styles/LightStyle.json
index 898e3defa7..03b3821244 100644
--- a/main/src/core/Mono.Texteditor/Styles/LightStyle.json
+++ b/main/src/core/Mono.Texteditor/Styles/LightStyle.json
@@ -229,6 +229,9 @@
 		{ "name": "Diff Header(New)", "fore": "skyblue2", "weight": "bold" },
 		{ "name": "Diff Location", "fore": "plum2", "weight": "bold" },
 
+		{ "name": "Preview Diff Removed Line", "fore": "#a14d4d", "back": "#fcf8f8" },
+		{ "name": "Preview Diff Added Line", "fore": "#419b41", "back": "#edf8ed" },
+
 		{ "name": "Css Comment", "fore": "comment-gray", "weight": "bold" },
 		{ "name": "Css Property Name", "fore": "text-black", "weight": "bold" },
 		{ "name": "Css Property Value", "fore": "literal-orange", "weight": "bold" },
diff --git a/main/src/core/Mono.Texteditor/Styles/MonokaiStyle.json b/main/src/core/Mono.Texteditor/Styles/MonokaiStyle.json
index 0df6f240ab..f5942a7459 100644
--- a/main/src/core/Mono.Texteditor/Styles/MonokaiStyle.json
+++ b/main/src/core/Mono.Texteditor/Styles/MonokaiStyle.json
@@ -227,6 +227,9 @@
 		{ "name": "Diff Header(New)", "fore": "#008000", "weight": "bold" },
 		{ "name": "Diff Location", "fore": "#FB8B00", "weight": "bold" },
 
+		{ "name": "Preview Diff Removed Line", "fore": "#5c2c2c", "back": "#dcb4b4" },
+		{ "name": "Preview Diff Added Line", "fore": "#235423", "back": "#a4d9a4" },
+
 		{ "name": "Css Comment", "fore": "monokai-comment", "weight": "bold" },
 		{ "name": "Css Property Name", "fore": "black", "weight": "bold" },
 		{ "name": "Css Property Value", "fore": "monokai-string", "weight": "bold" },
diff --git a/main/src/core/Mono.Texteditor/Styles/NightshadeStyle.json b/main/src/core/Mono.Texteditor/Styles/NightshadeStyle.json
index 8d807916e4..00338346c6 100644
--- a/main/src/core/Mono.Texteditor/Styles/NightshadeStyle.json
+++ b/main/src/core/Mono.Texteditor/Styles/NightshadeStyle.json
@@ -240,6 +240,9 @@
 		{ "name": "Diff Header(New)", "fore": "chameleon1", "weight": "bold" },
 		{ "name": "Diff Location", "fore": "chameleon1", "weight": "bold" },
 
+		{ "name": "Preview Diff Removed Line", "fore": "#5c2c2c", "back": "#dcb4b4" },
+		{ "name": "Preview Diff Added Line", "fore": "#235423", "back": "#a4d9a4" },
+
 		{ "name": "Css Comment", "fore": "CommentVim", "weight": "bold" },
 		{ "name": "Css Property Name", "fore": "NormalVim", "weight": "bold" },
 		{ "name": "Css Property Value", "fore": "StringVim", "weight": "bold" },
diff --git a/main/src/core/Mono.Texteditor/Styles/OblivionStyle.json b/main/src/core/Mono.Texteditor/Styles/OblivionStyle.json
index bca141ae50..8cf2b32553 100644
--- a/main/src/core/Mono.Texteditor/Styles/OblivionStyle.json
+++ b/main/src/core/Mono.Texteditor/Styles/OblivionStyle.json
@@ -231,6 +231,9 @@
 		{ "name": "Diff Header(New)", "fore": "chameleon1", "weight": "bold" },
 		{ "name": "Diff Location", "fore": "chameleon1", "weight": "bold" },
 
+		{ "name": "Preview Diff Removed Line", "fore": "#5c2c2c", "back": "#dcb4b4" },
+		{ "name": "Preview Diff Added Line", "fore": "#235423", "back": "#a4d9a4" },
+
 		{ "name": "Css Comment", "fore": "aluminium4", "weight": "bold" },
 		{ "name": "Css Property Name", "fore": "aluminium2", "weight": "bold" },
 		{ "name": "Css Property Value", "fore": "butter2", "weight": "bold" },