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

Fix lexer list parsing on Windows

Browse source 
When using a non-bundled Pygments (which is required on Windows, as the
bundled version is an ELF binary), we call into the Pygments executable
to generate the list of supported languages (lexers). This list seems to
occasionally include carraige returns, causing some languages to not be
processed correctly. Trim those CRs out so the language list is
accurate.

Bug: T336087
Change-Id: If8b1f145dd10e2c4707d6d32927e85d1d2459f15
(cherry picked from commit 2ae82c7fb7)
This commit is contained in:
Ryan Schmidt 2022-11-20 22:46:55 -07:00 committed by Reedy
parent e5a9cd32d3
commit 90bf39a264
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/Pygmentize.php
View file

@ -211,7 +211,7 @@ class Pygmentize {
$lexers = []; $lexers = [];
foreach ( explode( "\n", $output ) as $line ) { foreach ( explode( "\n", $output ) as $line ) {
if ( substr( $line, 0, 1 ) === '*' ) { if ( substr( $line, 0, 1 ) === '*' ) {
$newLexers = explode( ', ', trim( $line, "* :\n" ) ); $newLexers = explode( ', ', trim( $line, "* :\r\n" ) );
// Skip internal, unnamed lexers // Skip internal, unnamed lexers
if ( $newLexers[0] !== '' ) { if ( $newLexers[0] !== '' ) {