Don't output extra whitespace in YAML multiline #993
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
|
Seems reasonable, but an earlier PR that was merged also regenned the enums and this now conflicts. |
This resolves a particular issue with parsing YAML multiline, for example: ```yaml a: | multiline literal line 2 ``` The regex used would capture the amount of indentation in the third capture group and then use that as a kind of "status" to know which lines are part of the indented multiline. However, because its a captured group it has to be assigned a token which was `TextWhitespace`. This meant that the indentation was outputed after the multiline, technically it should be seen as an non-captured group, but then its no longer to refer to it in the regex. Therefore I've gone with the solution to add a new token, Ignore, which will not be emitted as a token in the iterator, which can safely be used to make use of capture groups but not have them show up in the output.
Gusted
force-pushed
the
extra-spaces-yaml
branch
from
600d254 to
d446dfd
Compare
|
No big deal, rebased the PR and regenerated the enums. |
|
Thanks! |
DennisRasey
pushed a commit
to DennisRasey/forgejo
that referenced
this pull request
Jan 6, 2025
…6477) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/alecthomas/chroma/v2](https://github.com/alecthomas/chroma) | require | minor | `v2.14.0` -> `v2.15.0` | --- ### Release Notes <details> <summary>alecthomas/chroma (github.com/alecthomas/chroma/v2)</summary> ### [`v2.15.0`](https://github.com/alecthomas/chroma/releases/tag/v2.15.0) [Compare Source](alecthomas/chroma@v2.14.0...v2.15.0) #### What's Changed - AQL: Add builtin functions introduced in v3.12 by [@​Simran-B](https://github.com/Simran-B) in alecthomas/chroma#968 - chore(styles): add evergarden inspired style by [@​comfysage](https://github.com/comfysage) in alecthomas/chroma#970 - chore(deps): update dependency svu to v2 by [@​renovate](https://github.com/renovate) in alecthomas/chroma#971 - chore(deps): update dependency watchexec to v2 by [@​renovate](https://github.com/renovate) in alecthomas/chroma#962 - chore(deps): update all non-major dependencies by [@​renovate](https://github.com/renovate) in alecthomas/chroma#955 - styles: Fix Gleam alias by [@​jmooring](https://github.com/jmooring) in alecthomas/chroma#973 - chore(deps): update all non-major dependencies by [@​renovate](https://github.com/renovate) in alecthomas/chroma#974 - chore(deps): update dependency python3 to v3.12.3 by [@​renovate](https://github.com/renovate) in alecthomas/chroma#976 - added the nordic theme via chroma/styles/nordic.xml by [@​avih7531](https://github.com/avih7531) in alecthomas/chroma#977 - Update the Materialize lexer by [@​arusahni](https://github.com/arusahni) in alecthomas/chroma#978 - feat(lexers/hare): add done keyword by [@​wackbyte](https://github.com/wackbyte) in alecthomas/chroma#979 - pygments2chroma: escape regex.words by [@​oliverpool](https://github.com/oliverpool) in alecthomas/chroma#982 - chore(deps): update all non-major dependencies by [@​renovate](https://github.com/renovate) in alecthomas/chroma#981 - Add JSONata Lexer by [@​DevDimov](https://github.com/DevDimov) in alecthomas/chroma#983 - Go lexer: single line comment without consuming endline, disable EnsureNL by [@​msorc](https://github.com/msorc) in alecthomas/chroma#984 - Update the Materialize lexer by [@​arusahni](https://github.com/arusahni) in alecthomas/chroma#987 - chore(deps): update all non-major dependencies by [@​renovate](https://github.com/renovate) in alecthomas/chroma#985 - Add Gleam to README by [@​Nicd](https://github.com/Nicd) in alecthomas/chroma#990 - Port Minecraft lexers from Pygments by [@​kofuk](https://github.com/kofuk) in alecthomas/chroma#992 - Don't output extra whitespace in YAML multiline by [@​Gusted](https://github.com/Gusted) in alecthomas/chroma#993 - chore(deps): update all non-major dependencies by [@​renovate](https://github.com/renovate) in alecthomas/chroma#991 - add beef syntax and tests by [@​Booklordofthedings](https://github.com/Booklordofthedings) in alecthomas/chroma#995 - Update GitHub light color palette by [@​konradreiche](https://github.com/konradreiche) in alecthomas/chroma#998 - chore(deps): update module github.com/alecthomas/kong to v1 by [@​renovate](https://github.com/renovate) in alecthomas/chroma#999 - Update the Materialize lexer by [@​arusahni](https://github.com/arusahni) in alecthomas/chroma#1001 - Update TypeScript lexer to allow nested generics by [@​fredrare](https://github.com/fredrare) in alecthomas/chroma#1002 - Pager friendly terminal formatting by [@​walles](https://github.com/walles) in alecthomas/chroma#1006 - chore(deps): update all non-major dependencies by [@​renovate](https://github.com/renovate) in alecthomas/chroma#997 - Add Typst Lexer by [@​oliverpool](https://github.com/oliverpool) in alecthomas/chroma#1007 - Add Jsonnet Lexer by [@​jolheiser](https://github.com/jolheiser) in alecthomas/chroma#1011 - fix: add underscore parsing in numbers for haskell by [@​Gusted](https://github.com/Gusted) in alecthomas/chroma#1020 - Add CSV lexer by [@​walles](https://github.com/walles) in alecthomas/chroma#1005 - fix(typescript): highlight string literal type parameters by [@​SKalt](https://github.com/SKalt) in alecthomas/chroma#1010 - add any as a builtin type for go by [@​quartercastle](https://github.com/quartercastle) in alecthomas/chroma#1021 - chore(deps): update all non-major dependencies by [@​renovate](https://github.com/renovate) in alecthomas/chroma#1013 - Remove whitespace tokenizing rule in markdown lexer by [@​cloudchamb3r](https://github.com/cloudchamb3r) in alecthomas/chroma#1008 - feat(JSON): support `.jsonc` extension by [@​CarterLi](https://github.com/CarterLi) in alecthomas/chroma#1022 - Add Eclipse ATL language (https://eclipse.dev/atl/) by [@​dwagelaar](https://github.com/dwagelaar) in alecthomas/chroma#1024 - Import NSIS Lexer from Pygments by [@​JakobDev](https://github.com/JakobDev) in alecthomas/chroma#1026 - chore(deps): update module github.com/alecthomas/kong to v1.5.1 by [@​renovate](https://github.com/renovate) in alecthomas/chroma#1025 - fix(nix): nix lexor missing '=' operator by [@​FlyingStitchman](https://github.com/FlyingStitchman) in alecthomas/chroma#1031 - Add WebVTT lexer ([#​707](alecthomas/chroma#707)) by [@​dschuessler](https://github.com/dschuessler) in alecthomas/chroma#1032 #### New Contributors - [@​comfysage](https://github.com/comfysage) made their first contribution in alecthomas/chroma#970 - [@​avih7531](https://github.com/avih7531) made their first contribution in alecthomas/chroma#977 - [@​wackbyte](https://github.com/wackbyte) made their first contribution in alecthomas/chroma#979 - [@​oliverpool](https://github.com/oliverpool) made their first contribution in alecthomas/chroma#982 - [@​DevDimov](https://github.com/DevDimov) made their first contribution in alecthomas/chroma#983 - [@​msorc](https://github.com/msorc) made their first contribution in alecthomas/chroma#984 - [@​Nicd](https://github.com/Nicd) made their first contribution in alecthomas/chroma#990 - [@​Booklordofthedings](https://github.com/Booklordofthedings) made their first contribution in alecthomas/chroma#995 - [@​konradreiche](https://github.com/konradreiche) made their first contribution in alecthomas/chroma#998 - [@​fredrare](https://github.com/fredrare) made their first contribution in alecthomas/chroma#1002 - [@​SKalt](https://github.com/SKalt) made their first contribution in alecthomas/chroma#1010 - [@​quartercastle](https://github.com/quartercastle) made their first contribution in alecthomas/chroma#1021 - [@​cloudchamb3r](https://github.com/cloudchamb3r) made their first contribution in alecthomas/chroma#1008 - [@​CarterLi](https://github.com/CarterLi) made their first contribution in alecthomas/chroma#1022 - [@​dwagelaar](https://github.com/dwagelaar) made their first contribution in alecthomas/chroma#1024 - [@​FlyingStitchman](https://github.com/FlyingStitchman) made their first contribution in alecthomas/chroma#1031 - [@​dschuessler](https://github.com/dschuessler) made their first contribution in alecthomas/chroma#1032 **Full Changelog**: alecthomas/chroma@v2.14.0...v2.15.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "* 0-3 * * *" (UTC), Automerge - "* 0-3 * * *" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS45MC4wIiwidXBkYXRlZEluVmVyIjoiMzkuOTAuMCIsInRhcmdldEJyYW5jaCI6ImZvcmdlam8iLCJsYWJlbHMiOlsiZGVwZW5kZW5jeS11cGdyYWRlIiwidGVzdC9ub3QtbmVlZGVkIl19--> Co-authored-by: Gusted <[email protected]> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6477 Reviewed-by: Gusted <[email protected]> Co-authored-by: Renovate Bot <[email protected]> Co-committed-by: Renovate Bot <[email protected]>
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.
This resolves a particular issue with parsing YAML multiline, for example:
The regex used would capture the amount of indentation in the third capture group and then use that as a kind of "status" to know which lines are part of the indented multiline. However, because its a captured group it has to be assigned a token which was
TextWhitespace. This meant that the indentation was outputted after the multiline, technically it should be seen as an non-captured group, but then its no longer to refer to it in the regex. Therefore I've gone with the solution to add a new token, Ignore, which will not be emitted as a token in the iterator, which can safely be used to make use of capture groups but not have them show up in the output.Before
After