ver 2009.10.14 → 2009.11.28

data/config/syntax/{JavaProperties.json → Java Properties.json }

@@ -15,13 +15,13 @@
       "name": "comment.line.number-sign.java-props"
     },
     {
-      "begin": "\/\\*",
+      "begin": "/\\*",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.java-props"
         }
       },
-      "end": "\\*\/",
+      "end": "\\*/",
       "name": "comment.block.java-props"
     },
     {

data/config/syntax/Java Server Page (JSP).json

@@ -0,0 +1,163 @@
+{
+  "fileTypes": [
+    "jsp"
+  ],
+  "foldingStartMarker": "/\\*\\*|\\{\\s*$",
+  "foldingStopMarker": "\\*\\*/|^\\s*\\}",
+  "keyEquivalent": "^~J",
+  "name": "Java Server Page (JSP)",
+  "patterns": [
+    {
+      "begin": "<%--",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.comment.jsp"
+        }
+      },
+      "end": "--%>",
+      "name": "comment.block.jsp"
+    },
+    {
+      "begin": "<%@",
+      "captures": {
+        "0": {
+          "name": "punctuation.section.directive.jsp"
+        }
+      },
+      "end": "%>",
+      "name": "meta.directive.jsp",
+      "patterns": [
+        {
+          "begin": "\\w+",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.other.directive.jsp"
+            }
+          },
+          "end": "(?=%>)",
+          "patterns": [
+            {
+              "match": "\\w+",
+              "name": "constant.other.directive.attribute.jsp"
+            },
+            {
+              "match": "=",
+              "name": "keyword.operator.assignment.jsp"
+            },
+            {
+              "begin": "\"",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.begin.jsp"
+                }
+              },
+              "end": "\"",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.end.jsp"
+                }
+              },
+              "name": "string.quoted.double.jsp",
+              "patterns": [
+                {
+                  "match": "\\\\.",
+                  "name": "constant.character.escape.jsp"
+                }
+              ]
+            },
+            {
+              "begin": "'",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.begin.jsp"
+                }
+              },
+              "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>)",
+      "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>)|(%>)"
+        },
+        {
+          "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>)|(%>)",
+              "captures": {
+                "1": {
+                  "name": "meta.tag.block.jsp"
+                },
+                "2": {
+                  "name": "punctuation.section.embedded.jsp"
+                }
+              },
+              "end": "(<jsp:scriptlet>|<jsp:expression>|<jsp:declaration>)|(<%[!=]?)",
+              "patterns": [
+                {
+                  "include": "text.html.jsp"
+                }
+              ]
+            },
+            {
+              "include": "source.java"
+            }
+          ]
+        },
+        {
+          "include": "source.java"
+        }
+      ]
+    },
+    {
+      "include": "text.html.basic"
+    }
+  ],
+  "scopeName": "text.html.jsp",
+  "uuid": "ACB58B55-9437-4AE6-AF42-854995CF51DF"
+}

data/config/syntax/Java.json

@@ -3,8 +3,8 @@
     "java",
     "bsh"
   ],
-  "foldingStartMarker": "(\\{\\s*(\/\/.*)?$|^\\s*\/\/ \\{\\{\\{)",
-  "foldingStopMarker": "^\\s*(\\}|\/\/ \\}\\}\\}$)",
+  "foldingStartMarker": "(\\{\\s*(//.*)?$|^\\s*// \\{\\{\\{)",
+  "foldingStopMarker": "^\\s*(\\}|// \\}\\}\\}$)",
   "keyEquivalent": "^~J",
   "name": "Java",
   "patterns": [
@@ -350,7 +350,7 @@
               "name": "punctuation.definition.comment.java"
             }
           },
-          "match": "\/\\*\\*\/",
+          "match": "/\\*\\*/",
           "name": "comment.block.empty.java"
         },
         {
@@ -364,13 +364,13 @@
     "comments-inline": {
       "patterns": [
         {
-          "begin": "\/\\*",
+          "begin": "/\\*",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.java"
             }
           },
-          "end": "\\*\/",
+          "end": "\\*/",
           "name": "comment.block.java"
         },
         {
@@ -382,7 +382,7 @@
               "name": "punctuation.definition.comment.java"
             }
           },
-          "match": "\\s*((\/\/).*$\\n?)"
+          "match": "\\s*((//).*$\\n?)"
         }
       ]
     },
