Merge pull request #471 from markov/fix-195

Fix for #195. Add support for lambda expressions.

Author: fwcd

grammars/Kotlin.tmLanguage.json

@@ -116,6 +116,9 @@
                 {
                     "include": "#character"
                 },
+                {
+                    "include": "#lambda-arrow"
+                },
                 {
                     "include": "#operators"
                 },
@@ -522,9 +525,41 @@
             "match": "\\bnull\\b",
             "name": "constant.language.null.kotlin"
         },
+        "lambda-arrow": {
+            "match": "->",
+            "name": "storage.type.function.arrow.kotlin"
+        },
         "operators": {
-            "match": "<=|>=|===|==|=>|=|\\!==|\\!=|\\+=|\\+\\+|\\+|-=|--|-|\\*=|\\*|/=|/|%=|%|!|\\&\\&|\\&|\\|\\||\\|..",
-            "name": "keyword.operator.kotlin"
+            "patterns": [
+                {
+                    "match": "(===?|\\!==?|<=|>=|<|>)",
+                    "name": "keyword.operator.comparison.kotlin"
+                },
+                {
+                    "match": "([+*/%-]=)",
+                    "name": "keyword.operator.assignment.arithmetic.kotlin"
+                },
+                {
+                    "match": "(=)",
+                    "name": "keyword.operator.assignment.kotlin"
+                },
+                {
+                    "match": "([+*/%-])",
+                    "name": "keyword.operator.arithmetic.kotlin"
+                },
+                {
+                    "match": "(!|&&|\\|\\|)",
+                    "name": "keyword.operator.logical.kotlin"
+                },
+                {
+                    "match": "(--|\\+\\+)",
+                    "name": "keyword.operator.increment-decrement.kotlin"
+                },
+                {
+                    "match": "(\\.\\.)",
+                    "name": "keyword.operator.range.kotlin"
+                }
+            ]
         },
         "self-reference": {
             "match": "\\b(this|super)(@\\w+)?\\b",

grammars/kotlin.configuration.json

@@ -6,8 +6,7 @@
     "brackets": [
         ["{", "}"],
         ["[", "]"],
-        ["(", ")"],
-        ["<", ">"]
+        ["(", ")"]
     ],
     "autoClosingPairs": [
         { "open": "{", "close": "}" },