Remove doubled spaces when accepting deletions.

(cherry picked from commit 470947c)

Author: VV-EE

src/__tests__/commands.test.ts

@@ -107,6 +107,63 @@ describe("applyTrackedChanges", () => {
       testBuilders.paragraph("first paragraph"),
     );
 
+    assert(
+      eq(newState.doc, expected),
+      `Expected ${newState.doc} to match ${expected}`,
+    );
+  });
+  it("should removed doubles spaces around deletions", async () => {
+    const doc = testBuilders.doc(
+      testBuilders.paragraph(
+        "first ",
+        testBuilders.deletion({ id: "1" }, "second"),
+        " third",
+      ),
+    );
+
+    const editorState = EditorState.create({
+      doc,
+    });
+
+    const newState = await new Promise<EditorState>((resolve) => {
+      applySuggestions(editorState, (tr) => {
+        resolve(editorState.apply(tr));
+      });
+    });
+
+    const expected = testBuilders.doc(testBuilders.paragraph("first third"));
+
+    assert(
+      eq(newState.doc, expected),
+      `Expected ${newState.doc} to match ${expected}`,
+    );
+  });
+  it("should removed doubles spaces around deletions accross boundaries", async () => {
+    const doc = testBuilders.doc(
+      testBuilders.paragraph(
+        "first ",
+        testBuilders.deletion({ id: "1" }, "paragraph"),
+      ),
+      testBuilders.paragraph(
+        testBuilders.deletion({ id: "1" }, "second"),
+        " paragraph",
+      ),
+    );
+
+    const editorState = EditorState.create({
+      doc,
+    });
+
+    const newState = await new Promise<EditorState>((resolve) => {
+      applySuggestions(editorState, (tr) => {
+        resolve(editorState.apply(tr));
+      });
+    });
+
+    const expected = testBuilders.doc(
+      testBuilders.paragraph("first paragraph"),
+    );
+
     assert(
       eq(newState.doc, expected),
       `Expected ${newState.doc} to match ${expected}`,

src/commands.ts

@@ -63,11 +63,22 @@ function applySuggestionsToTransform(
     if (isToRevert) {
       const { pos: deletionFrom, deleted } = tr.mapping.mapResult(pos);
       if (deleted) return false;
+
       const deletionTo = findSuggestionMarkEnd(
         tr.doc.resolve(deletionFrom + child.nodeSize),
         markTypeToRevert,
       );
-      tr.deleteRange(deletionFrom, deletionTo);
+      // check if the previous and the next text part is a space
+      // if so, we can delete the whole text part
+      const prevChar = tr.doc.textBetween(
+        deletionFrom - 1,
+        deletionFrom,
+        "x",
+        "x",
+      );
+      const nextChar = tr.doc.textBetween(deletionTo, deletionTo + 1, "x", "x");
+      const addedRange = prevChar === " " && nextChar === " " ? 1 : 0;
+      tr.deleteRange(deletionFrom, deletionTo + addedRange);
       return false;
     }