jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/334868 )
Change subject: Update pygments to 2.2 ...................................................................... Update pygments to 2.2 Notable changes: * Added new token types and lexing for magic methods and variables in Python and PHP. * Added a new token type for heredoc (and similar) string delimiters and lexing for them in C++, Perl, PHP, Postgresql and Ruby lexers. * Improved the CSS lexer. * Added Varnish config lexer Full changelog is found at: <https://bitbucket.org/birkenfeld/pygments-main/src/bc45808f83d5338e3116be91890e6ad15220ee45/CHANGES> Bug: T156573 Change-Id: I4dc1782f19881ba1294308e1cdea1b2e063f438a --- M SyntaxHighlight_GeSHi.class.php M SyntaxHighlight_GeSHi.compat.php M SyntaxHighlight_GeSHi.lexers.php M modules/pygments.generated.css M pygments/VERSION M pygments/pygmentize M tests/parserTests.txt 7 files changed, 54 insertions(+), 14 deletions(-) Approvals: Zppix: Looks good to me, but someone else must approve jenkins-bot: Verified TheDJ: Looks good to me, approved Jforrester: Looks good to me, but someone else must approve diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php index c188a17..2154377 100644 --- a/SyntaxHighlight_GeSHi.class.php +++ b/SyntaxHighlight_GeSHi.class.php @@ -32,7 +32,7 @@ const HIGHLIGHT_CSS_CLASS = 'mw-highlight'; /** @var int Cache version. Increment whenever the HTML changes. */ - const CACHE_VERSION = 1; + const CACHE_VERSION = 2; /** @var array Mapping of MIME-types to lexer names. **/ private static $mimeLexers = array( diff --git a/SyntaxHighlight_GeSHi.compat.php b/SyntaxHighlight_GeSHi.compat.php index ba208a4..55f931b 100644 --- a/SyntaxHighlight_GeSHi.compat.php +++ b/SyntaxHighlight_GeSHi.compat.php @@ -111,16 +111,6 @@ // xpp is basically Java 'xpp' => 'java', - // bibtex is basically LaTeX - 'bibtex' => 'latex', - - // 'emacs-lisp' was an alias for the Emacs Lisp lexer. - // It got dropped in Pygments commit 811926b, probably by accident. - // Declare it here until it is restored upstream. - // Upstream bug: - // https://bitbucket.org/birkenfeld/pygments-main/issues/1207 - 'emacs-lisp' => 'elisp', - // apt 'apt_sources' => 'debsources', ); diff --git a/SyntaxHighlight_GeSHi.lexers.php b/SyntaxHighlight_GeSHi.lexers.php index 108236e..fe5b358 100644 --- a/SyntaxHighlight_GeSHi.lexers.php +++ b/SyntaxHighlight_GeSHi.lexers.php @@ -13,10 +13,12 @@ 'ada95', 'adl', 'agda', + 'aheui', 'ahk', 'alloy', 'ambienttalk', 'ambienttalk/2', + 'ampl', 'antlr', 'antlr-actionscript', 'antlr-as', @@ -57,6 +59,8 @@ 'bc', 'befunge', 'bf', + 'bib', + 'bibtex', 'blitzbasic', 'blitzmax', 'bmax', @@ -67,6 +71,8 @@ 'brainfuck', 'bro', 'bsdmake', + 'bst', + 'bst-pybtex', 'bugs', 'c', 'c#', @@ -76,6 +82,8 @@ 'ca65', 'cadl', 'camkes', + 'capdl', + 'capnp', 'cbmbas', 'ceylon', 'cf3', @@ -92,6 +100,7 @@ 'cirru', 'cl', 'clay', + 'clean', 'clipper', 'clj', 'cljs', @@ -112,10 +121,12 @@ 'cpp', 'cpp-objdump', 'cpsa', + 'cr', 'crmsh', 'croc', 'cry', 'cryptol', + 'crystal', 'csh', 'csharp', 'csound', @@ -152,6 +163,7 @@ 'dg', 'diff', 'django', + 'do', 'docker', 'dockerfile', 'dosbatch', @@ -177,12 +189,14 @@ 'elixir', 'elm', 'emacs', + 'emacs-lisp', 'erb', 'erl', 'erlang', 'evoque', 'ex', 'exs', + 'extempore', 'ezhil', 'factor', 'fan', @@ -190,7 +204,9 @@ 'felix', 'fish', 'fishshell', + 'flatline', 'flx', + 'forth', 'fortran', 'fortranfixed', 'foxpro', @@ -218,6 +234,8 @@ 'haxeml', 'hexdump', 'hs', + 'hsa', + 'hsail', 'html', 'html+cheetah', 'html+django', @@ -230,6 +248,7 @@ 'html+lasso', 'html+mako', 'html+myghty', + 'html+ng2', 'html+php', 'html+ruby', 'html+smarty', @@ -305,12 +324,15 @@ 'js+ruby', 'js+smarty', 'js+spitfire', + 'jsgf', 'json', 'json-ld', + 'json-object', 'jsonld', 'jsonml+bst', 'jsp', 'julia', + 'juttle', 'kal', 'kconfig', 'kernel-config', @@ -360,6 +382,7 @@ 'matlab', 'matlabsession', 'mawk', + 'md', 'menuconfig', 'mf', 'minid', @@ -368,6 +391,7 @@ 'modula2', 'moin', 'monkey', + 'monte', 'moo', 'moocode', 'moon', @@ -388,10 +412,12 @@ 'nasm', 'nawk', 'nb', + 'ncl', 'nemerle', 'nesc', 'newlisp', 'newspeak', + 'ng2', 'nginx', 'nim', 'nimrod', @@ -403,6 +429,7 @@ 'nsi', 'nsis', 'numpy', + 'nusmv', 'obj-c', 'obj-c++', 'obj-j', @@ -465,6 +492,7 @@ 'ps1con', 'psm1', 'psql', + 'pug', 'puppet', 'py', 'py3', @@ -510,6 +538,8 @@ 'rexx', 'rhtml', 'rkt', + 'rnc', + 'rng-compact', 'roboconf-graph', 'roboconf-instances', 'robotframework', @@ -523,6 +553,7 @@ 's', 'sage', 'salt', + 'sas', 'sass', 'sc', 'scala', @@ -535,6 +566,7 @@ 'shell', 'shell-session', 'shen', + 'silver', 'slim', 'sls', 'smali', @@ -542,6 +574,7 @@ 'smarty', 'sml', 'snobol', + 'snowball', 'sources.list', 'sourceslist', 'sp', @@ -558,13 +591,16 @@ 'ssp', 'st', 'stan', + 'stata', 'supercollider', 'sv', 'swift', 'swig', 'systemverilog', + 't-sql', 'tads3', 'tap', + 'tasm', 'tcl', 'tcsh', 'tcshcon', @@ -581,9 +617,13 @@ 'trafficscript', 'treetop', 'ts', + 'tsql', 'turtle', 'twig', 'typescript', + 'typoscript', + 'typoscriptcssdata', + 'typoscripthtmldata', 'udiff', 'urbiscript', 'v', @@ -591,6 +631,9 @@ 'vapi', 'vb.net', 'vbnet', + 'vcl', + 'vclsnippet', + 'vclsnippets', 'vctreestatus', 'velocity', 'verilog', @@ -598,6 +641,8 @@ 'vgl', 'vhdl', 'vim', + 'wdiff', + 'whiley', 'winbatch', 'winbugs', 'x10', @@ -630,4 +675,5 @@ 'yaml', 'yaml+jinja', 'zephir', + 'zsh', ); diff --git a/modules/pygments.generated.css b/modules/pygments.generated.css index b265269..2321fdc 100644 --- a/modules/pygments.generated.css +++ b/modules/pygments.generated.css @@ -48,8 +48,10 @@ .mw-highlight .mh { color: #666666 } /* Literal.Number.Hex */ .mw-highlight .mi { color: #666666 } /* Literal.Number.Integer */ .mw-highlight .mo { color: #666666 } /* Literal.Number.Oct */ +.mw-highlight .sa { color: #BA2121 } /* Literal.String.Affix */ .mw-highlight .sb { color: #BA2121 } /* Literal.String.Backtick */ .mw-highlight .sc { color: #BA2121 } /* Literal.String.Char */ +.mw-highlight .dl { color: #BA2121 } /* Literal.String.Delimiter */ .mw-highlight .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ .mw-highlight .s2 { color: #BA2121 } /* Literal.String.Double */ .mw-highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ @@ -60,7 +62,9 @@ .mw-highlight .s1 { color: #BA2121 } /* Literal.String.Single */ .mw-highlight .ss { color: #19177C } /* Literal.String.Symbol */ .mw-highlight .bp { color: #008000 } /* Name.Builtin.Pseudo */ +.mw-highlight .fm { color: #0000FF } /* Name.Function.Magic */ .mw-highlight .vc { color: #19177C } /* Name.Variable.Class */ .mw-highlight .vg { color: #19177C } /* Name.Variable.Global */ .mw-highlight .vi { color: #19177C } /* Name.Variable.Instance */ +.mw-highlight .vm { color: #19177C } /* Name.Variable.Magic */ .mw-highlight .il { color: #666666 } /* Literal.Number.Integer.Long */ diff --git a/pygments/VERSION b/pygments/VERSION index 879b416..ccbccc3 100644 --- a/pygments/VERSION +++ b/pygments/VERSION @@ -1 +1 @@ -2.1 +2.2.0 diff --git a/pygments/pygmentize b/pygments/pygmentize index b767818..8b1e9da 100755 --- a/pygments/pygmentize +++ b/pygments/pygmentize Binary files differ diff --git a/tests/parserTests.txt b/tests/parserTests.txt index 5b93444..8864c2d 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -86,7 +86,7 @@ var a; </source> !! result -<div class="mw-highlight mw-content-ltr" dir="ltr"><pre><span class="kd">var</span> <span class="nx">a</span><span class="p">;</span> +<div class="mw-highlight mw-content-ltr" dir="ltr"><pre><span></span><span class="kd">var</span> <span class="nx">a</span><span class="p">;</span> </pre></div> !! end @@ -131,7 +131,7 @@ !!input <source lang="javascript" id="foo" class="bar" dir="rtl" style="font-size: larger;">var a;</source> !! result -<div id="foo" class="bar mw-highlight mw-content-rtl" dir="rtl" style="font-size: larger;"><pre><span class="kd">var</span> <span class="nx">a</span><span class="p">;</span> +<div id="foo" class="bar mw-highlight mw-content-rtl" dir="rtl" style="font-size: larger;"><pre><span></span><span class="kd">var</span> <span class="nx">a</span><span class="p">;</span> </pre></div> !! end -- To view, visit https://gerrit.wikimedia.org/r/334868 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4dc1782f19881ba1294308e1cdea1b2e063f438a Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: master Gerrit-Owner: Legoktm <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: John Vandenberg <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: Paladox <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: TheDJ <[email protected]> Gerrit-Reviewer: Zppix <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
