Merge pull request #272 from msfjarvis/bug/block-comments-highlighting

Fix block comments highlighting
This commit is contained in:
Anthony Scopatz 2020-01-25 16:22:24 -05:00 committed by GitHub
commit e2ebb2be34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 15 additions and 15 deletions

View File

@ -20,7 +20,7 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
color magenta "\\([btnfr]|'|\"|\\)" color magenta "\\([btnfr]|'|\"|\\)"
color magenta "\\u[A-Fa-f0-9]{4}" color magenta "\\u[A-Fa-f0-9]{4}"
color brightblack "(^|[[:space:]])//.*" color brightblack "(^|[[:space:]])//.*"
color brightblack start="/\*" end="\*/" color brightblack start="^\s*/\*" end="\*/"
color brightwhite,cyan "TODO:?" color brightwhite,cyan "TODO:?"
color ,green "[[:space:]]+$" color ,green "[[:space:]]+$"
color ,red " + +| + +" color ,red " + +| + +"

View File

@ -5,4 +5,4 @@ color magenta "\<(arrowhead|arrowsize|arrowtail|bgcolor|center|color|constraint|
color red "=|->|--" color red "=|->|--"
color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
color brightblack "(^|[[:space:]])//.*" color brightblack "(^|[[:space:]])//.*"
color brightblack start="/\*" end="\*/" color brightblack start="^\s*/\*" end="\*/"

View File

