Fixed cursor adjustment bugs

Author: goossens

TextEditor.cpp

@@ -2355,10 +2355,17 @@ TextEditor::Palette TextEditor::defaultPalette = TextEditor::GetDarkPalette();
 //
 
 TextEditor::Coordinate TextEditor::Cursor::adjustCoordinateForInsert(Coordinate coordinate, Coordinate insertStart, Coordinate insertEnd) {
-	coordinate.line += insertEnd.line - insertStart.line;
+	if (insertStart.line == insertEnd.line) {
+		if (coordinate.line == insertEnd.line) {
+			coordinate.column += insertEnd.column - insertStart.column;
+		}
+
+	} else {
+		if (coordinate.line == insertStart.line) {
+			coordinate.column += insertEnd.column - insertStart.column;
+		}
 
-	if (end.line == coordinate.line) {
-		coordinate.column += insertEnd.column - insertStart.column;
+		coordinate.line += insertEnd.line - insertStart.line;
 	}
 
 	return coordinate;
@@ -2380,10 +2387,17 @@ void TextEditor::Cursor::adjustForInsert(Coordinate insertStart, Coordinate inse
 //
 
 TextEditor::Coordinate TextEditor::Cursor::adjustCoordinateForDelete(Coordinate coordinate, Coordinate deleteStart, Coordinate deleteEnd) {
-	coordinate.line -= deleteEnd.line - deleteStart.line;
+	if (deleteStart.line == deleteEnd.line) {
+		if (coordinate.line == deleteEnd.line) {
+			coordinate.column -= deleteEnd.column - deleteStart.column;
+		}
+
+	} else {
+		coordinate.line -= deleteEnd.line - deleteStart.line;
 
-	if (deleteEnd.line == coordinate.line) {
-		coordinate.column -= deleteEnd.column - deleteStart.column;
+		if (coordinate.line == deleteEnd.line) {
+			coordinate.column -= deleteEnd.column;
+		}
 	}
 
 	return coordinate;

TextEditor.h

@@ -935,7 +935,7 @@ class TextEditor {
 		inline void resetUpdated() { updated = false; }
 
 		// line-based callbacks
-		inline void setInsertor(std::function<void*(int line )> callback) { insertor = callback; }
+		inline void setInsertor(std::function<void*(int line)> callback) { insertor = callback; }
 		inline void setDeletor(std::function<void(int line, void* data)> callback) { deletor = callback; }
 
 		// access line user data