powershell: more robust handling of data structure literals #1595
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
@jneen Did you mean to refer to this in this PR? The commit in question relates to the Apex lexer, not the PowerShell one. |
pyrmont
reviewed
Oct 13, 2020
pyrmont
added
author-action
pyrmont
approved these changes
Nov 9, 2020
pyrmont
added a commit
that referenced
this pull request
Nov 10, 2020
While #1595 improved the lexing of more complex structures, the PowerShell lexer is limited in its support for nested data structures. This commit moves more of the syntax for representing values from the `:root` state to the `:expr` state so that this syntax can work when nested.
mattt
pushed a commit
to NSHipster/rouge
that referenced
this pull request
May 19, 2021
…e-ruby#1595) The PowerShell lexer includes a hash table state as a special case and is not tested on more complex tables (e.g. including comments and code). This commit factors out the hash table state into a more generic `:expr` state that can handle more complex structures. This commit also reduces the overall level of highlighting. This improves the visibility of the more important syntax.
mattt
pushed a commit
to NSHipster/rouge
that referenced
this pull request
May 19, 2021
…uby#1622) While rouge-ruby#1595 improved the lexing of more complex structures, the PowerShell lexer is limited in its support for nested data structures. This commit moves more of the syntax for representing values from the `:root` state to the `:expr` state so that this syntax can work when nested.
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.
fixes #1579
The problem was that the hash table state was a huge special case and was not tested on larger tables with comments and code in them at all. I factored out a more generic
:exprstate that should be able to handle most of these.I also reduced the overall level of highlighting - this is one of the lexers that suffered from over-highlighting, where too many things were emphasized with the colours. Pulling back a little allows the really important stuff to come through a bit better.