enh(php): Tidy up regex rules #25
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
- Use `\<` and `\>` to match word boundaries, instead of `[^a-z0-9_-]{1}`
- Fix the OR operator `||` being highlighted twice.
- Fix cannot include escapes in quoted strings.
- Fix redundant highlights to HEREDOC.
- Make inline comments regex more compact.
- Variables: Remove parts that does not seem relevant
davidhcefx
commented
Mar 7, 2024
| color brightblue "[a-zA-Z0-9_]+:" | ||
| # Variables | ||
| color green "\$[a-zA-Z_0-9$]*|[=!<>]" | ||
| color green "\->[a-zA-Z_0-9$]*|[=!<>]" |
There was a problem hiding this comment.
-
Notice here that I removed
$from[a-zA-Z_0-9$], because I'm not sure why do the author think that there can be$within the variable name? To my understandings, PHP doesn't allow variable like$nam$e. -
I also removed
[=!<>], because I not sure why can symbols like=,!,<and>resemble a variable in PHP? Perhaps the author want to highlight things like$array[0]?
davidhcefx
commented
Mar 7, 2024
| color red "(\"[^\"]*\")" | ||
| color red "\"([^"\]|\\.)*\"" | ||
| # Single quoted string | ||
| color red "'([^'\]|\\.)*'" |
There was a problem hiding this comment.
These modifications are based on https://git.savannah.gnu.org/cgit/nano.git/tree/syntax/php.nanorc
- The number constant regex also seems broken
davidhcefx
commented
Mar 7, 2024
| # Heredoc (typically ends with a semicolon). | ||
| color red start="<<<['\"]?[A-Z][A-Z0-9_]*['\"]?" end="^[A-Z][A-Z0-9_]*;" | ||
| color red start="<<<[\"]?[A-Z][A-Z0-9_]*[\"]?" end="^[A-Z][A-Z0-9_]*;" |
There was a problem hiding this comment.
I removed single quotes from Heredoc, because <<<'EOF' will been highlighted in line 64.
|
Love this! Thank you for all your work here! |
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.
Why
I once found rules like
Notice that it enclosed
(true|false)by a pair of[^a-z0-9_-]{1}, whose purpose is to detect word boundaries. That is,trueshould not be part of another word. However, detecting boundaries by this is not clever and make things more complicated. It should use\<and\>instead.How
\<and\>to match word boundaries, instead of[^a-z0-9_-]{1}||being highlighted twice.$num123in the screenshotBefore
After