Fix GLSL and HLSL preprocessor line continuation#2350
Merged
jeanas merged 1 commit intopygments:masterfrom Feb 23, 2023
Merged
Conversation
Collaborator
|
Thanks! Could you please add/extend an example file with this so we can capture future regressions? You'll need to run |
jeanas
reviewed
Feb 22, 2023
Contributor
jeanas
left a comment
jeanas
left a comment
There was a problem hiding this comment.
Looks fine, but please add a test (cf. https://pygments.org/docs/lexerdevelopment/#adding-and-testing-a-new-lexer).
Contributor
|
Well, we raced. At least we're consistent with each other :-) |
bitsawer
force-pushed
the
fix_glsl_preprocessor
branch
from
552ad3f to
ce88071
Compare
bitsawer
force-pushed
the
fix_glsl_preprocessor
branch
from
ce88071 to
7354a06
Compare
Contributor
Author
|
Thanks for the feedback! Removed "\r?" and added some tests, let me know if I missed something. |
Contributor
|
Thanks! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Both shading languages allow their preprocessor to use line continuation with backlashes
\, if they are the last character on a line before newline or carriage return. This PR adds support for that:Noticed this problem when generating Godot's documentation for its shader preprocessor (which is very similar to GLSL and HLSL preprocessor). Notice how the first shader code block in https://docs.godotengine.org/en/latest/tutorials/shaders/shader_reference/shader_preprocessor.html does not get syntax highlighting at all as the current lexer produces an error because of
\characters. This PR fixes the issue and the code block is highlighted correctly.