From 22068148c80043fc55a571d86fb4b19bf505b0bb Mon Sep 17 00:00:00 2001
From: WMJ <wmj@live.cn>
Date: Sat, 22 Dec 2018 15:00:19 +0800
Subject: [PATCH] - Fixed a crash in previous commits

---
 Codist/Helpers/TextEditorHelper.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Codist/Helpers/TextEditorHelper.cs b/Codist/Helpers/TextEditorHelper.cs
index a3df69a7..cc002a4d 100644
--- a/Codist/Helpers/TextEditorHelper.cs
+++ b/Codist/Helpers/TextEditorHelper.cs
@@ -91,8 +91,7 @@ public static ITextSnapshot Edit<TView>(this TView view, Action<TView, ITextEdit
 			using (var edit = view.TextSnapshot.TextBuffer.CreateEdit()) {
 				action(view, edit);
 				if (edit.HasEffectiveChanges) {
-					edit.Apply();
-					return edit.Snapshot;
+					return edit.Apply();
 				}
 				return null;
 			}
@@ -111,8 +110,7 @@ public static ITextSnapshot EditSelection<TView>(this TView view, Action<TView,
 					action(view, edit, item);
 				}
 				if (edit.HasEffectiveChanges) {
-					edit.Apply();
-					return edit.Snapshot;
+					return edit.Apply();
 				}
 				return null;
 			}
@@ -224,6 +222,10 @@ public static void SelectNode(this ITextView view, Microsoft.CodeAnalysis.Syntax
 		}
 
 		public static void SelectSpan(this ITextView view, SnapshotSpan span) {
+			if (view.TextSnapshot != span.Snapshot) {
+				// should not be here
+				span = new SnapshotSpan(view.TextSnapshot, span.Span);
+			}
 			view.ViewScroller.EnsureSpanVisible(span, EnsureSpanVisibleOptions.ShowStart);
 			view.Selection.Select(span, false);
 			view.Caret.MoveTo(span.End);