Java Server Page (JSP).rb in ver-2010.08

- old
+ new

@@ -1,11 +1,11 @@
 # Encoding: UTF-8
 
 {fileTypes: ["jsp"],
  foldingStartMarker: /\/\*\*|\{\s*$/,
  foldingStopMarker: /\*\*\/|^\s*\}/,
- keyEquivalent: /^~J/,
+ keyEquivalent: "^~J",
  name: "Java Server Page (JSP)",
  patterns: 
   [{begin: /<%--/,
     captures: {0 => {name: "punctuation.definition.comment.jsp"}},
     end: "--%>",
@@ -34,31 +34,32 @@
           end: "'",
           endCaptures: {0 => {name: "punctuation.definition.string.end.jsp"}},
           name: "string.quoted.single.jsp",
           patterns: 
            [{match: /\\./, name: "constant.character.escape.jsp"}]}]}]},
-   {begin: /(<%[!=]?)|(<jsp:scriptlet>|<jsp:expression>|<jsp:declaration>)/,
+   {begin: 
+     /(?<_1><%[!=]?)|(?<_2><jsp:scriptlet>|<jsp:expression>|<jsp:declaration>)/,
     beginCaptures: 
      {1 => {name: "punctuation.section.embedded.jsp"},
       2 => {name: "meta.tag.block.jsp"}},
     end: "(?<=</jsp:scriptlet>|</jsp:expression>|</jsp:declaration>|%>)",
     patterns: 
      [{captures: 
         {1 => {name: "meta.tag.block.jsp"},
          2 => {name: "punctuation.section.embedded.jsp"}},
        match: 
-        /(<\/jsp:scriptlet>|<\/jsp:expression>|<\/jsp:declaration>)|(%>)/},
+        /(?<_1><\/jsp:scriptlet>|<\/jsp:expression>|<\/jsp:declaration>)|(?<_2>%>)/},
       {begin: 
         /(?<!\n)(?!<\/jsp:scriptlet>|<\/jsp:expression>|<\/jsp:declaration>|%>|\{|\})/,
        end: 
         "(?=</jsp:scriptlet>|</jsp:expression>|</jsp:declaration>|%>|\\{|\\})|\\n",
        name: "source.java.embedded.html",
        patterns: [{include: "source.java"}]},
       {begin: /{/,
        end: "}",
        patterns: 
         [{begin: 
-           /(<\/jsp:scriptlet>|<\/jsp:expression>|<\/jsp:declaration>)|(%>)/,
+           /(?<_1><\/jsp:scriptlet>|<\/jsp:expression>|<\/jsp:declaration>)|(?<_2>%>)/,
           captures: 
            {1 => {name: "meta.tag.block.jsp"},
             2 => {name: "punctuation.section.embedded.jsp"}},
           end: 
            "(<jsp:scriptlet>|<jsp:expression>|<jsp:declaration>)|(<%[!=]?)",