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

Fix SyntaxHighlight incompatibility

Browse source 
The class existence check Scribunto used to tell apart current and
B/C versions of SyntaxHighlight does not work with recent versions.
This caused the B/C branch to be invoked unnecessarily, which
resulted in deprecation warnings.

Also, the supposedly non-B/C branch also invoked B/C code which has
no error handling.

The commit removes B/C support and adds a new way of interacting with
SyntaxHighlight.

Bug: T109873
Change-Id: I2d518b5412efbe4e8ddb43e7c465ea55dc44b1a3
This commit is contained in:
Gergő Tisza 2015-10-12 12:32:17 -07:00 committed by Cindy Cicalese
parent 6be48e2f7a
commit 8fb655258d
1 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
includes/common/ScribuntoContent.php
View file

@ -47,7 +47,7 @@ class ScribuntoContent extends TextContent {
protected function fillParserOutput(
Title $title, $revId, ParserOptions $options, $generateHtml, ParserOutput &$output
) {
global $wgParser, $wgScribuntoUseGeSHi, $wgUseSiteCss;
global $wgParser;
$text = $this->getNativeData();
@ -121,32 +121,8 @@ class ScribuntoContent extends TextContent {
$engine = Scribunto::newDefaultEngine();
$engine->setTitle( $title );
// Add HTML for the actual script
$language = $engine->getGeSHiLanguage();
if ( $wgScribuntoUseGeSHi && class_exists( SyntaxHighlight_GeSHi::class ) && $language ) {
$geshi = SyntaxHighlight_GeSHi::prepare( $text, $language );
$geshi->set_language( $language );
if ( $geshi instanceof GeSHi && !$geshi->error() ) {
$code = $geshi->parse_code();
if ( $code ) {
// @todo Once we drop support for old versions of
// Extension:SyntaxHighlight_GeSHi, drop the ugly test and
// the BC case.
global $wgAutoloadClasses;
if ( isset( $wgAutoloadClasses['ResourceLoaderGeSHiModule'] ) ) {
$output->addModuleStyles( "ext.geshi.language.$language" );
} else {
// Backwards compatibility
$output->addHeadItem( SyntaxHighlight_GeSHi::buildHeadItem( $geshi ), "source-{$language}" );
}
if ( $wgUseSiteCss ) {
$output->addModuleStyles( 'ext.geshi.local' );
}
$output->setText( $output->getRawText() . $code );
return $output;
}
}
if ( $this->highlight( $text, $output, $engine ) ) {
return $output;
}
// No GeSHi, or GeSHi can't parse it, use plain <pre>
@ -158,4 +134,27 @@ class ScribuntoContent extends TextContent {
return $output;
}
/**
* Adds syntax highlighting to the output (or do not touch it and return false).
* @param string $text
* @param ParserOutput $output
* @param ScribuntoEngineBase $engine
* @return bool Success status
*/
protected function highlight( $text, ParserOutput $output, ScribuntoEngineBase $engine ) {
global $wgScribuntoUseGeSHi;
$language = $engine->getGeSHiLanguage();
if ( $wgScribuntoUseGeSHi && class_exists( SyntaxHighlight::class ) && $language ) {
$status = SyntaxHighlight::highlight( $text, $language );
if ( $status->isGood() ) {
// @todo replace addModuleStyles line with the appropriate call on
// SyntaxHighlight once one is created
$output->addModuleStyles( 'ext.pygments' );
$output->setText( $output->getRawText() . $status->getValue() );
return true;
}
}
return false;
}
}