Adamw has submitted this change and it was merged. Change subject: Haskell syntax: omit single quotes from QUOTEMARKS ......................................................................
Haskell syntax: omit single quotes from QUOTEMARKS Single quotes in Haskell may be used to delimit character literals, but they can also be used in identifiers. GeSHi's syntax highlighter only recognizes the former usage. When Haskell source uses "'" as part of an identifier, GeSHi treats it as the start of a literal string, which screws up syntax highlighting. Upstream bug report and proposed patch have been ignored for more than a year, so I am applying the proposed fix here, and changing the version identifier to reflect a WMF modification. Upstream bug report: <http://sourceforge.net/p/geshi/bugs/217/> Upstream proposed patch: <http://sourceforge.net/p/geshi/bugs/219/> Bug: 52509 Change-Id: I210832c4b272b5c03bbc4623d73fb821092e5ef4 --- M geshi/geshi.php M geshi/geshi/haskell.php 2 files changed, 10 insertions(+), 2 deletions(-) Approvals: Adamw: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/geshi/geshi.php b/geshi/geshi.php index 6074157..4323d05 100644 --- a/geshi/geshi.php +++ b/geshi/geshi.php @@ -41,7 +41,7 @@ // /** The version of this GeSHi file */ -define('GESHI_VERSION', '1.0.8.11'); +define('GESHI_VERSION', '1.0.8.11-wmf1'); // WMF fix for Haskell (bug 52509) // Define the root directory for the GeSHi code tree if (!defined('GESHI_ROOT')) { diff --git a/geshi/geshi/haskell.php b/geshi/geshi/haskell.php index adae111..d3b494e 100644 --- a/geshi/geshi/haskell.php +++ b/geshi/geshi/haskell.php @@ -13,6 +13,14 @@ * ------- * 2005/08/27 (1.0.0) * - First Release + * 2013/09/28 + * - Single quotes dropped from QUOTEMARKS to resolve <https://bugzilla.wikimedia.org/52509>. + * Change is local to SyntaxHighlight_GeSHi, made by Ori Livneh ([email protected]), based + * on a proposed upstream patch. + * Upstream bug report: + * <http://sourceforge.net/p/geshi/bugs/217/> + * Upstream patch (stalled since 2012): + * <http://sourceforge.net/p/geshi/bugs/219/> * * TODO (updated 2005/08/27) * ------------------------- @@ -46,7 +54,7 @@ 3 => "/{-(?:(?R)|.)-}/s", //Nested Comments ), 'CASE_KEYWORDS' => 0, - 'QUOTEMARKS' => array('"',"'"), + 'QUOTEMARKS' => array('"'), // SyntaxHighlight_GeSHi modification; see CHANGES above. 'ESCAPE_CHAR' => '\\', 'KEYWORDS' => array( /* main haskell keywords */ -- To view, visit https://gerrit.wikimedia.org/r/86395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I210832c4b272b5c03bbc4623d73fb821092e5ef4 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: master Gerrit-Owner: Ori.livneh <[email protected]> Gerrit-Reviewer: Adamw <[email protected]> Gerrit-Reviewer: Anomie <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
