Fix solidity lexer's handling of inline assembly#1040
Merged
alecthomas merged 5 commits intoalecthomas:masterfrom Jan 14, 2025
Merged
Fix solidity lexer's handling of inline assembly#1040alecthomas merged 5 commits intoalecthomas:masterfrom
alecthomas merged 5 commits intoalecthomas:masterfrom
Conversation
Syntax highlighting in solidity breaks to due the assembly rule improperly pushing the state (it pushes once for the keyword, then again for the '{')
fixes assembly to not error out when '.' is used
alecthomas
reviewed
Jan 14, 2025
Owner
alecthomas
left a comment
There was a problem hiding this comment.
Mind adding a text for this change?
Contributor
Author
|
Sorry, I've now edited the test to include inline assembly. |
Owner
|
Test is failing slightly. |
Addes a newline to the end
Contributor
Author
|
That's really strange, cause the test worked locally. It seems there is an added newline at the end despite there not being one in the file? In any case, I went ahead and added it, it should work now hopefully. Sorry for the inconvenience! |
Owner
|
Thanks! |
DennisRasey
pushed a commit
to DennisRasey/forgejo
that referenced
this pull request
Apr 4, 2025
…7459) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/alecthomas/chroma/v2](https://github.com/alecthomas/chroma) | require | minor | `v2.15.0` -> `v2.16.0` | --- ### Release Notes <details> <summary>alecthomas/chroma (github.com/alecthomas/chroma/v2)</summary> ### [`v2.16.0`](https://github.com/alecthomas/chroma/releases/tag/v2.16.0) [Compare Source](alecthomas/chroma@v2.15.0...v2.16.0) #### Changelog - [`ad6f149`](alecthomas/chroma@ad6f149) chore: clean up Makefile - [`9909f65`](alecthomas/chroma@9909f65) fix: switch to jsdelivr as unpkg was throwing CORS errors - [`34bf362`](alecthomas/chroma@34bf362) chore(deps): update all non-major dependencies ([#​1066](alecthomas/chroma#1066)) - [`88084b6`](alecthomas/chroma@88084b6) fix: Dot in a string breaks the highlighting in Terraform. Fixes [#​988](alecthomas/chroma#988) ([#​1065](alecthomas/chroma#1065)) - [`62197e9`](alecthomas/chroma@62197e9) Add lexers.Aliases() method to display only lexers' aliases ([#​1057](alecthomas/chroma#1057)) - [`7feb358`](alecthomas/chroma@7feb358) chore(deps): update dependency svu to v3 ([#​1053](alecthomas/chroma#1053)) - [`30e0bc6`](alecthomas/chroma@30e0bc6) chore(deps): update all non-major dependencies ([#​1061](alecthomas/chroma#1061)) - [`e0c7747`](alecthomas/chroma@e0c7747) Fix IP address as name detection in nginx conf ([#​1060](alecthomas/chroma#1060)) - [`0bf0e9f`](alecthomas/chroma@0bf0e9f) Add luau file extension and alias to lua lexer ([#​1056](alecthomas/chroma#1056)) - [`0e0e282`](alecthomas/chroma@0e0e282) chore(deps): update all non-major dependencies ([#​1049](alecthomas/chroma#1049)) - [`4b0882a`](alecthomas/chroma@4b0882a) add Janet lexer ([#​1045](alecthomas/chroma#1045)) - [`81fecd5`](alecthomas/chroma@81fecd5) chore(deps): update all non-major dependencies ([#​1041](alecthomas/chroma#1041)) - [`dc982d2`](alecthomas/chroma@dc982d2) Add Mojo lexer ([#​1044](alecthomas/chroma#1044)) - [`79621af`](alecthomas/chroma@79621af) Fix solidity lexer's handling of inline assembly ([#​1040](alecthomas/chroma#1040)) - [`9da461e`](alecthomas/chroma@9da461e) chore(deps): update module github.com/mattn/go-colorable to v0.1.14 ([#​1039](alecthomas/chroma#1039)) - [`f0d460e`](alecthomas/chroma@f0d460e) Update Odin lexer for new build tag feature ([#​1038](alecthomas/chroma#1038)) - [`0bd7c68`](alecthomas/chroma@0bd7c68) chore: bump go.mod to Go 1.22 + add Iterator.Stdlib() - [`d829579`](alecthomas/chroma@d829579) fix(ocaml): support multistring ([#​1035](alecthomas/chroma#1035)) - [`e79c813`](alecthomas/chroma@e79c813) chore(deps): update all non-major dependencies ([#​1029](alecthomas/chroma#1029)) </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:eyJjcmVhdGVkSW5WZXIiOiIzOS4yMjIuMSIsInVwZGF0ZWRJblZlciI6IjM5LjIyMi4xIiwidGFyZ2V0QnJhbmNoIjoiZm9yZ2VqbyIsImxhYmVscyI6WyJkZXBlbmRlbmN5LXVwZ3JhZGUiLCJ0ZXN0L25vdC1uZWVkZWQiXX0=--> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7459 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org> Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
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
2 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.
Syntax highlighting in solidity breaks to due the assembly rule improperly pushing the state (it pushes once for the keyword, then again for the '{') This fix merges the opening '{' into the assembly keyword pattern.
Link to chroma playground
