Fix position instability around highlighted annotations

By checking only nodes that pass the supplied node filter, the position
logic can safely ignore out-of-place cursors near highlighted annotations.

Note, this can't re-use PositionIterator.previousNode, because the logic
requires the previous sibling of the current container's previous sibling.

Author: peitschie

webodf/lib/ops/TextPositionFilter.js

@@ -36,13 +36,27 @@ ops.TextPositionFilter = function TextPositionFilter() {
         /**@const*/FILTER_ACCEPT = core.PositionFilter.FilterResult.FILTER_ACCEPT,
         /**@const*/FILTER_REJECT = core.PositionFilter.FilterResult.FILTER_REJECT;
 
+    /**
+     * Find the previous sibling of the specified node that passes the node filter.
+     * @param {?Node} node
+     * @param {!function(?Node):!number} nodeFilter
+     * @return {?Node}
+     */
+    function previousSibling(node, nodeFilter) {
+        while (node && nodeFilter(node) !== FILTER_ACCEPT) {
+            node = node.previousSibling;
+        }
+        return node;
+    }
+
     /**
      * @param {!Node} container
      * @param {?Node} leftNode
      * @param {?Node} rightNode
+     * @param {!function(?Node):!number} nodeFilter
      * @return {!core.PositionFilter.FilterResult}
      */
-    function checkLeftRight(container, leftNode, rightNode) {
+    function checkLeftRight(container, leftNode, rightNode, nodeFilter) {
         var r, firstPos, rightOfChar;
         // accept if there is a character immediately to the left
         if (leftNode) {
@@ -62,9 +76,7 @@ ops.TextPositionFilter = function TextPositionFilter() {
                 return FILTER_ACCEPT;
             }
         } else {
-            // Note, cant use OdfUtils.previousNode here as that function automatically dives to the previous
-            // elements first child (if it has one)
-            if (odfUtils.isInlineRoot(container.previousSibling) && odfUtils.isGroupingElement(container)) {
+            if (odfUtils.isGroupingElement(container) && odfUtils.isInlineRoot(previousSibling(container.previousSibling, nodeFilter))) {
                 // Move first position after inline root inside trailing grouping element (part 2)
                 // Allow the first position inside the first grouping element trailing an annotation
                 return FILTER_ACCEPT;
@@ -167,13 +179,13 @@ ops.TextPositionFilter = function TextPositionFilter() {
             leftNode = iterator.leftNode();
             rightNode = container;
             container = /**@type{!Node}*/(container.parentNode);
-            r = checkLeftRight(container, leftNode, rightNode);
+            r = checkLeftRight(container, leftNode, rightNode, iterator.getNodeFilter());
         } else if (!odfUtils.isGroupingElement(container)) {
             r = FILTER_REJECT;
         } else {
             leftNode = iterator.leftNode();
             rightNode = iterator.rightNode();
-            r = checkLeftRight(container, leftNode, rightNode);
+            r = checkLeftRight(container, leftNode, rightNode, iterator.getNodeFilter());
         }
         return r;
     };

webodf/tests/ops/operationtests.xml

@@ -2135,7 +2135,7 @@
     <office:text><text:p>A<office:annotation office:name="a"><dc:creator e:memberid="Alice">Alice</dc:creator><dc:date>2013-08-05T12:34:07.061Z</dc:date><text:list><text:list-item><text:p/></text:list-item></text:list></office:annotation><text:span text:style-name="auto63350368_0"><c:anchor c:memberId="Alice"/>B<c:cursor c:memberId="Alice"/></text:span><office:annotation-end office:name="a"/>C</text:p></office:text>
   </after>
  </test>
- <test name="RemoveText_AnnotatedRange_MaintainsCorrectCursorPosition" isFailing="true">
+ <test name="RemoveText_AnnotatedRange_MaintainsCorrectCursorPosition">
   <before>
     <office:text><text:p>AB<html:span class="webodf-annotationHighlight"/>CD</text:p></office:text>
   </before>