tweaks: swap two parts of specific regexes, for consistency with others

This order makes more sense to me: first the part that allows
almost everything, and then the special case.
master
Benno Schulenberg 2021-10-27 09:45:42 +02:00
parent 7bd68365ec
commit 1cd92458e9
15 changed files with 17 additions and 17 deletions

View File

@ -12,7 +12,7 @@ color brightred "^[[:blank:]]*[.0-9A-Za-z_]*:"
color brightcyan "^[[:blank:]]*#[[:blank:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)" color brightcyan "^[[:blank:]]*#[[:blank:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)"
# Strings. # Strings.
color brightyellow "<[^= ]*>|"(\\.|[^"\])*"" color brightyellow "<[^= ]*>|"([^"\]|\\.)*""
# Comments. # Comments.
color brightblue "//.*" color brightblue "//.*"

View File

@ -29,7 +29,7 @@ color magenta "\<(and|compl|lshift|or|rshift|xor)\>"
color magenta "\<(bindtextdomain|dcgettext|dcngettext)\>" color magenta "\<(bindtextdomain|dcgettext|dcngettext)\>"
# Strings. # Strings.
color brightyellow ""(\\.|[^"\])*"" color brightyellow ""([^"\]|\\.)*""
# Comments. # Comments.
color brightblue "(^|[[:blank:]])#.*" color brightblue "(^|[[:blank:]])#.*"

View File

@ -28,6 +28,6 @@ color brightred "\<(t|nil)\>"
color blue ":(\w|[?-])+" color blue ":(\w|[?-])+"
# Strings # Strings
color yellow start="^[[:blank:]]+"" end="[^\]"" color yellow start="^[[:blank:]]+"" end="[^\]""
color yellow ""(\\.|[^"\])*"" color yellow ""([^"\]|\\.)*""
# Comments # Comments
color cyan "(^|[[:blank:]]);.*" color cyan "(^|[[:blank:]]);.*"

View File

@ -34,7 +34,7 @@ icolor yellow "\<(.or.|repeat|select case|then|where|while)\>"
icolor magenta "\<(continue|cycle|exit|go?to|result|return)\>" icolor magenta "\<(continue|cycle|exit|go?to|result|return)\>"
# Strings. # Strings.
color yellow ""(\\.|[^"\])*"" color yellow ""([^"\]|\\.)*""
# Comments. # Comments.
color blue "!.*" color blue "!.*"

View File

@ -41,7 +41,7 @@ color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|p
## Comments (doesn't work that well): ## Comments (doesn't work that well):
color yellow "(^|[[:space:]])#.*" color yellow "(^|[[:space:]])#.*"
## Strings (doesn't work that well): ## Strings (doesn't work that well):
color brightyellow ""(\\.|[^"\])*"|'(\\.|[^'\])*'" color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'"
## Trailing space is bad! ## Trailing space is bad!
color ,green "[[:space:]]+$" color ,green "[[:space:]]+$"
## Mixed whitespace is also bad. ## Mixed whitespace is also bad.

View File

