diff options
author | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-04-20 19:07:51 +0300 |
---|---|---|
committer | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-04-20 19:07:51 +0300 |
commit | 95408b1a41b31b645f3a8c3323ab7d3ca4bff26b (patch) | |
tree | f8f137cddcb9a40499d303be95722fd2c6081bce /main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs | |
parent | b70e4e04b4e41b8ec28d7e4b220b401ecf467e7a (diff) | |
parent | de043d330a8bf5855d4d983c804cd36727cb2406 (diff) |
Merge remote-tracking branch 'origin/roslyn' into new-project-model
Diffstat (limited to 'main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs')
-rw-r--r-- | main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs | 5 |
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); |