From e850675c0a22f62c8b52511311ff45966b3ec7f1 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Mon, 29 Apr 2019 15:29:40 +0200
Subject: [PATCH] Fixed range#expandByMarker not expanding to beginning/end of
 section

closes https://github.com/bustle/mobiledoc-kit/issues/676
- after failing to find a non-matching marker, perform a check for the first/last markers in the range's section matching the supplied detection callback. If it does match we can assume that we checked all markers in that direction so we expand to the beginning/end of the section
- improves behaviour to match the documentation: "expand a range to all markers matching a given check"
---
 src/js/utils/cursor/range.js          | 14 ++++--
 tests/unit/utils/cursor-range-test.js | 65 +++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/src/js/utils/cursor/range.js b/src/js/utils/cursor/range.js
index fb6d00766..403c49ee4 100644
--- a/src/js/utils/cursor/range.js
+++ b/src/js/utils/cursor/range.js
@@ -141,12 +141,20 @@ class Range {
       return !detectMarker(i);
     };
 
-    let headMarker = head.section.markers.detect(firstNotMatchingDetect, head.marker, true);
-    headMarker = (headMarker && headMarker.next) || head.marker;
+    let headMarker = headSection.markers.detect(firstNotMatchingDetect, head.marker, true);
+    if (!headMarker && detectMarker(headSection.markers.head)) {
+      headMarker = headSection.markers.head;
+    } else {
+      headMarker = (headMarker && headMarker.next) || head.marker;
+    }
     let headPosition = new Position(headSection, headSection.offsetOfMarker(headMarker));
 
     let tailMarker = tail.section.markers.detect(firstNotMatchingDetect, tail.marker);
-    tailMarker = (tailMarker && tailMarker.prev) || tail.marker;
+    if (!tailMarker && detectMarker(headSection.markers.tail)) {
+      tailMarker = headSection.markers.tail;
+    } else {
+      tailMarker = (tailMarker && tailMarker.prev) || tail.marker;
+    }
     let tailPosition = new Position(tail.section, tail.section.offsetOfMarker(tailMarker) + tailMarker.length);
 
     return headPosition.toRange(tailPosition, direction);
diff --git a/tests/unit/utils/cursor-range-test.js b/tests/unit/utils/cursor-range-test.js
index 71dceebd1..4a09dab25 100644
--- a/tests/unit/utils/cursor-range-test.js
+++ b/tests/unit/utils/cursor-range-test.js
@@ -220,3 +220,68 @@ test('#expandByMarker processed markers in a callback and continues as long as t
     'range tail did not change'
   );
 });
+
+// https://github.com/bustle/mobiledoc-kit/issues/676
+test('#expandByMarker can expand to beginning of section with matching markups', (assert) => {
+  let post = Helpers.postAbstract.build(({post, markupSection, marker, markup}) => {
+    let bold = markup('b');
+    let italic = markup('i');
+    return post([
+      markupSection('p', [
+        marker('aiya', [bold]),
+        marker('biya', [bold, italic]),
+        marker('ciya', [bold]),
+        marker('diya', [bold]),
+      ])
+    ]);
+  });
+
+  let section = post.sections.head;
+  let head = section.toPosition(14); // i in 4th hiya
+  let tail = section.toPosition(14); // i in 4th hiya
+  let range = head.toRange(tail);
+  let expandedRange = range.expandByMarker(marker => {
+    return !!(detect(marker.markups, markup => markup.tagName === 'b'));
+  });
+
+  assert.positionIsEqual(
+    expandedRange.head, section.toPosition(0),
+    'range head is start of first marker'
+  );
+  assert.positionIsEqual(
+    expandedRange.tail, section.toPosition(16),
+    'range tail is at end of last marker'
+  );
+});
+
+test('#expandByMarker can expand to end of section with matching markups', (assert) => {
+  let post = Helpers.postAbstract.build(({post, markupSection, marker, markup}) => {
+    let bold = markup('b');
+    let italic = markup('i');
+    return post([
+      markupSection('p', [
+        marker('aiya', [bold]),
+        marker('biya', [bold, italic]),
+        marker('ciya', [bold]),
+        marker('diya', [bold]),
+      ])
+    ]);
+  });
+
+  let section = post.sections.head;
+  let head = section.toPosition(2); // i in 4th hiya
+  let tail = section.toPosition(2); // i in 4th hiya
+  let range = head.toRange(tail);
+  let expandedRange = range.expandByMarker(marker => {
+    return !!(detect(marker.markups, markup => markup.tagName === 'b'));
+  });
+
+  assert.positionIsEqual(
+    expandedRange.head, section.toPosition(0),
+    'range head is start of first marker'
+  );
+  assert.positionIsEqual(
+    expandedRange.tail, section.toPosition(16),
+    'range tail is at end of last marker'
+  );
+});