Bug 1800043: Fixed condition to determine end of selected string. r=m…

…asayuki

Differential Revision: https://phabricator.services.mozilla.com/D161881

editor/libeditor/DeleteRangeTransaction.cpp

@@ -57,12 +57,11 @@ DeleteRangeTransaction::MaybeExtendDeletingRangeWithSurroundingWhitespace(
   EditorRawDOMPoint startPoint(aRange.StartRef());
   EditorRawDOMPoint endPoint(aRange.EndRef());
   const bool maybeRangeStartsAfterWhiteSpace =
-      !(startPoint.IsStartOfContainer() && !startPoint.IsEndOfContainer() &&
-        startPoint.IsInTextNode());
+      startPoint.IsInTextNode() &&
+      !(startPoint.IsStartOfContainer() && !startPoint.IsEndOfContainer());
   const bool maybeRangeEndsAtWhiteSpace =
-      !((endPoint.IsEndOfContainer() && !endPoint.IsStartOfContainer() &&
-         endPoint.IsInTextNode()) ||
-        endPoint.IsBRElementAtEndOfContainer());
+      endPoint.IsInTextNode() &&
+      !(endPoint.IsEndOfContainer() && !endPoint.IsStartOfContainer());
   if (!maybeRangeStartsAfterWhiteSpace && !maybeRangeEndsAtWhiteSpace) {
     // no whitespace before or after word => nothing to do here.
     return NS_OK;

testing/web-platform/mozilla/tests/editor/delete-space-after-double-click-selection.html

@@ -105,7 +105,17 @@
         }
         return test_driver.send_keys(editableElement, deleteKey);
       };
-
+      if (editableElement.tagName.toLowerCase() == "div") {
+        promise_test(async t => {
+          setValue("<p>abc def<span></span></p>");
+          await doubleClickAndDelete("abc de", "def");
+          await waitForRender();
+          assert_equals(
+            getValue(),
+            "<p>abc</p>",
+            "The <span> at the end of the string must be removed, as well as the whitespace in between words.");
+        }, `${editableElement.tagName}: An empty span at the end of the selection should be considered end of selection!`);
+      }
       promise_test(async t => {
         setValue("one two");
         await doubleClickAndDelete("on", "one");