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

Fixup (and add) some braces, remove trailing whitespace

Browse source
This commit is contained in:
Sam Reed 2010-08-09 06:56:38 +00:00
parent 4bc3dbd009
commit 29de7361fb
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
SyntaxHighlight_GeSHi.class.php
View file

@ -62,15 +62,19 @@ class SyntaxHighlight_GeSHi {
// Highlighting specific lines
if( isset( $args['highlight'] ) ) {
$lines = self::parseHighlightLines( $args['highlight'] );
if ( count($lines) ) $geshi->highlight_lines_extra( $lines );
if ( count($lines) ) {
$geshi->highlight_lines_extra( $lines );
}
}
// Starting line number
if( isset( $args['start'] ) )
if( isset( $args['start'] ) ) {
$geshi->start_line_numbers_at( $args['start'] );
}
$geshi->set_header_type( $enclose );
// Strict mode
if( isset( $args['strict'] ) )
if( isset( $args['strict'] ) ) {
$geshi->enable_strict_mode();
}
// Format
$out = $geshi->parse_code();
$err = $geshi->error();
@ -93,7 +97,7 @@ class SyntaxHighlight_GeSHi {
wfProfileOut( __METHOD__ );
return $out;
}
/**
* Take an input specifying a list of lines to highlight, returning
* a raw list of matching line numbers.
@ -124,7 +128,7 @@ class SyntaxHighlight_GeSHi {
}
return $lines;
}
/**
* Validate a provided input range
*/
@ -209,8 +213,9 @@ class SyntaxHighlight_GeSHi {
private static function prepare( $text, $lang ) {
self::initialise();
$geshi = new GeSHi( $text, $lang );
if( $geshi->error() == GESHI_ERROR_NO_SUCH_LANG )
if( $geshi->error() == GESHI_ERROR_NO_SUCH_LANG ) {
return null;
}
$geshi->set_encoding( 'UTF-8' );
$geshi->enable_classes();
$geshi->set_overall_class( "source-$lang" );
@ -255,8 +260,9 @@ class SyntaxHighlight_GeSHi {
*/
private static function formatError( $error = '' ) {
$html = '';
if( $error )
if( $error ) {
$html .= "<p>{$error}</p>";
}
$html .= '<p>' . htmlspecialchars( wfMsgForContent( 'syntaxhighlight-specify' ) )
. ' <samp>&lt;source lang=&quot;html4strict&quot;&gt;...&lt;/source&gt;</samp></p>'
. '<p>' . htmlspecialchars( wfMsgForContent( 'syntaxhighlight-supported' ) ) . '</p>'
@ -305,8 +311,9 @@ class SyntaxHighlight_GeSHi {
private static function initialise() {
if( !self::$initialised ) {
wfLoadExtensionMessages( 'SyntaxHighlight_GeSHi' );
if( !class_exists( 'GeSHi' ) )
if( !class_exists( 'GeSHi' ) ) {
require( 'geshi/geshi.php' );
}
self::$initialised = true;
}
return true;
@ -321,12 +328,12 @@ class SyntaxHighlight_GeSHi {
$wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi']['version'] = GESHI_VERSION;
return true;
}
/**
* @see SyntaxHighlight_GeSHi::hSpecialVersion_GeSHi
*/
public static function hOldSpecialVersion_GeSHi( &$sp, &$extensionTypes ) {
return self::hSpecialVersion_GeSHi( $extensionTypes );
}
}
}

6
SyntaxHighlight_GeSHi.php
View file

@ -36,8 +36,9 @@
* some help text and a list of all supported languages.
*/
if( !defined( 'MEDIAWIKI' ) )
if( !defined( 'MEDIAWIKI' ) ) {
die();
}
$wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi'] = array(
'path' => __FILE__,
@ -57,8 +58,7 @@ $wgHooks['ParserFirstCallInit'][] = 'efSyntaxHighlight_GeSHiSetup';
if ( version_compare( $wgVersion, '1.17alpha', '>=' ) ) {
// For MediaWiki 1.17 alpha and later.
$wgHooks['ExtensionTypes'][] = 'SyntaxHighlight_GeSHi::hSpecialVersion_GeSHi';
}
else {
} else {
// For pre-MediaWiki 1.17 alpha.
$wgHooks['SpecialVersionExtensionTypes'][] = 'SyntaxHighlight_GeSHi::hOldSpecialVersion_GeSHi';
}