Use Twig highlighter instead of Jinja #5859
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
👍 the new version of Sphinx has been released and the server should be ready (if not, I'll take care of it). Thanks for this improvement. Using anything different thatn |
|
Please retrigger the Travis and platform.sh builds now that the extension is updated to support Twig, to see whether it works fine |
|
Everything works fine now |
|
👍 |
wouterj
added a commit
that referenced
this pull request
Nov 7, 2015
This PR was merged into the 2.3 branch. Discussion ---------- Use Twig highlighter instead of Jinja Pygments 2 supports the Twig highlighting language, which is (of course) closer to Twig than Jinja is. Previously, we reverted one occurence of Twig in #5378 , because people might use older versions locally. I no longer think this is a good reason: * They can update the versions, Pygments 2 isn't that new * Now we have platform.sh and travis, building locally isn't recommended/required anymore (if it ever was) | Q | A | --- | --- | Doc fix? | yes | New docs? | no | Applies to | 2.3+ | Fixed ticket | - This requires fabpot/sphinx-php#31 to be merged first. (and Pygments 2 to be available on symfony.com's server, but I think it already is /cc @javiereguiluz ) Commits ------- d116232 Fix formatting 57c2d4b Use Twig highlighter instead of Jinja
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pygments 2 supports the Twig highlighting language, which is (of course) closer to Twig than Jinja is.
Previously, we reverted one occurence of Twig in #5378 , because people might use older versions locally. I no longer think this is a good reason:
This requires fabpot/sphinx-php#31 to be merged first. (and Pygments 2 to be available on symfony.com's server, but I think it already is /cc @javiereguiluz )