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

Factor out plainCodeWrap to avoid recursive call to self

Browse source 
The recursive call is somewhat counter-intuitive, and seems like it could
easily break if forgotten. Instead, move the part that we want to re-use
out into its own method.

Change-Id: I64ced0da211155299744d3c86f7818e751ad027e
This commit is contained in:
Timo Tijhof 2018-02-22 15:16:51 -08:00 committed by Krinkle
parent 92602f33da
commit ae9b8419dc
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
includes/SyntaxHighlight.php
View file

@ -192,6 +192,22 @@ class SyntaxHighlight {
return $wgPygmentizePath;
}
/**
* @param string $code
* @param bool $inline
*/
private static function plainCodeWrap( $code, $inline ) {
if ( $inline ) {
return htmlspecialchars( trim( $code ), ENT_NOQUOTES );
}
return Html::rawElement(
'div',
[ 'class' => self::HIGHLIGHT_CSS_CLASS ],
Html::element( 'pre', [], $code )
);
}
/**
* Highlight a code-block using a particular lexer.
*
@ -246,15 +262,7 @@ class SyntaxHighlight {
if ( $lexer === null ) {
// When syntax highlighting is disabled..
if ( $inline ) {
$status->value = htmlspecialchars( trim( $code ), ENT_NOQUOTES );
} else {
$status->value = Html::rawElement(
'div',
[ 'class' => self::HIGHLIGHT_CSS_CLASS ],
Html::element( 'pre', [], $code )
);
}
$status->value = self::plainCodeWrap( $code, $inline );
return $status;
}
@ -311,9 +319,8 @@ class SyntaxHighlight {
if ( $result->getExitCode() != 0 ) {
$status->warning( 'syntaxhighlight-error-pygments-invocation-failure' );
wfWarn( 'Failed to invoke Pygments: ' . $result->getStderr() );
// Recursive call to the same method, this time with syntax highlighting
// disabled (to re-use above code). TODO: Factor out to separate method.
$status->value = self::highlight( $code, null, $args )->getValue();
// Fall back to preformatted code without syntax highlighting
$status->value = self::plainCodeWrap( $code, $inline );
return $status;
}