From 53565fa27e008c8c4e5b9bc7827a563eac7429e7 Mon Sep 17 00:00:00 2001 From: Eusebiu Marcu Date: Wed, 26 Jan 2011 17:00:14 +0200 Subject: [PATCH] fix ChangeMarkerMargin error OnMouseMove when SyntaxHighlighting is null - http://community.sharpdevelop.net/forums/t/12633.aspx --- .../AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs index 71cb60d29c..f878ef2a6f 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs @@ -168,13 +168,15 @@ namespace ICSharpCode.AvalonEdit.AddIn differ.copyButton.Visibility = Visibility.Collapsed; } else { var baseDocument = new TextDocument(changeWatcher.BaseDocument.Text); - var mainHighlighter = new DocumentHighlighter(baseDocument, differ.editor.SyntaxHighlighting.MainRuleSet); - var popupHighlighter = differ.editor.TextArea.GetService(typeof(IHighlighter)) as DocumentHighlighter; - - if (prevLineInfo.Change == ChangeType.Deleted) - popupHighlighter.InitialSpanStack = mainHighlighter.GetSpanStack(prevLineInfo.OldStartLineNumber); - else - popupHighlighter.InitialSpanStack = mainHighlighter.GetSpanStack(lineInfo.OldStartLineNumber); + if (differ.editor.SyntaxHighlighting != null) { + var mainHighlighter = new DocumentHighlighter(baseDocument, differ.editor.SyntaxHighlighting.MainRuleSet); + var popupHighlighter = differ.editor.TextArea.GetService(typeof(IHighlighter)) as DocumentHighlighter; + + if (prevLineInfo.Change == ChangeType.Deleted) + popupHighlighter.InitialSpanStack = mainHighlighter.GetSpanStack(prevLineInfo.OldStartLineNumber); + else + popupHighlighter.InitialSpanStack = mainHighlighter.GetSpanStack(lineInfo.OldStartLineNumber); + } } differ.revertButton.Click += delegate {