PR Updates, also fixed AttributedText Markdown serialization bug

superlistapp · Jul 25, 2022 · 2401593 · 2401593
1 parent 4598d9d
commit 2401593
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 19 deletions.
diff --git a/super_editor/lib/src/infrastructure/super_textfield/infrastructure/editing/commands.dart b/super_editor/lib/src/infrastructure/super_textfield/infrastructure/editing/commands.dart
@@ -24,7 +24,7 @@ class ChangeSelectionCommand extends AttributedTextEditingValueCommand {
     _previousComposingRange = previousValue.composingRegion;
 
     return AttributedTextEditingValue(
-      text: previousValue.text,
+      text: previousValue.text.copy(),
       selection: newSelection,
       composingRegion: newComposingRange ?? TextRange.empty,
     );
@@ -33,7 +33,7 @@ class ChangeSelectionCommand extends AttributedTextEditingValueCommand {
   @override
   AttributedTextEditingValue doUndo(AttributedTextEditingValue currentValue) {
     return AttributedTextEditingValue(
-      text: currentValue.text,
+      text: currentValue.text.copy(),
       selection: _previousSelection!,
       composingRegion: _previousComposingRange!,
     );
@@ -263,15 +263,6 @@ class InsertTextAtOffsetCommand extends AttributedTextEditingValueCommand {
   }
 }
 
-extension on AttributedText {
-  AttributedText copy() {
-    return AttributedText(
-      text: text,
-      spans: spans.copy(),
-    );
-  }
-}
-
 /// Deletes the currently selected text, collapsing the selection to a caret
 /// at the selection base.
 class DeleteSelectedTextCommand extends AttributedTextEditingValueCommand {
@@ -517,3 +508,12 @@ int _moveCaretForDeletion({
     return deleteFrom + (caretOffset - deleteTo);
   }
 }
+
+extension on AttributedText {
+  AttributedText copy() {
+    return AttributedText(
+      text: text,
+      spans: spans.copy(),
+    );
+  }
+}
diff --git a/super_editor/test/super_textfield/infrastructure/editing/event_source_controller_test.dart b/super_editor/test/super_textfield/infrastructure/editing/event_source_controller_test.dart
@@ -833,11 +833,24 @@ void main() {
 
     group("deletes text", () {
       test("between the caret and the beginning of the line", () {
-        // TODO:
-      });
+        final controller = EventSourcedAttributedTextEditingController(
+          AttributedTextEditingValue(
+            text: AttributedText(text: "before the caret:after"),
+            selection: const TextSelection.collapsed(offset: 16),
+          ),
+        );
+
+        controller.deleteTextOnLineBeforeCaret(textLayout: _FakeTextLayout(["before the caret:after"]));
+        expect(controller.text.text, ":after");
+        expect(controller.selection, const TextSelection.collapsed(offset: 0));
 
-      test("between the caret and the end of the line", () {
-        // TODO:
+        // Undo it.
+        controller.undo();
+        expect(controller.text.text, "before the caret:after");
+        expect(
+          controller.selection,
+          const TextSelection.collapsed(offset: 16),
+        );
       });
 
       test("when it's selected", () {
@@ -1138,10 +1151,6 @@ void main() {
             ));
       });
     });
-
-    test("pastes text from clipboard", () {
-      // TODO:
-    });
   });
 }