diff --git a/ChangeLog b/ChangeLog index 4b7aa728..5788c4c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-09-08 Doug Kearns + + * syntax/ruby.vim: add support for the new %s() symbol literal. + 2003-09-03 Doug Kearns * compiler/ruby.vim: update the maintainer's email address. diff --git a/syntax/ruby.vim b/syntax/ruby.vim index 58953de1..17dfd4f1 100644 --- a/syntax/ruby.vim +++ b/syntax/ruby.vim @@ -88,33 +88,33 @@ syn region rubyString matchgroup=rubyStringDelimit start="%r<" end=">[iomx]*" syn region rubyString matchgroup=rubyStringDelimit start="%r\[" end="\][iomx]*" skip="\\\\\|\\\]" contains=rubyExprSubst fold syn region rubyString matchgroup=rubyStringDelimit start="%r(" end=")[iomx]*" skip="\\\\\|\\)" contains=rubyExprSubst fold -" Generalized Single Quoted String and Array of Strings -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]!" end="!" skip="\\\\\|\\!" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]\"" end="\"" skip="\\\\\|\\\"" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]#" end="#" skip="\\\\\|\\#" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]\$" end="\$" skip="\\\\\|\\\$" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]%" end="%" skip="\\\\\|\\%" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]&" end="&" skip="\\\\\|\\&" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]'" end="'" skip="\\\\\|\\'" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]\*" end="\*" skip="\\\\\|\\\*" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]+" end="+" skip="\\\\\|\\+" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]-" end="-" skip="\\\\\|\\-" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]\." end="\." skip="\\\\\|\\\." fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]/" end="/" skip="\\\\\|\\/" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]:" end=":" skip="\\\\\|\\:" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq];" end=";" skip="\\\\\|\\;" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]=" end="=" skip="\\\\\|\\=" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]?" end="?" skip="\\\\\|\\?" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]@" end="@" skip="\\\\\|\\@" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]\\" end="\\" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]\^" end="\^" skip="\\\\\|\\\^" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]`" end="`" skip="\\\\\|\\`" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]|" end="|" skip="\\\\\|\\|" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]\~" end="\~" skip="\\\\\|\\\~" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]{" end="}" skip="\\\\\|\\}" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]<" end=">" skip="\\\\\|\\>" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq]\[" end="\]" skip="\\\\\|\\\]" fold -syn region rubyString matchgroup=rubyStringDelimit start="%[wq](" end=")" skip="\\\\\|\\)" fold +" Generalized Single Quoted String, Symbol and Array of Strings +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]!" end="!" skip="\\\\\|\\!" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]\"" end="\"" skip="\\\\\|\\\"" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]#" end="#" skip="\\\\\|\\#" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]\$" end="\$" skip="\\\\\|\\\$" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]%" end="%" skip="\\\\\|\\%" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]&" end="&" skip="\\\\\|\\&" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]'" end="'" skip="\\\\\|\\'" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]\*" end="\*" skip="\\\\\|\\\*" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]+" end="+" skip="\\\\\|\\+" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]-" end="-" skip="\\\\\|\\-" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]\." end="\." skip="\\\\\|\\\." fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]/" end="/" skip="\\\\\|\\/" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]:" end=":" skip="\\\\\|\\:" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw];" end=";" skip="\\\\\|\\;" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]=" end="=" skip="\\\\\|\\=" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]?" end="?" skip="\\\\\|\\?" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]@" end="@" skip="\\\\\|\\@" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]\\" end="\\" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]\^" end="\^" skip="\\\\\|\\\^" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]`" end="`" skip="\\\\\|\\`" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]|" end="|" skip="\\\\\|\\|" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]\~" end="\~" skip="\\\\\|\\\~" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]{" end="}" skip="\\\\\|\\}" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]<" end=">" skip="\\\\\|\\>" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw]\[" end="\]" skip="\\\\\|\\\]" fold +syn region rubyString matchgroup=rubyStringDelimit start="%[qsw](" end=")" skip="\\\\\|\\)" fold " Generalized Double Quoted String and Array of Strings and Shell Command Output syn region rubyString matchgroup=rubyStringDelimit start="%[QWx]\=!" end="!" skip="\\\\\|\\!" contains=rubyExprSubst fold