Index: info.plist =================================================================== --- info.plist (revision 6150) +++ info.plist (working copy) @@ -44,7 +44,6 @@ ordering 2F3DB2EF-6B9E-4E5F-87A8-3675680E5C0D - 02196551-D037-4254-8A2F-7A075A628EF1 DA0A5F4B-5F16-11D9-B9C3-000D93589AF6 DA0A6096-5F16-11D9-B9C3-000D93589AF6 CF2CA4F9-82A7-11D9-8753-000D9332809C @@ -68,9 +67,9 @@ 4FB403FC-F441-447F-9AAD-E2BE13AD49ED CEE866A5-FA4B-4C5D-A80C-137A620E825E 4F1B9AE2-F90C-4A1B-B7D0-FE59D236B12B - A08E9AF5-1D0A-48C9-A7A9-25C1E59B02A7 EDBFE125-6B1C-11D9-9189-000D93589AF6 C1EE8DC8-117D-4BC6-8E69-97D51EAA58D2 + 1B0FB64D-63C1-469E-B0B6-945477603B01 uuid 4679B572-6227-11D9-BFB1-000D93589AF6 Index: Syntaxes/Perl.plist =================================================================== --- Syntaxes/Perl.plist (revision 6150) +++ Syntaxes/Perl.plist (working copy) @@ -1023,11 +1023,128 @@ match - \b(m)\s*(?<!\\)([^A-Za-z0-9\s])(.*?)(?<!\\)(\\{2})*(\2) + \b(m)\s*(?<!\\)([^\[\{\(A-Za-z0-9\s])(.*?)(?<!\\)(\\{2})*(\2) name string.regexp.find-m.perl + begin + \b(m)\s*(?<!\\)\( + beginCaptures + + 0 + + name + punctuation.definition.string.begin.perl + + + end + \) + endCaptures + + 0 + + name + punctuation.definition.string.end.perl + + + name + string.regexp.find-m-paren.perl + patterns + + + include + #escaped_char + + + include + #nested_parens_interpolated + + + include + #variable + + + + + begin + \b(m)\s*(?<!\\)\{ + beginCaptures + + 0 + + name + punctuation.definition.string.begin.perl + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.string.end.perl + + + name + string.regexp.find-m-brace.perl + patterns + + + include + #escaped_char + + + include + #nested_braces_interpolated + + + include + #variable + + + + + begin + \b(m)\s*(?<!\\)\[ + beginCaptures + + 0 + + name + punctuation.definition.string.begin.perl + + + end + \] + endCaptures + + 0 + + name + punctuation.definition.string.end.perl + + + name + string.regexp.find-m-bracket.perl + patterns + + + include + #escaped_char + + + include + #nested_brackets_interpolated + + + include + #variable + + + + captures 1 @@ -1609,7 +1726,7 @@ begin - \bqq([^\(\{\[]) + \bqq([^\(\{\[\w\s]) beginCaptures 0 @@ -1644,6 +1761,41 @@ begin + \bq[wx]([^'\(\{\[\w\s]) + beginCaptures + + 0 + + name + punctuation.definition.string.begin.perl + + + end + \1 + endCaptures + + 0 + + name + punctuation.definition.string.end.perl + + + name + string.quoted.double.q.perl + patterns + + + include + #escaped_char + + + include + #variable + + + + + begin " beginCaptures @@ -1679,6 +1831,37 @@ begin + \bq([^\(\{\[\w\s]) + beginCaptures + + 0 + + name + punctuation.definition.string.begin.perl + + + end + \1 + endCaptures + + 0 + + name + punctuation.definition.string.end.perl + + + name + string.quoted.single.q.perl + patterns + + + include + #escaped_char + + + + + begin ' beginCaptures @@ -1747,7 +1930,7 @@ begin - \bq[qwx]*\( + \bq[qwx]\( beginCaptures 0 @@ -1776,13 +1959,17 @@ include - #nested_parens + #nested_parens_interpolated + + include + #variable + begin - \bq[qwx]*\{ + \bq[qwx]\{ beginCaptures 0 @@ -1811,13 +1998,17 @@ include - #nested_braces + #nested_braces_interpolated + + include + #variable + begin - \bq[qwx]*\[ + \bq[qwx]\[ beginCaptures 0 @@ -1846,6 +2037,115 @@ include + #nested_brackets_interpolated + + + include + #variable + + + + + begin + \bq\( + beginCaptures + + 0 + + name + punctuation.definition.string.begin.perl + + + end + \) + endCaptures + + 0 + + name + punctuation.definition.string.end.perl + + + name + string.quoted.single.q-paren.perl + patterns + + + include + #escaped_char + + + include + #nested_parens + + + + + begin + \bq\{ + beginCaptures + + 0 + + name + punctuation.definition.string.begin.perl + + + end + \} + endCaptures + + 0 + + name + punctuation.definition.string.end.perl + + + name + string.quoted.single.q-brace.perl + patterns + + + include + #escaped_char + + + include + #nested_braces + + + + + begin + \bq\[ + beginCaptures + + 0 + + name + punctuation.definition.string.begin.perl + + + end + \] + endCaptures + + 0 + + name + punctuation.definition.string.end.perl + + + name + string.quoted.single.q-bracket.perl + patterns + + + include + #escaped_char + + + include #nested_brackets @@ -2310,8 +2610,27 @@ name punctuation.definition.variable.perl + 2 + + name + punctuation.definition.variable.perl + match + (\$\{)(?:[a-zA-Zx7f-xff\$]|::)(?:[a-zA-Z0-9_x7f-xff\$]|::)*(\}) + name + variable.other.readwrite.global.perl + + + captures + + 1 + + name + punctuation.definition.variable.perl + + + match ([\$\@\%](#)?)[0-9_]\b name variable.other.readwrite.global.special.perl