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

Reconcile some ref errors cases with $hasFollow

Browse source 
Change-Id: I5e3a27366f177af6c221d57da6e31f28cc91bb0c
This commit is contained in:
Arlo Breault 2020-11-24 17:34:43 -05:00
parent de5d806335
commit 6525d69200
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Parsoid/References.php
View file

@ -177,18 +177,6 @@ class References extends ExtensionTagHandler {
$validFollow = false;
// FIXME: Reconcile this with `$hasFollow`
if ( $refsData->inReferencesContent() ) {
if ( $hasRefName ) {
$group = $refsData->getRefGroup( $groupName );
if ( !isset( $group->indexByName[$refName] ) ) {
$errs[] = [ 'key' => 'cite_error_references_missing_key' ];
}
} else {
$errs[] = [ 'key' => 'cite_error_references_no_key' ];
}
}
if ( $hasFollow ) {
// Always wrap follows content so that there's no ambiguity
// where to find it when roundtripping
@ -200,10 +188,21 @@ class References extends ExtensionTagHandler {
);
DOMUtils::migrateChildren( $c, $span );
$c->appendChild( $span );
}
if ( $hasRefName ) {
if ( $hasFollow ) {
// Presumably, "name" has higher precedence
$errs[] = [ 'key' => 'cite_error_ref_too_many_keys' ];
}
if ( $refsData->inReferencesContent() ) {
$group = $refsData->getRefGroup( $groupName );
if ( !isset( $group->indexByName[$refName] ) ) {
$errs[] = [ 'key' => 'cite_error_references_missing_key' ];
}
}
} else {
if ( $hasFollow ) {
// This is a follows ref, so check that a named ref has already
// been defined
$group = $refsData->getRefGroup( $groupName );
@ -228,6 +227,8 @@ class References extends ExtensionTagHandler {
// equivalent key and just outputs something wacky.
$errs[] = [ 'key' => 'cite_error_references_missing_key' ];
}
} elseif ( $refsData->inReferencesContent() ) {
$errs[] = [ 'key' => 'cite_error_references_no_key' ];
}
}