Work around some issues with VS '>' overtype

mhutch · Jul 12, 2023 · 63293ef · 63293ef
1 parent 1184078
commit 63293ef
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/Editor/Commands/AutoClosingTagCommandHandler.cs b/Editor/Commands/AutoClosingTagCommandHandler.cs
@@ -110,9 +110,17 @@ void InsertCloseTag (TypeCharCommandArgs args, CommandExecutionContext execution
 			}
 
 			var bufferEdit = args.SubjectBuffer.CreateEdit ();
+
+			// if there's an extra > after committing due to VS losing track of overtype, delete it
+			ITextSnapshot snapshot = args.SubjectBuffer.CurrentSnapshot;
+			if (snapshot.Length > position && snapshot[position] == '>') {
+				bufferEdit.Delete (new Span (position, 1));
+			}
+
 			bufferEdit.Insert (position, $"</{el.Name.FullName}>");
 			bufferEdit.Apply ();
-			args.TextView.Caret.MoveTo (new SnapshotPoint (args.SubjectBuffer.CurrentSnapshot, position));
+
+			args.TextView.Caret.MoveTo (new SnapshotPoint (snapshot, position));
 
 			if (completionSession != null) {
 				var trigger = new CompletionTrigger (