wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-11-28 10:11:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "CommentUtils: Fix edge case bug in getCoveredSiblings()"

Browse source
This commit is contained in:
jenkins-bot 2021-02-27 22:54:46 +00:00 committed by Gerrit Code Review
parent 49938a88dc e767ee1741
commit c5874422df
2 changed files with 55 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
includes/CommentUtils.php
View file

@ -275,10 +275,6 @@ class CommentUtils {
$range = $item->getRange();
$ancestor = $range->commonAncestorContainer;
if ( $ancestor === $range->startContainer || $ancestor === $range->endContainer ) {
return [ $ancestor ];
}
// Convert to array early because apparently DOMNodeList acts like a linked list
// and accessing items by index is slow
$siblings = iterator_to_array( $ancestor->childNodes );
@ -286,13 +282,21 @@ class CommentUtils {
$end = count( $siblings ) - 1;
// Find first of the siblings that contains the item
while ( !self::contains( $siblings[ $start ], $range->startContainer ) ) {
$start++;
if ( $ancestor === $range->startContainer ) {
$start = $range->startOffset;
} else {
while ( !self::contains( $siblings[ $start ], $range->startContainer ) ) {
$start++;
}
}
// Find last of the siblings that contains the item
while ( !self::contains( $siblings[ $end ], $range->endContainer ) ) {
$end--;
if ( $ancestor === $range->endContainer ) {
$end = $range->endOffset - 1;
} else {
while ( !self::contains( $siblings[ $end ], $range->endContainer ) ) {
$end--;
}
}
return array_slice( $siblings, $start, $end - $start + 1 );
@ -306,6 +310,10 @@ class CommentUtils {
*/
public static function getFullyCoveredSiblings( ThreadItem $item ) : ?array {
$siblings = self::getCoveredSiblings( $item );
$startContainer = $item->getRange()->startContainer;
$endContainer = $item->getRange()->endContainer;
$startOffset = $item->getRange()->startOffset;
$endOffset = $item->getRange()->endOffset;
$isIgnored = function ( $node ) {
// Ignore empty text nodes
@ -333,7 +341,11 @@ class CommentUtils {
$startMatches = false;
$node = $siblings[ 0 ] ?? null;
while ( $node ) {
if ( $item->getRange()->startContainer === $node && $item->getRange()->startOffset === 0 ) {
if ( $startContainer->childNodes && $startContainer->childNodes[ $startOffset ] === $node ) {
$startMatches = true;
break;
}
if ( $startContainer === $node && $startOffset === 0 ) {
$startMatches = true;
break;
}
@ -347,12 +359,16 @@ class CommentUtils {
$endMatches = false;
$node = end( $siblings );
while ( $node ) {
if ( $endContainer->childNodes && $endContainer->childNodes[ $endOffset - 1 ] === $node ) {
$endMatches = true;
break;
}
$length = ( $node->nodeType === XML_TEXT_NODE ) ?
strlen( rtrim( $node->nodeValue, "\t\n\f\r " ) ) :
// PHP bug: childNodes can be null for comment nodes
// (it should always be a DOMNodeList, even if the node can't have children)
( $node->childNodes ? $node->childNodes->length : 0 );
if ( $item->getRange()->endContainer === $node && $item->getRange()->endOffset === $length ) {
if ( $endContainer === $node && $endOffset === $length ) {
$endMatches = true;
break;
}

40
modules/utils.js
View file

@ -242,22 +242,26 @@ function getCoveredSiblings( item ) {
range = item.getNativeRange();
ancestor = range.commonAncestorContainer;
if ( ancestor === range.startContainer || ancestor === range.endContainer ) {
return [ ancestor ];
}
siblings = ancestor.childNodes;
start = 0;
end = siblings.length - 1;
// Find first of the siblings that contains the item
while ( !contains( siblings[ start ], range.startContainer ) ) {
start++;
if ( ancestor === range.startContainer ) {
start = range.startOffset;
} else {
while ( !contains( siblings[ start ], range.startContainer ) ) {
start++;
}
}
// Find last of the siblings that contains the item
while ( !contains( siblings[ end ], range.endContainer ) ) {
end--;
if ( ancestor === range.endContainer ) {
end = range.endOffset - 1;
} else {
while ( !contains( siblings[ end ], range.endContainer ) ) {
end--;
}
}
return Array.prototype.slice.call( siblings, start, end + 1 );
@ -270,9 +274,15 @@ function getCoveredSiblings( item ) {
* @return {HTMLElement[]|null}
*/
function getFullyCoveredSiblings( item ) {
var siblings, node, startMatches, endMatches, length, parent;
var
siblings, startContainer, endContainer, startOffset, endOffset,
node, startMatches, endMatches, length, parent;
siblings = getCoveredSiblings( item );
startContainer = item.range.startContainer;
endContainer = item.range.endContainer;
startOffset = item.range.startOffset;
endOffset = item.range.endOffset;
function isIgnored( n ) {
// Ignore empty text nodes, and our own reply buttons
@ -301,7 +311,11 @@ function getFullyCoveredSiblings( item ) {
startMatches = false;
node = siblings[ 0 ];
while ( node ) {
if ( item.range.startContainer === node && item.range.startOffset === 0 ) {
if ( startContainer.childNodes && startContainer.childNodes[ startOffset ] === node ) {
startMatches = true;
break;
}
if ( startContainer === node && startOffset === 0 ) {
startMatches = true;
break;
}
@ -315,10 +329,14 @@ function getFullyCoveredSiblings( item ) {
endMatches = false;
node = siblings[ siblings.length - 1 ];
while ( node ) {
if ( endContainer.childNodes && endContainer.childNodes[ endOffset - 1 ] === node ) {
endMatches = true;
break;
}
length = node.nodeType === Node.TEXT_NODE ?
node.textContent.replace( /[\t\n\f\r ]+$/, '' ).length :
node.childNodes.length;
if ( item.range.endContainer === node && item.range.endOffset === length ) {
if ( endContainer === node && endOffset === length ) {
endMatches = true;
break;
}