@ -26,7 +26,7 @@ color yellow ""(\\.|[^"])*""
# Comments # Comments
color brightblack "(^|[[:space:]])//.*" color brightblack "(^|[[:space:]])//.*"
color brightblack start="/\*" end="\*/" color brightblack start="^\s*/\*" end="\*/"
color brightblack start="\(\*" end="\*\)" color brightblack start="\(\*" end="\*\)"
color brightwhite,cyan "TODO:?" color brightwhite,cyan "TODO:?"

View File

@ -44,7 +44,7 @@ color blue start=""""" end="""""
color yellow "(^|[[:space:]])//.*" color yellow "(^|[[:space:]])//.*"
# Block comment. # Block comment.
color yellow start="/\*" end="\*/" color yellow start="^\s*/\*" end="\*/"
# Trailing whitespace. # Trailing whitespace.
color ,green "[[:space:]]+$" color ,green "[[:space:]]+$"

View File

@ -9,7 +9,7 @@ color brightcyan "\<(true|false)\>"
color red "[-+/*=<>?:!~%&|^]" color red "[-+/*=<>?:!~%&|^]"
color blue "\<([0-9]+|0x[0-9a-fA-F]*)\>" color blue "\<([0-9]+|0x[0-9a-fA-F]*)\>"
color brightblack "(^|[[:space:]])//.*" color brightblack "(^|[[:space:]])//.*"
color brightblack start="/\*" end="\*/" color brightblack start="^\s*/\*" end="\*/"
color brightwhite,cyan "TODO:?" color brightwhite,cyan "TODO:?"
color ,green "[[:space:]]+$" color ,green "[[:space:]]+$"
color ,red " + +| + +" color ,red " + +| + +"

View File

@ -17,7 +17,7 @@ color magenta "\\[abfnrtv'\"\\]"
color magenta "\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})" color magenta "\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
color yellow "`[^`]*`" color yellow "`[^`]*`"
color brightblack "(^|[[:space:]])//.*" color brightblack "(^|[[:space:]])//.*"
color brightblack start="/\*" end="\*/" color brightblack start="^\s*/\*" end="\*/"
color brightwhite,cyan "TODO:?" color brightwhite,cyan "TODO:?"
color ,green "[[:space:]]+$" color ,green "[[:space:]]+$"
color ,red " + +| + +" color ,red " + +| + +"

View File

@ -11,7 +11,7 @@ color red ""[^"]*""
color yellow "\<(true|false|null)\>" color yellow "\<(true|false|null)\>"
icolor yellow "\b(([1-9][0-9]+)|0+)\.[0-9]+\b" "\b[1-9][0-9]*\b" "\b0[0-7]*\b" "\b0x[1-9a-f][0-9a-f]*\b" icolor yellow "\b(([1-9][0-9]+)|0+)\.[0-9]+\b" "\b[1-9][0-9]*\b" "\b0[0-7]*\b" "\b0x[1-9a-f][0-9a-f]*\b"
color blue "^\s*//.*" color blue "^\s*//.*"
color blue start="/\*" end="\*/" color blue start="^\s*/\*" end="\*/"
color brightblue start="/\*\*" end="\*/" color brightblue start="/\*\*" end="\*/"
# Highlighting for javadoc stuff # Highlighting for javadoc stuff

View File

@ -49,5 +49,5 @@ color ,green "[[:space:]]+$"
color red "\\[0-7][0-7]?[0-7]?|\\x[0-9a-fA-F]+|\\[bfnrt'"\?\\]" color red "\\[0-7][0-7]?[0-7]?|\\x[0-9a-fA-F]+|\\[bfnrt'"\?\\]"
## Comments ## Comments
color brightblue start="/\*" end="\*/" color brightblue start="^\s*/\*" end="\*/"
color brightblue "^\s*//.*$" color brightblue "^\s*//.*$"

View File

@ -20,7 +20,7 @@ color brightblue "<[^= ]*>" ""(\\.|[^"])*""
## Comment highlighting ## Comment highlighting
color red "^\s*//.*" color red "^\s*//.*"
color red start="/\*" end="\*/" color red start="^\s*/\*" end="\*/"
## Trailing whitespace ## Trailing whitespace
color ,green "[[:space:]]+$" color ,green "[[:space:]]+$"

View File

@ -14,4 +14,4 @@ color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
color brightmagenta "\<(union|group|subgroup)\>" color brightmagenta "\<(union|group|subgroup)\>"
## Comment highlighting ## Comment highlighting
color brightblue "^\s*//.*" color brightblue "^\s*//.*"
color brightblue start="/\*" end="\*/" color brightblue start="^\s*/\*" end="\*/"

View File

@ -26,7 +26,7 @@ color green start="'" end="'"
# Comments # Comments
color white "(^|[[:blank:]])%.*$" color white "(^|[[:blank:]])%.*$"
color white start="/\*" end="\*/" color white start="^\s*/\*" end="\*/"
# Reminders # Reminders
color black,yellow "(BUG|DEBUG|FIXME|IDEA|NOTE|REVIEW|TEMP|TODO|WARNING|XXX)" color black,yellow "(BUG|DEBUG|FIXME|IDEA|NOTE|REVIEW|TEMP|TODO|WARNING|XXX)"

View File

@ -27,7 +27,7 @@ color cyan "('[^']*')|(\"[^\"]*\")"
icolor green "\(" "\)" "\," "\=" icolor green "\(" "\)" "\," "\="
# Comments, dashes and spaces # Comments, dashes and spaces
color blue "\s+(//.*)" color blue "\s+(//.*)"
color blue start="/\*" end="\*/" color blue start="^\s*/\*" end="\*/"
color white "^\s*(\-)" color white "^\s*(\-)"
color ,green "[[:space:]]+$" color ,green "[[:space:]]+$"
# Unbuffered comments # Unbuffered comments

View File

@ -30,7 +30,7 @@ color green start="r#+\"" end="\"#+"
# Comments # Comments
color blue "^\s*//.*" color blue "^\s*//.*"
color blue start="/\*" end="\*/" color blue start="^\s*/\*" end="\*/"
# Attributes # Attributes
color magenta start="#!\[" end="\]" color magenta start="#!\[" end="\]"

View File

@ -7,6 +7,6 @@ color cyan "\<(def|object|case|trait|lazy|implicit|abstract|class|extends|final|
color red ""[^"]*"" color red ""[^"]*""
color yellow "\<(true|false|null)\>" color yellow "\<(true|false|null)\>"
color blue "^\s*//.*" color blue "^\s*//.*"
color blue start="/\*" end="\*/" color blue start="^\s*/\*" end="\*/"
color brightblue start="/\*\*" end="\*/" color brightblue start="/\*\*" end="\*/"
color ,green "[[:space:]]+$" color ,green "[[:space:]]+$"

View File

@ -12,7 +12,7 @@ color blue "\<([0-9]+)\>"
color red "[-+/*=<>?:!~%&|]" "->" color red "[-+/*=<>?:!~%&|]" "->"
color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'" color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
color brightblack "(^|[[:space:]])//.*" color brightblack "(^|[[:space:]])//.*"
color brightblack start="/\*" end="\*/" color brightblack start="^\s*/\*" end="\*/"
color brightwhite,cyan "TODO:?" color brightwhite,cyan "TODO:?"
color ,green "[[:space:]]+$" color ,green "[[:space:]]+$"
color ,red " + +| + +" color ,red " + +| + +"