Changeset 24128

Timestamp:

12/01/08 04:59:13 (5 weeks ago)

Author:

hinrik

Message:

[util/perl6.vim] highlight escaped delimiters in certain single-quoted strings

Files:

• util/perl6.vim (modified) (11 diffs)

util/perl6.vim

@@ -20 +20 @@
 "   * Add more support for folding
 "   * Add more syntax syncing hooks
+"   * Highlight various things in interpolated strings
 
 " For version 5.x: Clear all syntax items
@@ -120 +121 @@
 syn match p6Variable   display "[$@%][!.*^?]\?[[:graph:]_¢]\w*"
 
-" { ... } construct
-syn region p6InterpExpression
-    \ matchgroup=p6Variable
-    \ start="{"
-    \ skip="\\}"
-    \ end="}"
-    \ contained
-    \ contains=TOP
-
-syn cluster p6Interp
-    \ add=p6Variable
-    \ add=p6InterpExpression
-    \ add=p6InterpClosure
-
 " FIXME: This ugly hack will show up later on. Once again, don't try to fix it.
 syn region p6ParenExpression
@@ -157 +144 @@
     \ contains=TOP
 
-" Double-quoted, qq, qw, qx, `` strings
+" { ... } closure in interpolated strings
+syn region p6InterpClosure
+    \ matchgroup=p6StringSpecial
+    \ start="{"
+    \ end="}"
+    \ contained
+    \ contains=TOP
+
+syn cluster p6Interp
+    \ add=p6Variable
+    \ add=p6InterpClosure
+
+" Double-quoted strings
 syn region p6InterpString
     \ matchgroup=p6Quote
@@ -175 +174 @@
     \ contains=@p6Interp
 
-" Punctuation-delimited strings
+" Punctuation-delimited double-quoted strings
 syn region p6InterpString
     \ matchgroup=p6Quote
@@ -207 +206 @@
     \ contains=@p6Interp
 
-" Single-quoted, q, '' strings
+syn match p6EscapedQuote display "\\'" contained
+syn match p6EscapedArrow display "\\>" contained
+
+" Single-quoted strings
 syn region p6LiteralString
     \ matchgroup=p6Quote
@@ -213 +215 @@
     \ skip="\\'"
     \ end="'"
+    \ contains=p6EscapedQuote
 syn region p6LiteralString
     \ matchgroup=p6Quote
@@ -218 +221 @@
     \ skip="\\>"
     \ end=">\@<!>"
+    \ contains=p6EscapedRightArrow
 " special case for $<etc>
 syn region p6LiteralString
@@ -224 +228 @@
     \ end=">\@<!>"
 
-" Punctuation-delimited strings
+" Punctuation-delimited single-quoted strings
 syn region p6LiteralString
     \ matchgroup=p6Quote
@@ -466 +470 @@
     \ contains=TOP
 
-" This is in operator, not a regex
+" This is an operator, not a regex
 syn match p6Operator "//"
 
@@ -634 +638 @@
     HiLink p6SubBracket      p6String
     HiLink p6TransNonBracket p6String
+    HiLink p6EscapedQuote    p6StringSpecial
+    HiLink p6EscapedArrow    p6StringSpecial
+    HiLink p6CharClass       p6StringSpecial
+    HiLink p6RegexSpecial    p6StringSpecial
 
     HiLink p6Property        Tag
@@ -662 +670 @@
     HiLink p6RuleCall        Identifier
     HiLink p6Conditional     Conditional
-    HiLink p6CharClass       SpecialChar
-    HiLink p6RegexSpecial    SpecialChar
+    HiLink p6StringSpecial   SpecialChar
 
     HiLink p6PodPara         p6Pod