github-linguist 5.3.3 → 6.0.0

data/grammars/source.xq.json

@@ -1,16 +1,6 @@
 {
-  "scopeName": "source.xq",
-  "fileTypes": [
-    "xq",
-    "xql",
-    "xqm",
-    "xqy",
-    "xquery"
-  ],
-  "firstLineMatch": "^\\bxquery\\s+version\\b.*",
-  "foldingStartMarker": "^\\s*(<[^!?%/](?!.+?(/>|</.+?>))|<[!%]--(?!.+?--%?>)|<%[!]?(?!.+?%>))|(declare|.*\\{\\s*(//.*)?$)",
-  "foldingStopMarker": "^\\s*(</[^>]+>|[/%]>|-->)\\s*$|(.*\\}\\s*;?\\s*|.*;)",
   "name": "XQuery",
+  "scopeName": "source.xq",
   "patterns": [
     {
       "begin": "^(?=jsoniq\\s+version\\s+)",
@@ -22,14 +12,14 @@
       ]
     },
     {
+      "name": "constant.xquery",
       "begin": "\\(#",
-      "end": "#\\)",
-      "name": "constant.xquery"
+      "end": "#\\)"
     },
     {
+      "name": "comment.doc.xquery",
       "begin": "\\(:~",
       "end": ":\\)",
-      "name": "comment.doc.xquery",
       "patterns": [
         {
           "name": "constant.language.xquery",
@@ -50,23 +40,23 @@
       "include": "#CharRef"
     },
     {
-      "begin": "<\\?",
-      "end": "\\?>",
-      "name": "comment.xquery"
+      "name": "comment.xquery",
+      "begin": "\u003c\\?",
+      "end": "\\?\u003e"
     },
     {
+      "name": "comment.xquery",
       "begin": "\\(:",
-      "end": ":\\)",
-      "name": "comment.xquery"
+      "end": ":\\)"
     },
     {
+      "name": "string.xquery",
       "begin": "\"",
       "end": "\"(?!\")",
-      "name": "string.xquery",
       "patterns": [
         {
-          "match": "\"\"",
-          "name": "constant.xquery"
+          "name": "constant.xquery",
+          "match": "\"\""
         },
         {
           "include": "#PredefinedEntityRef"
@@ -77,13 +67,13 @@
       ]
     },
     {
+      "name": "string.xquery",
       "begin": "'",
       "end": "'(?!')",
-      "name": "string.xquery",
       "patterns": [
         {
-          "match": "''",
-          "name": "constant.xquery"
+          "name": "constant.xquery",
+          "match": "''"
         },
         {
           "include": "#PredefinedEntityRef"
@@ -94,45 +84,44 @@
       ]
     },
     {
-      "match": "%([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*)",
-      "name": "meta.declaration.annotation.xquery"
+      "name": "meta.declaration.annotation.xquery",
+      "match": "%([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*)"
     },
     {
-      "match": "@(\\* | ([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*))",
-      "name": "support.type.xquery"
+      "name": "support.type.xquery",
+      "match": "@(\\* | ([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*))"
     },
     {
-      "match": "\\$([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*)",
-      "name": "meta.definition.variable.name.xquery"
+      "name": "meta.definition.variable.name.xquery",
+      "match": "\\$([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*)"
     },
     {
-      "match": "\\b(\\.[0-9]+|[0-9]+(\\.[0-9]*)?)[Ee][+#x002D]?[0-9]+\\b",
-      "name": "constant.numeric.jsoniq"
+      "name": "constant.numeric.jsoniq",
+      "match": "\\b(\\.[0-9]+|[0-9]+(\\.[0-9]*)?)[Ee][+#x002D]?[0-9]+\\b"
     },
     {
-      "match": "\\b(\\.[0-9]+|[0-9]+\\.[0-9]*)\\b",
-      "name": "constant.numeric.jsoniq"
+      "name": "constant.numeric.jsoniq",
+      "match": "\\b(\\.[0-9]+|[0-9]+\\.[0-9]*)\\b"
     },
     {
-      "match": "\\b[0-9]+\\b",
-      "name": "constant.numeric.jsoniq"
+      "name": "constant.numeric.jsoniq",
+      "match": "\\b[0-9]+\\b"
     },
     {
-      "match": "\\b(NaN|after|allowing|ancestor|ancestor-or-self|and|append|array|as|ascending|at|attribute|base-uri|before|boundary-space|break|by|case|cast|castable|catch|child|collation|comment|constraint|construction|contains|context|continue|copy|copy-namespaces|count|decimal-format|decimal-separator|declare|default|delete|descendant|descendant-or-self|descending|digit|div|document|document-node|element|else|empty|empty-sequence|encoding|end|eq|every|except|exit|external|false|first|following|following-sibling|for|from|ft-option|function|ge|greatest|group|grouping-separator|gt|idiv|if|import|in|index|infinity|insert|instance|integrity|intersect|into|is|item|json|json-item|jsoniq|last|lax|le|least|let|loop|lt|minus-sign|mod|modify|module|namespace|namespace-node|ne|next|node|nodes|not|null|object|of|only|option|or|order|ordered|ordering|paragraphs|parent|pattern-separator|per-mille|percent|preceding|preceding-sibling|previous|processing-instruction|rename|replace|return|returning|revalidation|satisfies|schema|schema-attribute|schema-element|score|select|self|sentences|sliding|some|stable|start|strict|switch|text|then|times|to|treat|true|try|tumbling|type|typeswitch|union|unordered|updating|validate|value|variable|version|when|where|while|window|with|words|xquery|zero-digit)(?!(:|\\-))\\b",
-      "name": "keyword.xquery"
+      "name": "keyword.xquery",
+      "match": "\\b(NaN|after|allowing|ancestor|ancestor-or-self|and|append|array|as|ascending|at|attribute|base-uri|before|boundary-space|break|by|case|cast|castable|catch|child|collation|comment|constraint|construction|contains|context|continue|copy|copy-namespaces|count|decimal-format|decimal-separator|declare|default|delete|descendant|descendant-or-self|descending|digit|div|document|document-node|element|else|empty|empty-sequence|encoding|end|eq|every|except|exit|external|false|first|following|following-sibling|for|from|ft-option|function|ge|greatest|group|grouping-separator|gt|idiv|if|import|in|index|infinity|insert|instance|integrity|intersect|into|is|item|json|json-item|jsoniq|last|lax|le|least|let|loop|lt|minus-sign|mod|modify|module|namespace|namespace-node|ne|next|node|nodes|not|null|object|of|only|option|or|order|ordered|ordering|paragraphs|parent|pattern-separator|per-mille|percent|preceding|preceding-sibling|previous|processing-instruction|rename|replace|return|returning|revalidation|satisfies|schema|schema-attribute|schema-element|score|select|self|sentences|sliding|some|stable|start|strict|switch|text|then|times|to|treat|true|try|tumbling|type|typeswitch|union|unordered|updating|validate|value|variable|version|when|where|while|window|with|words|xquery|zero-digit)(?!(:|\\-))\\b"
     },
     {
-      "comment": "EQName",
-      "match": "([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)(?=\\s*\\()",
-      "name": "support.function.xquery"
+      "name": "support.function.xquery",
+      "match": "([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)(?=\\s*\\()"
     },
     {
-      "match": "\\(",
-      "name": "lparen.xquery"
+      "name": "lparen.xquery",
+      "match": "\\("
     },
     {
-      "match": "\\)",
-      "name": "rparent.xquery"
+      "name": "rparent.xquery",
+      "match": "\\)"
     },
     {
       "include": "#OpenTag"
@@ -142,27 +131,50 @@
     }
   ],
   "repository": {
+    "CDATA": {
+      "name": "constant.language.xquery",
+      "begin": "\u003c!\\[CDATA\\[",
+      "end": "\\]\\]\u003e"
+    },
+    "CharRef": {
+      "name": "constant.language.escape.xquery",
+      "match": "\u0026#([0-9]+|x[0-9A-Fa-f]+);"
+    },
+    "CloseTag": {
+      "name": "punctuation.definition.tag.xquery",
+      "match": "\u003c\\/([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)\u003e"
+    },
+    "EnclosedExpr": {
+      "name": "source.xq",
+      "begin": "{",
+      "end": "}",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ]
+    },
     "OpenTag": {
-      "begin": "<([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)",
-      "end": "(\\/>|>)",
       "name": "punctuation.definition.tag.xquery",
+      "begin": "\u003c([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)",
+      "end": "(\\/\u003e|\u003e)",
       "patterns": [
         {
-          "match": "([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)",
-          "name": "entity.other.attribute-name.xquery"
+          "name": "entity.other.attribute-name.xquery",
+          "match": "([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)"
         },
         {
-          "match": "=",
-          "name": "source.jq"
+          "name": "source.jq",
+          "match": "="
         },
         {
+          "name": "string.xquery",
           "begin": "'",
           "end": "'(?!')",
-          "name": "string.xquery",
           "patterns": [
             {
-              "match": "''",
-              "name": "constant.xquery"
+              "name": "constant.xquery",
+              "match": "''"
             },
             {
               "include": "#PredefinedEntityRef"
@@ -171,8 +183,8 @@
               "include": "#CharRef"
             },
             {
-              "match": "({{|}})",
-              "name": "string.xquery"
+              "name": "string.xquery",
+              "match": "({{|}})"
             },
             {
               "include": "#EnclosedExpr"
@@ -180,13 +192,13 @@
           ]
         },
         {
+          "name": "string.xquery",
           "begin": "\"",
           "end": "\"(?!\")",
-          "name": "string.xquery",
           "patterns": [
             {
-              "match": "\"\"",
-              "name": "constant.xquery"
+              "name": "constant.xquery",
+              "match": "\"\""
             },
             {
               "include": "#PredefinedEntityRef"
@@ -195,8 +207,8 @@
               "include": "#CharRef"
             },
             {
-              "match": "({{|}})",
-              "name": "constant.xquery"
+              "name": "constant.xquery",
+              "match": "({{|}})"
             },
             {
               "include": "#EnclosedExpr"
@@ -205,37 +217,14 @@
         }
       ]
     },
-    "CloseTag": {
-      "match": "<\\/([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)>",
-      "name": "punctuation.definition.tag.xquery"
-    },
-    "XMLComment": {
-      "begin": "<!--",
-      "end": "-->",
-      "name": "comment.xquery"
-    },
-    "CDATA": {
-      "begin": "<!\\[CDATA\\[",
-      "end": "\\]\\]>",
-      "name": "constant.language.xquery"
-    },
     "PredefinedEntityRef": {
-      "match": "&(lt|gt|amp|quot|apos);",
-      "name": "constant.language.escape.xquery"
+      "name": "constant.language.escape.xquery",
+      "match": "\u0026(lt|gt|amp|quot|apos);"
     },
-    "CharRef": {
-      "match": "&#([0-9]+|x[0-9A-Fa-f]+);",
-      "name": "constant.language.escape.xquery"
-    },
-    "EnclosedExpr": {
-      "begin": "{",
-      "end": "}",
-      "name": "source.xq",
-      "patterns": [
-        {
-          "include": "$self"
-        }
-      ]
+    "XMLComment": {
+      "name": "comment.xquery",
+      "begin": "\u003c!--",
+      "end": "--\u003e"
     }
   }
-}
+}

data/grammars/source.xtend.json

@@ -1,13 +1,10 @@
 {
-  "fileTypes": [
-    "xtend"
-  ],
-  "foldingStartMarker": "(\\{\\s*(//.*)?$|^\\s*// \\{\\{\\{)",
-  "foldingStopMarker": "^\\s*(\\}|// \\}\\}\\}$)",
-  "keyEquivalent": "^~J",
   "name": "Xtend",
+  "scopeName": "source.xtend",
   "patterns": [
     {
+      "name": "meta.package.xtend",
+      "match": "^\\s*(package)\\b(?:\\s*([^ ;$]+)\\s*(;)?)?",
       "captures": {
         "1": {
           "name": "keyword.other.package.xtend"
@@ -18,11 +15,11 @@
         "3": {
           "name": "punctuation.terminator.xtend"
         }
-      },
-      "match": "^\\s*(package)\\b(?:\\s*([^ ;$]+)\\s*(;)?)?",
-      "name": "meta.package.xtend"
+      }
     },
     {
+      "name": "meta.import.xtend",
+      "match": "^\\s*(import)\\s+(?:\\s*([^ ;$]+)\\s*(;)?)?$",
       "captures": {
         "1": {
           "name": "keyword.other.import.xtend"
@@ -33,11 +30,11 @@
         "3": {
           "name": "punctuation.terminator.xtend"
         }
-      },
-      "match": "^\\s*(import)\\s+(?:\\s*([^ ;$]+)\\s*(;)?)?$",
-      "name": "meta.import.xtend"
+      }
     },
     {
+      "name": "meta.import.static.xtend",
+      "match": "^\\s*(import)\\s+(static)\\s+(?:\\s*([^ ;$]+)\\s*(;)?)?$",
       "captures": {
         "1": {
           "name": "keyword.other.import.xtend"
@@ -51,11 +48,11 @@
         "4": {
           "name": "punctuation.terminator.xtend"
         }
-      },
-      "match": "^\\s*(import)\\s+(static)\\s+(?:\\s*([^ ;$]+)\\s*(;)?)?$",
-      "name": "meta.import.static.xtend"
+      }
     },
     {
+      "name": "meta.import.static.extension.xtend",
+      "match": "^\\s*(import)\\s+(static)\\s+(extension)\\s+(?:\\s*([^ ;$]+)\\s*(;)?)?$",
       "captures": {
         "1": {
           "name": "keyword.other.import.xtend"
@@ -72,9 +69,7 @@
         "5": {
           "name": "punctuation.terminator.xtend"
         }
-      },
-      "match": "^\\s*(import)\\s+(static)\\s+(extension)\\s+(?:\\s*([^ ;$]+)\\s*(;)?)?$",
-      "name": "meta.import.static.extension.xtend"
+      }
     },
     {
       "include": "#code"
@@ -97,24 +92,12 @@
     "annotations": {
       "patterns": [
         {
+          "name": "meta.tag.annotation.xtend",
           "begin": "(@[^ (]+)(\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "meta.tag.annotation.name.xtend"
-            },
-            "2": {
-              "name": "meta.tag.annotation-arguments.begin.xtend"
-            }
-          },
           "end": "(\\))",
-          "endCaptures": {
-            "1": {
-              "name": "meta.tag.annotation-arguments.end.xtend"
-            }
-          },
-          "name": "meta.tag.annotation.xtend",
           "patterns": [
             {
+              "match": "(\\w*)\\s*(=)",
               "captures": {
                 "1": {
                   "name": "constant.other.key.xtend"
@@ -122,68 +105,63 @@
                 "2": {
                   "name": "keyword.operator.assignment.xtend"
                 }
-              },
-              "match": "(\\w*)\\s*(=)"
+              }
             },
             {
               "include": "#code"
             },
             {
-              "match": ",",
-              "name": "punctuation.seperator.property.xtend"
+              "name": "punctuation.seperator.property.xtend",
+              "match": ","
             }
-          ]
-        },
-        {
-          "match": "@\\w*",
-          "name": "meta.tag.annotation.xtend"
-        }
-      ]
-    },
-    "lambdas": {
-      "patterns": [
-        {
-          "match": "(\\[)(?:\\s)",
-          "name": "meta.tag.lambda-start.xtend"
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "meta.tag.annotation.name.xtend"
+            },
+            "2": {
+              "name": "meta.tag.annotation-arguments.begin.xtend"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "meta.tag.annotation-arguments.end.xtend"
+            }
+          }
         },
         {
-          "match": "(?:\\s)(\\[)",
-          "name": "meta.tag.lambda-end.xtend"
+          "name": "meta.tag.annotation.xtend",
+          "match": "@\\w*"
         }
       ]
     },
     "assertions": {
       "patterns": [
         {
+          "name": "meta.declaration.assertion.xtend",
           "begin": "\\b(assert)\\s",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.assert.xtend"
-            }
-          },
           "end": "$",
-          "name": "meta.declaration.assertion.xtend",
           "patterns": [
             {
-              "match": ":",
-              "name": "keyword.operator.assert.expression-seperator.xtend"
+              "name": "keyword.operator.assert.expression-seperator.xtend",
+              "match": ":"
             },
             {
               "include": "#code"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.assert.xtend"
+            }
+          }
         }
       ]
     },
     "class": {
+      "name": "meta.class.xtend",
       "begin": "(?=\\w?[\\w\\s]*(?:class|(?:@)?interface|enum)\\s+\\w+)",
       "end": "}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.class.end.xtend"
-        }
-      },
-      "name": "meta.class.xtend",
       "patterns": [
         {
           "include": "#storage-modifiers"
@@ -192,6 +170,8 @@
           "include": "#comments"
         },
         {
+          "name": "meta.class.identifier.xtend",
+          "match": "(class|(?:@)?interface|enum)\\s+(\\w+)",
           "captures": {
             "1": {
               "name": "storage.modifier.xtend"
@@ -199,19 +179,12 @@
             "2": {
               "name": "entity.name.type.class.xtend"
             }
-          },
-          "match": "(class|(?:@)?interface|enum)\\s+(\\w+)",
-          "name": "meta.class.identifier.xtend"
+          }
         },
         {
+          "name": "meta.definition.class.inherited.classes.xtend",
           "begin": "extends",
-          "beginCaptures": {
-            "0": {
-              "name": "storage.modifier.extends.xtend"
-            }
-          },
           "end": "(?={|implements)",
-          "name": "meta.definition.class.inherited.classes.xtend",
           "patterns": [
             {
               "include": "#object-types-inherited"
@@ -219,17 +192,17 @@
             {
               "include": "#comments"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "storage.modifier.extends.xtend"
+            }
+          }
         },
         {
+          "name": "meta.definition.class.implemented.interfaces.xtend",
           "begin": "(implements)\\s",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.modifier.implements.xtend"
-            }
-          },
           "end": "(?=\\s*extends|\\{)",
-          "name": "meta.definition.class.implemented.interfaces.xtend",
           "patterns": [
             {
               "include": "#object-types-inherited"
@@ -237,19 +210,29 @@
             {
               "include": "#comments"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.modifier.implements.xtend"
+            }
+          }
         },
         {
+          "name": "meta.class.body.xtend",
           "begin": "{",
           "end": "(?=})",
-          "name": "meta.class.body.xtend",
           "patterns": [
             {
               "include": "#class-body"
             }
           ]
         }
-      ]
+      ],
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.class.end.xtend"
+        }
+      }
     },
     "class-body": {
       "patterns": [
@@ -319,13 +302,13 @@
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.empty.xtend",
+          "match": "/\\*\\*/",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.xtend"
             }
-          },
-          "match": "/\\*\\*/",
-          "name": "comment.block.empty.xtend"
+          }
         },
         {
           "include": "text.html.javadoc"
@@ -338,16 +321,17 @@
     "comments-inline": {
       "patterns": [
         {
+          "name": "comment.block.xtend",
           "begin": "/\\*",
+          "end": "\\*/",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.xtend"
             }
-          },
-          "end": "\\*/",
-          "name": "comment.block.xtend"
+          }
         },
         {
+          "match": "\\s*((//).*$\\n?)",
           "captures": {
             "1": {
               "name": "comment.line.double-slash.xtend"
@@ -355,33 +339,32 @@
             "2": {
               "name": "punctuation.definition.comment.xtend"
             }
-          },
-          "match": "\\s*((//).*$\\n?)"
+          }
         }
       ]
     },
     "constants-and-special-vars": {
       "patterns": [
         {
-          "match": "\\b(true|false|null)\\b",
-          "name": "constant.language.xtend"
+          "name": "constant.language.xtend",
+          "match": "\\b(true|false|null)\\b"
         },
         {
-          "match": "\\b(this|new|super|it)\\b",
-          "name": "variable.language.xtend"
+          "name": "variable.language.xtend",
+          "match": "\\b(this|new|super|it)\\b"
         },
         {
-          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
-          "name": "constant.numeric.xtend"
+          "name": "constant.numeric.xtend",
+          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b"
         },
         {
+          "name": "constant.other.xtend",
+          "match": "(\\.)?\\b([A-Z][A-Z0-9_]+)(?!\u003c|\\.class|\\s*\\w+\\s*=)\\b",
           "captures": {
             "1": {
               "name": "keyword.operator.dereference.xtend"
             }
-          },
-          "match": "(\\.)?\\b([A-Z][A-Z0-9_]+)(?!<|\\.class|\\s*\\w+\\s*=)\\b",
-          "name": "constant.other.xtend"
+          }
         }
       ]
     },
@@ -390,14 +373,9 @@
       "end": "(?=;|})",
       "patterns": [
         {
+          "name": "meta.enum.xtend",
           "begin": "\\w+",
-          "beginCaptures": {
-            "0": {
-              "name": "constant.other.enum.xtend"
-            }
-          },
           "end": "(?=,|;|})",
-          "name": "meta.enum.xtend",
           "patterns": [
             {
               "include": "#parens"
@@ -411,90 +389,102 @@
                 }
               ]
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "constant.other.enum.xtend"
+            }
+          }
         }
       ]
     },
     "keywords": {
       "patterns": [
         {
-          "match": "\\b(try|catch|finally|throw)\\b",
-          "name": "keyword.control.catch-exception.xtend"
+          "name": "keyword.control.catch-exception.xtend",
+          "match": "\\b(try|catch|finally|throw)\\b"
         },
         {
-          "match": "\\?|:",
-          "name": "keyword.control.xtend"
+          "name": "keyword.control.xtend",
+          "match": "\\?|:"
         },
         {
-          "match": "\\b(return|break|case|continue|default|do|while|for|switch|if|else)\\b",
-          "name": "keyword.control.xtend"
+          "name": "keyword.control.xtend",
+          "match": "\\b(return|break|case|continue|default|do|while|for|switch|if|else)\\b"
         },
         {
-          "match": "\\b(instanceof)\\b",
-          "name": "keyword.operator.xtend"
+          "name": "keyword.operator.xtend",
+          "match": "\\b(instanceof)\\b"
         },
         {
-          "match": "(==|===|!==|!=|<=|>=|<>|<|>)",
-          "name": "keyword.operator.comparison.xtend"
+          "name": "keyword.operator.comparison.xtend",
+          "match": "(==|===|!==|!=|\u003c=|\u003e=|\u003c\u003e|\u003c|\u003e)"
         },
         {
-          "match": "(=)",
-          "name": "keyword.operator.assignment.xtend"
+          "name": "keyword.operator.assignment.xtend",
+          "match": "(=)"
         },
         {
-          "match": "(\\-\\-|\\+\\+)",
-          "name": "keyword.operator.increment-decrement.xtend"
+          "name": "keyword.operator.increment-decrement.xtend",
+          "match": "(\\-\\-|\\+\\+)"
         },
         {
-          "match": "(\\-|\\+|\\*|\\/|%)",
-          "name": "keyword.operator.arithmetic.xtend"
+          "name": "keyword.operator.arithmetic.xtend",
+          "match": "(\\-|\\+|\\*|\\/|%)"
         },
         {
-          "match": "(!|&&|\\|\\|)",
-          "name": "keyword.operator.logical.xtend"
+          "name": "keyword.operator.logical.xtend",
+          "match": "(!|\u0026\u0026|\\|\\|)"
         },
         {
-          "match": "(?<=\\S)\\.(?=\\S)",
-          "name": "keyword.operator.dereference.xtend"
+          "name": "keyword.operator.dereference.xtend",
+          "match": "(?\u003c=\\S)\\.(?=\\S)"
         },
         {
-          "match": ";",
-          "name": "punctuation.terminator.xtend"
+          "name": "punctuation.terminator.xtend",
+          "match": ";"
+        }
+      ]
+    },
+    "lambdas": {
+      "patterns": [
+        {
+          "name": "meta.tag.lambda-start.xtend",
+          "match": "(\\[)(?:\\s)"
+        },
+        {
+          "name": "meta.tag.lambda-end.xtend",
+          "match": "(?:\\s)(\\[)"
         }
       ]
     },
     "methods": {
+      "name": "meta.method.xtend",
       "begin": "(def|override)\\s+(?!new)(?=\\w.*\\s+)(?=[^=]+\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "entity.name.function.keyword.xtend"
-        }
-      },
       "end": "}|(?=;)",
-      "name": "meta.method.xtend",
       "patterns": [
         {
           "include": "#storage-modifiers"
         },
         {
+          "name": "meta.method.identifier.xtend",
           "begin": "(\\w+)\\s*\\(",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.function.xtend"
-            }
-          },
           "end": "\\)",
-          "name": "meta.method.identifier.xtend",
           "patterns": [
             {
               "include": "#parameters"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.function.xtend"
+            }
+          }
         },
         {
+          "name": "meta.method.return-type.xtend",
           "begin": "(?=\\w.*\\s+\\w+\\s*\\()",
           "end": "(?=\\w+\\s*\\()",
-          "name": "meta.method.return-type.xtend",
           "patterns": [
             {
               "include": "#all-types"
@@ -505,39 +495,43 @@
           "include": "#throws"
         },
         {
+          "name": "meta.method.body.xtend",
           "begin": "{",
           "end": "(?=})",
-          "name": "meta.method.body.xtend",
           "patterns": [
             {
               "include": "#code"
             }
           ]
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.function.keyword.xtend"
+        }
+      }
     },
     "object-types": {
       "patterns": [
         {
-          "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)<",
-          "end": ">|[^\\w\\s,\\?<\\[\\]]",
           "name": "storage.type.generic.xtend",
+          "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)\u003c",
+          "end": "\u003e|[^\\w\\s,\\?\u003c\\[\\]]",
           "patterns": [
             {
               "include": "#object-types"
             },
             {
-              "begin": "<",
-              "comment": "This is just to support <>'s with no actual type prefix",
-              "end": ">|[^\\w\\s,\\[\\]<]",
-              "name": "storage.type.generic.xtend"
+              "name": "storage.type.generic.xtend",
+              "begin": "\u003c",
+              "end": "\u003e|[^\\w\\s,\\[\\]\u003c]"
             }
           ]
         },
         {
+          "name": "storage.type.object.array.xtend",
           "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)(?=\\[)",
           "end": "(?=[^\\]\\s])",
-          "name": "storage.type.object.array.xtend",
           "patterns": [
             {
               "begin": "\\[",
@@ -551,59 +545,58 @@
           ]
         },
         {
+          "name": "entity.name.type.class.xtend",
+          "match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*\\b",
           "captures": {
             "1": {
               "name": "keyword.operator.dereference.xtend"
             }
-          },
-          "match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*\\b",
-          "name": "entity.name.type.class.xtend"
+          }
         },
         {
+          "name": "storage.type.xtend",
+          "match": "^\\s*(\\.)(?=\\w+\\b)",
           "captures": {
             "1": {
               "name": "keyword.operator.dereference.xtend"
             }
-          },
-          "match": "^\\s*(\\.)(?=\\w+\\b)",
-          "name": "storage.type.xtend"
+          }
         }
       ]
     },
     "object-types-inherited": {
       "patterns": [
         {
-          "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)<",
-          "end": ">|[^\\w\\s,<]",
           "name": "entity.other.inherited-class.xtend",
+          "begin": "\\b((?:[a-z]\\w*\\.)*[A-Z]+\\w*)\u003c",
+          "end": "\u003e|[^\\w\\s,\u003c]",
           "patterns": [
             {
               "include": "#object-types"
             },
             {
-              "begin": "<",
-              "comment": "This is just to support <>'s with no actual type prefix",
-              "end": ">|[^\\w\\s,<]",
-              "name": "storage.type.generic.xtend"
+              "name": "storage.type.generic.xtend",
+              "begin": "\u003c",
+              "end": "\u003e|[^\\w\\s,\u003c]"
             }
           ]
         },
         {
+          "name": "entity.other.inherited-class.xtend",
+          "match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*",
           "captures": {
             "1": {
               "name": "keyword.operator.dereference.xtend"
             }
-          },
-          "match": "\\b(?:[a-z]\\w*(\\.))*[A-Z]+\\w*",
-          "name": "entity.other.inherited-class.xtend"
+          }
         }
       ]
     },
     "parameters": {
       "patterns": [
         {
-          "match": "(final|var|val)",
-          "name": "storage.modifier.xtend"
+          "name": "storage.modifier.xtend",
+          "match": "(final|var|val)"
         },
         {
           "include": "#primitive-arrays"
@@ -615,8 +608,8 @@
           "include": "#object-types"
         },
         {
-          "match": "\\w+",
-          "name": "variable.parameter.xtend"
+          "name": "variable.parameter.xtend",
+          "match": "\\w+"
         }
       ]
     },
@@ -632,87 +625,87 @@
     "primitive-arrays": {
       "patterns": [
         {
-          "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)(\\[\\])*\\b",
-          "name": "storage.type.primitive.array.xtend"
+          "name": "storage.type.primitive.array.xtend",
+          "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)(\\[\\])*\\b"
         }
       ]
     },
     "primitive-types": {
       "patterns": [
         {
-          "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)\\b",
-          "name": "storage.type.primitive.xtend"
+          "name": "storage.type.primitive.xtend",
+          "match": "\\b(?:void|boolean|byte|char|short|int|float|long|double)\\b"
         }
       ]
     },
     "storage-modifiers": {
+      "match": "\\b(public|private|protected|package|static|var|val|final|native|synchronized|abstract|threadsafe|transient)\\b",
       "captures": {
         "1": {
           "name": "storage.modifier.xtend"
         }
-      },
-      "match": "\\b(public|private|protected|package|static|var|val|final|native|synchronized|abstract|threadsafe|transient)\\b"
+      }
     },
     "strings": {
       "patterns": [
         {
+          "name": "string.quoted.double.xtend",
           "begin": "\"",
+          "end": "\"",
+          "patterns": [
+            {
+              "name": "constant.character.escape.xtend",
+              "match": "\\\\."
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.xtend"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.xtend"
             }
-          },
-          "name": "string.quoted.double.xtend",
-          "patterns": [
-            {
-              "match": "\\\\.",
-              "name": "constant.character.escape.xtend"
-            }
-          ]
+          }
         },
         {
+          "name": "string.quoted.single.xtend",
           "begin": "'",
+          "end": "'",
+          "patterns": [
+            {
+              "name": "constant.character.escape.xtend",
+              "match": "\\\\."
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.xtend"
             }
           },
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.xtend"
             }
-          },
-          "name": "string.quoted.single.xtend",
-          "patterns": [
-            {
-              "match": "\\\\.",
-              "name": "constant.character.escape.xtend"
-            }
-          ]
+          }
         }
       ]
     },
     "throws": {
+      "name": "meta.throwables.xtend",
       "begin": "throws",
-      "beginCaptures": {
-        "0": {
-          "name": "storage.modifier.xtend"
-        }
-      },
       "end": "(?={|;)",
-      "name": "meta.throwables.xtend",
       "patterns": [
         {
           "include": "#object-types"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "storage.modifier.xtend"
+        }
+      }
     },
     "values": {
       "patterns": [
@@ -727,7 +720,5 @@
         }
       ]
     }
-  },
-  "scopeName": "source.xtend",
-  "uuid": "2B449DF6-6B1D-11D9-94EC-000D93589AF6"
-}
+  }
+}