@@ -472,7 +472,7 @@
           "name": "keyword.operator.increment-decrement.java"
         },
         {
-          "match": "(\\-|\\+|\\*|\\\/|%)",
+          "match": "(\\-|\\+|\\*|\\/|%)",
           "name": "keyword.operator.arithmetic.java"
         },
         {

data/config/syntax/JavaDoc.json

@@ -0,0 +1,435 @@
+{
+  "fileTypes": [
+
+  ],
+  "foldingStartMarker": "/\\*\\*",
+  "foldingStopMarker": "\\*\\*/",
+  "name": "JavaDoc",
+  "patterns": [
+    {
+      "begin": "(/\\*\\*)\\s*$",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.comment.begin.javadoc"
+        }
+      },
+      "contentName": "text.html",
+      "end": "\\*/",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.comment.end.javadoc"
+        }
+      },
+      "name": "comment.block.documentation.javadoc",
+      "patterns": [
+        {
+          "include": "#inline"
+        },
+        {
+          "begin": "((\\@)param)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.documentation.param.javadoc"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "end": "(?=^\\s*\\*?\\s*@|\\*/)",
+          "name": "meta.documentation.tag.param.javadoc",
+          "patterns": [
+            {
+              "include": "#inline"
+            }
+          ]
+        },
+        {
+          "begin": "((\\@)return)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.documentation.return.javadoc"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "end": "(?=^\\s*\\*?\\s*@|\\*/)",
+          "name": "meta.documentation.tag.return.javadoc",
+          "patterns": [
+            {
+              "include": "#inline"
+            }
+          ]
+        },
+        {
+          "begin": "((\\@)throws)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.documentation.throws.javadoc"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "end": "(?=^\\s*\\*?\\s*@|\\*/)",
+          "name": "meta.documentation.tag.throws.javadoc",
+          "patterns": [
+            {
+              "include": "#inline"
+            }
+          ]
+        },
+        {
+          "begin": "((\\@)exception)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.documentation.exception.javadoc"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "end": "(?=^\\s*\\*?\\s*@|\\*/)",
+          "name": "meta.documentation.tag.exception.javadoc",
+          "patterns": [
+            {
+              "include": "#inline"
+            }
+          ]
+        },
+        {
+          "begin": "((\\@)author)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.documentation.author.javadoc"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "end": "(?=^\\s*\\*?\\s*@|\\*/)",
+          "name": "meta.documentation.tag.author.javadoc",
+          "patterns": [
+            {
+              "include": "#inline"
+            }
+          ]
+        },
+        {
+          "begin": "((\\@)version)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.documentation.version.javadoc"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "end": "(?=^\\s*\\*?\\s*@|\\*/)",
+          "name": "meta.documentation.tag.version.javadoc",
+          "patterns": [
+            {
+              "include": "#inline"
+            }
+          ]
+        },
+        {
+          "begin": "((\\@)see)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.documentation.see.javadoc"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "end": "(?=^\\s*\\*?\\s*@|\\*/)",
+          "name": "meta.documentation.tag.see.javadoc",
+          "patterns": [
+            {
+              "include": "#inline"
+            }
+          ]
+        },
+        {
+          "begin": "((\\@)since)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.documentation.since.javadoc"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "end": "(?=^\\s*\\*?\\s*@|\\*/)",
+          "name": "meta.documentation.tag.since.javadoc",
+          "patterns": [
+            {
+              "include": "#inline"
+            }
+          ]
+        },
+        {
+          "begin": "((\\@)serial)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.documentation.serial.javadoc"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "end": "(?=^\\s*\\*?\\s*@|\\*/)",
+          "name": "meta.documentation.tag.serial.javadoc",
+          "patterns": [
+            {
+              "include": "#inline"
+            }
+          ]
+        },
+        {
+          "begin": "((\\@)serialField)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.documentation.serialField.javadoc"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "end": "(?=^\\s*\\*?\\s*@|\\*/)",
+          "name": "meta.documentation.tag.serialField.javadoc",
+          "patterns": [
+            {
+              "include": "#inline"
+            }
+          ]
+        },
+        {
+          "begin": "((\\@)serialData)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.documentation.serialData.javadoc"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "end": "(?=^\\s*\\*?\\s*@|\\*/)",
+          "name": "meta.documentation.tag.serialData.javadoc",
+          "patterns": [
+            {
+              "include": "#inline"
+            }
+          ]
+        },
+        {
+          "begin": "((\\@)deprecated)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.documentation.deprecated.javadoc"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "end": "(?=^\\s*\\*?\\s*@|\\*/)",
+          "name": "meta.documentation.tag.deprecated.javadoc",
+          "patterns": [
+            {
+              "include": "#inline"
+            }
+          ]
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "keyword.other.documentation.custom.javadoc"
+            },
+            "2": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "match": "((\\@)\\S+)\\s"
+        }
+      ]
+    }
+  ],
+  "repository": {
+    "inline": {
+      "patterns": [
+        {
+          "include": "#inline-formatting"
+        },
+        {
+          "include": "text.html.basic"
+        },
+        {
+          "match": "((https?|s?ftp|ftps|file|smb|afp|nfs|(x-)?man|gopher|txmt)://|mailto:)[-:@a-zA-Z0-9_.~%+/?=&#]+(?<![.?:])",
+          "name": "markup.underline.link"
+        }
+      ]
+    },
+    "inline-formatting": {
+      "patterns": [
+        {
+          "begin": "(\\{)((\\@)code)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.tag.begin.javadoc"
+            },
+            "2": {
+              "name": "keyword.other.documentation.directive.code.javadoc"
+            },
+            "3": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "contentName": "markup.raw.code.javadoc",
+          "end": "\\}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.tag.end.javadoc"
+            }
+          },
+          "name": "meta.tag.template.code.javadoc",
+          "patterns": [
+
+          ]
+        },
+        {
+          "begin": "(\\{)((\\@)literal)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.tag.begin.javadoc"
+            },
+            "2": {
+              "name": "keyword.other.documentation.directive.literal.javadoc"
+            },
+            "3": {
+              "name": "punctuation.definition.keyword.javadoc"
+            }
+          },
+          "contentName": "markup.raw.literal.javadoc",
+          "end": "\\}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.tag.end.javadoc"
+            }
+          },
+          "name": "meta.tag.template.literal.javadoc",
+          "patterns": [
+
+          ]
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.tag.begin.javadoc"
+            },
+            "2": {
+              "name": "keyword.other.documentation.directive.docRoot.javadoc"
+            },
+            "3": {
+              "name": "punctuation.definition.keyword.javadoc"
+            },
+            "4": {
+              "name": "punctuation.definition.tag.end.javadoc"
+            }
+          },
+          "match": "(\\{)((\\@)docRoot)(\\})",
+          "name": "meta.tag.template.docRoot.javadoc"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.tag.begin.javadoc"
+            },
+            "2": {
+              "name": "keyword.other.documentation.directive.inheritDoc.javadoc"
+            },
+            "3": {
+              "name": "punctuation.definition.keyword.javadoc"
+            },
+            "4": {
+              "name": "punctuation.definition.tag.end.javadoc"
+            }
+          },
+          "match": "(\\{)((\\@)inheritDoc)(\\})",
+          "name": "meta.tag.template.inheritDoc.javadoc"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.tag.begin.javadoc"
+            },
+            "2": {
+              "name": "keyword.other.documentation.directive.link.javadoc"
+            },
+            "3": {
+              "name": "punctuation.definition.keyword.javadoc"
+            },
+            "4": {
+              "name": "markup.underline.link.javadoc"
+            },
+            "5": {
+              "name": "string.other.link.title.javadoc"
+            },
+            "6": {
+              "name": "punctuation.definition.tag.end.javadoc"
+            }
+          },
+          "match": "(\\{)((\\@)link)(?:\\s+(\\S+?))?(?:\\s+(.+?))?\\s*(\\})",
+          "name": "meta.tag.template.link.javadoc"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.tag.begin.javadoc"
+            },
+            "2": {
+              "name": "keyword.other.documentation.directive.linkplain.javadoc"
+            },
+            "3": {
+              "name": "punctuation.definition.keyword.javadoc"
+            },
+            "4": {
+              "name": "markup.underline.linkplain.javadoc"
+            },
+            "5": {
+              "name": "string.other.link.title.javadoc"
+            },
+            "6": {
+              "name": "punctuation.definition.tag.end.javadoc"
+            }
+          },
+          "match": "(\\{)((\\@)linkplain)(?:\\s+(\\S+?))?(?:\\s+(.+?))?\\s*(\\})",
+          "name": "meta.tag.template.linkplain.javadoc"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.tag.begin.javadoc"
+            },
+            "2": {
+              "name": "keyword.other.documentation.directive.value.javadoc"
+            },
+            "3": {
+              "name": "punctuation.definition.keyword.javadoc"
+            },
+            "4": {
+              "name": "variable.other.javadoc"
+            },
+            "5": {
+              "name": "punctuation.definition.tag.end.javadoc"
+            }
+          },
+          "match": "(\\{)((\\@)value)\\s*(\\S+?)?\\s*(\\})",
+          "name": "meta.tag.template.value.javadoc"
+        }
+      ]
+    }
+  },
+  "scopeName": "text.html.javadoc",
+  "uuid": "64BB98A4-59D4-474E-9091-C1E1D04BDD03"
+}