Merge remote-tracking branch 'origin/roslyn' into new-project-model

1 files changed, 4 insertions, 1 deletions

diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs
index 0d9ecc76fb..ef17e3d304 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs
@@ -38,7 +38,7 @@ namespace Mono.TextEditor.Highlighting
 	{
 		protected TextDocument doc;
 
-		public TextDocument Document {
+		public virtual TextDocument Document {
 			get {
 				return doc;
 			}
@@ -743,6 +743,9 @@ namespace Mono.TextEditor.Highlighting
 					string extends = reader.GetAttribute ("extends");
 					if (!String.IsNullOrEmpty (extends)) {
 						result = (SyntaxMode)SyntaxModeService.GetSyntaxMode (null, extends).MemberwiseClone ();
+						spanList.AddRange (result.spans);
+						prevMarkerList.AddRange (result.prevMarker);
+						matches.AddRange (result.matches);
 					}
 					result.Name = reader.GetAttribute ("name");
 					result.MimeType = reader.GetAttribute (MimeTypesAttribute);