@ -34,8 +34,8 @@ color red "\<[0-9]+i\>"
# Strings and characters; slightly fuzzy. # Strings and characters; slightly fuzzy.
color red "\<(true|false|nil|iota|_)\>" color red "\<(true|false|nil|iota|_)\>"
color red ""(\\.|[^"\])*"|'(\\.|[^'\])+'" color red ""([^"\]|\\.)*"|'([^'\]|\\.)+'"
color red start=""(\\.|[^"\])*\\[[:blank:]]*$" end="^(\\.|[^"\])*"" color red start=""([^"\]|\\.)*\\[[:blank:]]*$" end="^([^"\]|\\.)*""
# Comments. # Comments.
color brightblue "//.*" color brightblue "//.*"

View File

@ -19,6 +19,6 @@ color brightred "(#t|#f)\>"
color blue "#?:(\w|[?-])+" color blue "#?:(\w|[?-])+"
# Strings # Strings
color yellow start="^[[:blank:]]+"" end="[^\]"" color yellow start="^[[:blank:]]+"" end="[^\]""
color yellow ""(\\.|[^"\])*"" color yellow ""([^"\]|\\.)*""
# Comments # Comments
color cyan "(^|[[:blank:]]);.*" color cyan "(^|[[:blank:]]);.*"

View File

@ -25,7 +25,7 @@ color red "\<(rows(pan)?|rules|scheme|scope|scrolling|selected|shape|size|span|s
color red "\<(tabindex|target|text|title|type|usemap|valign|value(type)?|vlink|vspace|width|xmlns|xml:space)=" color red "\<(tabindex|target|text|title|type|usemap|valign|value(type)?|vlink|vspace|width|xmlns|xml:space)="
# Strings: # Strings:
color green ""(\\.|[^"\])*"" color green ""([^"\]|\\.)*""
# Comments: # Comments:
color yellow start="<!--" end="-->" color yellow start="<!--" end="-->"

View File

@ -17,7 +17,7 @@ color cyan "\<([0-9]+|0x[0-9A-Fa-f]+)\>"
color cyan "\<(true|false|null|undefined)\>" color cyan "\<(true|false|null|undefined)\>"
# Strings. # Strings.
color brightmagenta ""(\\.|[^"\])*"|'(\\.|[^'\])*'|`(\\.|[^`\])*`" color brightmagenta ""([^"\]|\\.)*"|'([^'\]|\\.)*'|`([^`\]|\\.)*`"
# Comments. # Comments.
color brightblue "(^|[[:blank:]])//.*" color brightblue "(^|[[:blank:]])//.*"
color brightblue start="/\*" end="\*/" color brightblue start="/\*" end="\*/"

View File

@ -54,7 +54,7 @@ color brightmagenta "\(|\)|\[|\]|\{|\}"
color brightcyan "^#!.*" color brightcyan "^#!.*"
# Strings # Strings
color red ""(\\.|[^"\])*"|'(\\.|[^'\])*'" color red ""([^"\]|\\.)*"|'([^'\]|\\.)*'"
# Simple comments and multiline comments # Simple comments and multiline comments
color green "--.*" color green "--.*"

View File

@ -26,7 +26,7 @@ color cyan "(^|[[:blank:]])#.*"
color ,green "[[:space:]]+$" color ,green "[[:space:]]+$"
# Strings and others # Strings and others
color yellow ""(\\.|[^"\])*"|'(\\.|[^'\])*'" color yellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'"
color green "[][{}():;|`$<>!=&\]" color green "[][{}():;|`$<>!=&\]"
# Basic variable names # Basic variable names

View File

@ -25,8 +25,8 @@ color white "\[[^][:blank:]]*\]"
# Strings. # Strings.
color brightblack "'([^'\]|(\\["'abfnrtv\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'" color brightblack "'([^'\]|(\\["'abfnrtv\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
color brightblack "<[^= ]*>|"(\\.|[^"\])*"" color brightblack "<[^= ]*>|"([^"\]|\\.)*""
color brightblue "@"(\\.|[^"\])*"" color brightblue "@"([^"\]|\\.)*""
# Preprocessor commands. # Preprocessor commands.
color brightblue "^[[:blank:]]*#[[:blank:]]*(define|include|import|(un|ifn?)def|endif|el(if|se)|if|warning|error)" color brightblue "^[[:blank:]]*#[[:blank:]]*(define|include|import|(un|ifn?)def|endif|el(if|se)|if|warning|error)"

View File

@ -25,7 +25,7 @@ color brightcyan "\<(and|or|xor)\>"
color magenta "\<(break|continue|goto|return)\>" color magenta "\<(break|continue|goto|return)\>"
# Strings. # Strings.
color brightyellow ""(\\.|[^"\])*"|'(\\.|[^'\])*'" color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'"
# Comments. # Comments.
color brightblue "(^|[[:blank:]]+)//.*" color brightblue "(^|[[:blank:]]+)//.*"

View File

@ -33,7 +33,7 @@ color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:bla
color cyan "(^|[[:blank:]])#.*" color cyan "(^|[[:blank:]])#.*"
# Strings. # Strings.
color brightyellow ""(\\.|[^"\])*"|'(\\.|[^'\])*'" color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'"
# Trailing whitespace. # Trailing whitespace.
color ,green "[[:space:]]+$" color ,green "[[:space:]]+$"

View File

@ -17,7 +17,7 @@ color green "\<(alarm|auto_load_pkg|bsearch|catclose|catgets|catopen|ccollate|cc
# Syntax: # Syntax:
color brightblue "\<proc[[:blank:]]|\{|\}" color brightblue "\<proc[[:blank:]]|\{|\}"
color green "\(|\)|\;|`|\\|\$|<|>|!|=|&|\|" color green "\(|\)|\;|`|\\|\$|<|>|!|=|&|\|"
color brightyellow ""(\\.|[^"\])*"|'(\\.|[^'\])*'" color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'"
color brightred "\$\{?[0-9A-Za-z_!@#$*?-]+\}?" color brightred "\$\{?[0-9A-Za-z_!@#$*?-]+\}?"
# Trailing whitespace: # Trailing whitespace: