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

Merge "One more tweak for comparing comment ranges to transclusion/DOM ranges"

Browse source
This commit is contained in:
jenkins-bot 2022-01-24 23:37:07 +00:00 committed by Gerrit Code Review
parent 4679dd27b3 110a59200f
commit 0b52563b53
3 changed files with 46 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
includes/CommentUtils.php
View file

@ -635,32 +635,41 @@ class CommentUtils {
$from = $boundary === 'end' ? self::getRangeLastNode( $a ) : self::getRangeFirstNode( $a ); $from = $boundary === 'end' ? self::getRangeLastNode( $a ) : self::getRangeFirstNode( $a );
$to = $boundary === 'end' ? self::getRangeLastNode( $b ) : self::getRangeFirstNode( $b ); $to = $boundary === 'end' ? self::getRangeLastNode( $b ) : self::getRangeFirstNode( $b );
$skippingFrom = $boundary === 'end'; $skipNode = null;
if ( $boundary === 'end' ) {
$skipNode = $from;
}
$foundContent = false; $foundContent = false;
self::linearWalk( self::linearWalk(
$from, $from,
static function ( string $event, Node $n ) use ( static function ( string $event, Node $n ) use (
$from, $to, $boundary, &$skippingFrom, &$foundContent $from, $to, $boundary, &$skipNode, &$foundContent
) { ) {
if ( $n === $to && $event === ( $boundary === 'end' ? 'leave' : 'enter' ) ) { if ( $n === $to && $event === ( $boundary === 'end' ? 'leave' : 'enter' ) ) {
return true; return true;
} }
if ( $skippingFrom ) { if ( $skipNode ) {
$skippingFrom = !( $n === $from && $event === 'leave' ); if ( $n === $skipNode && $event === 'leave' ) {
$skipNode = null;
}
return; return;
} }
if ( if ( $event === 'enter' ) {
$event === 'enter' && if (
( CommentUtils::isCommentSeparator( $n ) ||
!CommentUtils::isCommentSeparator( $n ) && CommentUtils::isRenderingTransparentNode( $n ) ||
!CommentUtils::isRenderingTransparentNode( $n ) && CommentUtils::isOurGeneratedNode( $n )
!CommentUtils::isOurGeneratedNode( $n ) && ) {
$skipNode = $n;
} elseif (
CommentUtils::isCommentContent( $n ) CommentUtils::isCommentContent( $n )
) ) {
) { $foundContent = true;
$foundContent = true; return true;
return true; }
} }
} }
); );

35
modules/utils.js
View file

@ -561,7 +561,11 @@ function compareRangesAlmostEqualBoundaries( a, b, boundary ) {
var from = boundary === 'end' ? getRangeLastNode( a ) : getRangeFirstNode( a ); var from = boundary === 'end' ? getRangeLastNode( a ) : getRangeFirstNode( a );
var to = boundary === 'end' ? getRangeLastNode( b ) : getRangeFirstNode( b ); var to = boundary === 'end' ? getRangeLastNode( b ) : getRangeFirstNode( b );
var skippingFrom = boundary === 'end'; var skipNode = null;
if ( boundary === 'end' ) {
skipNode = from;
}
var foundContent = false; var foundContent = false;
linearWalk( linearWalk(
from, from,
@ -569,22 +573,27 @@ function compareRangesAlmostEqualBoundaries( a, b, boundary ) {
if ( n === to && event === ( boundary === 'end' ? 'leave' : 'enter' ) ) { if ( n === to && event === ( boundary === 'end' ? 'leave' : 'enter' ) ) {
return true; return true;
} }
if ( skippingFrom ) { if ( skipNode ) {
skippingFrom = !( n === from && event === 'leave' ); if ( n === skipNode && event === 'leave' ) {
skipNode = null;
}
return; return;
} }
if ( if ( event === 'enter' ) {
event === 'enter' && if (
( isCommentSeparator( n ) ||
!isCommentSeparator( n ) && isRenderingTransparentNode( n ) ||
!isRenderingTransparentNode( n ) && isOurGeneratedNode( n )
!isOurGeneratedNode( n ) && ) {
skipNode = n;
} else if (
isCommentContent( n ) isCommentContent( n )
) ) {
) { foundContent = true;
foundContent = true; return true;
return true; }
} }
} }
); );

2
tests/cases/en-big-parsoid/en-big-parsoid-transcludedFrom.json
View file

@ -49,7 +49,7 @@
"c-Xaosflux-2019-06-29T19:38:00.000Z-Bishonen-2019-06-29T19:30:00.000Z": false, "c-Xaosflux-2019-06-29T19:38:00.000Z-Bishonen-2019-06-29T19:30:00.000Z": false,
"c-Suffusion_of_Yellow-2019-06-29T19:42:00.000Z-Bishonen-2019-06-29T19:30:00.000Z": false, "c-Suffusion_of_Yellow-2019-06-29T19:42:00.000Z-Bishonen-2019-06-29T19:30:00.000Z": false,
"c-Suffusion_of_Yellow-2019-06-29T19:45:00.000Z-Suffusion_of_Yellow-2019-06-29T19:42:00.000Z": false, "c-Suffusion_of_Yellow-2019-06-29T19:45:00.000Z-Suffusion_of_Yellow-2019-06-29T19:42:00.000Z": false,
"c-Suffusion_of_Yellow-2019-06-29T19:54:00.000Z-Missing_notification_icons_in_MonoBook": true, "c-Suffusion_of_Yellow-2019-06-29T19:54:00.000Z-Missing_notification_icons_in_MonoBook": false,
"c-Bishonen-2019-06-29T20:20:00.000Z-Suffusion_of_Yellow-2019-06-29T19:54:00.000Z": false, "c-Bishonen-2019-06-29T20:20:00.000Z-Suffusion_of_Yellow-2019-06-29T19:54:00.000Z": false,
"c-Xaosflux-2019-06-26T03:14:00.000Z-Excessive_width_on_monobook": false, "c-Xaosflux-2019-06-26T03:14:00.000Z-Excessive_width_on_monobook": false,
"c-Xaosflux-2019-06-26T03:41:00.000Z-Xaosflux-2019-06-26T03:14:00.000Z": false, "c-Xaosflux-2019-06-26T03:41:00.000Z-Xaosflux-2019-06-26T03:14:00.000Z": false,