Improve syntax highlighting

syntaxes/effekt.tmLanguage.json

@@ -1,38 +1,58 @@
 {
   "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
   "name": "Effekt",
+  "foldingStartMarker": "(?<![\"'])(/\\*\\*|\\{\\s*$)",
+  "foldingStopMarker": "(?<![\"'])(\\*\\*/|^\\s*\\})",
   "patterns": [
     { "include": "#comments" },
     { "include": "#definitions" },
     { "include": "#keywords" },
     { "include": "#names" },
     { "include": "#strings" },
+    { "include": "#characters" },
     { "include": "#numbers" },
     { "include": "#holes" }
   ],
   "repository": {
     "comments": {
-      "patterns": [
-        {
-          "match": "//.*$\n?",
-          "name": "comment.line.double-slash.syntax"
+      "patterns": [{
+        "begin": "//",
+        "end": "\\n",
+        "beginCaptures": {
+          "0": { "name": "punctuation.definition.comment.effekt" }
         },
-				{
-					"begin": "\\s*+(\\/\\*)",
-					"end": "\\*\\/",
-					"name": "comment.multiline.syntax"
-				}
-      ]
+        "name": "comment.line.double-slash.effekt"
+      }, {
+        "begin": "/\\*",
+        "beginCaptures": {
+          "0": { "name": "punctuation.definition.comment.effekt" }
+        },
+        "end": "\\*/",
+        "endCaptures": {
+          "0": {
+            "name": "punctuation.definition.comment.effekt"
+          }
+        },
+        "name": "comment.block.effekt"
+      }]
     },
     "definitions": {
       "patterns": [{
-          "begin": "\\s*(extern)?\\s*(\\{[^\\}]*\\}|[a-zA-Z][a-z-A-Z0-9_$]*)\\s*(def)\\s+([a-zA-Z][a-z-A-Z0-9_$]*)\\b",
-          "end" : "[=\\n]",
-          "beginCaptures": {
-            "1": { "name": "keyword.declaration.type" },
-            "2": { "name": "entity.name.type" },
-            "3": { "name": "keyword.declaration.function" },
-            "4": { "name": "entity.name.function" }
+          "begin": "\\s*(extern)\\s+((?:(?:\\{[^\\}]*\\}|[a-zA-Z][a-z-A-Z0-9_$]*)\\s+)?)\\s*(def)\\s+([a-zA-Z][a-z-A-Z0-9_$]*)\\b",
+          "end": "[=\\n]",
+          "captures": {
+              "1": { "name": "keyword.declaration.type" },
+              "2": { "patterns": [{ "include": "#capabilities" }] },
+              "3": { "name": "keyword.declaration.function.extern" },
+              "4": { "name": "entity.name.function" }
+            },
+          "patterns": [{ "include": "#parameters" }]
+        }, {
+          "begin": "\\s*(def)\\s+([a-zA-Z][a-z-A-Z0-9_$]*)\\b",
+          "end": "[=\\n]",
+          "captures": {
+            "1": { "name": "keyword.declaration.function" },
+            "2": { "name": "entity.name.function" }
           },
           "patterns": [{ "include": "#parameters" }]
         }, {
@@ -54,6 +74,12 @@
             "2": { "name": "keyword.declaration.type" },
             "3": { "name": "entity.name.type" }
           }
+        }, {
+          "match": "\\s*(namespace)\\s+([a-zA-Z][a-z-A-Z0-9_$]*)\\b",
+          "captures": {
+            "1": { "name": "keyword.declaration.namespace" },
+            "2": { "name": "entity.name.namespace" }
+          }
         }]
     },
     "parameters": {
@@ -65,6 +91,18 @@
         "name": "entity.name.type"
       }]
     },
+    "capabilities": {
+      "patterns": [{
+        "match": "\\b(pure)\\b",
+        "name": "keyword.other.capability"
+      }, {
+        "match": "\\b([a-z][a-zA-Z0-9_]*)\\b",
+        "name": "variable.other.capability"
+      }, {
+        "match": ",",
+        "name": "punctuation.capability-set.comma"
+      }]
+    },
     "keywords": {
       "patterns": [{
         "match": "\\b(module|import|def|fun|val|var|effect|type|match|case|record|extern|include|box|unbox|in|region|new|resource|interface|namespace|module|include|export|as)\\b",
@@ -93,17 +131,62 @@
     },
     "strings": {
       "patterns": [{
+        "begin": "\"\"\"",
+        "end": "\"\"\"",
+        "name": "string.quoted.triple.literal",
+        "patterns": [{
+          "include": "#stringTemplates"
+        }, {
+          "match": "\\\\.",
+          "name": "constant.character.escape.effekt"
+        }]
+      }, {
         "begin": "\"",
         "end": "\"",
-        "name": "string.quoted.double.literal"
+        "name": "string.quoted.double.literal",
+        "patterns": [{
+          "include": "#stringTemplates"
+        }, {
+          "match": "\\\\.",
+          "name": "constant.character.escape.effekt"
+        }]
       }]
     },
-    "numbers": {
+    "stringTemplates": {
+      "begin": "\\$\\{",
+      "beginCaptures": {
+        "0": { "name": "punctuation.definition.template-expression.begin.effekt" }
+      },
+      "end": "\\}",
+      "endCaptures": {
+        "0": { "name": "punctuation.definition.template-expression.end.effekt" }
+      },
+      "name": "meta.embedded.line.effekt",
+      "patterns": [
+        { "include": "$self" }
+      ]
+    },
+    "characters": {
       "patterns": [{
-        "match": "\\b[0-9]+",
-        "name": "constant.numeric"
+        "match": "'(\\\\[nrt\\\\']|[^'\\\\])'",
+        "name": "string.quoted.single.char.effekt"
+      }, {
+        "match": "\\\\u[0-9A-Fa-f]{4}",
+        "name": "string.quoted.single.char.effekt"
       }]
     },
+    "numbers": {
+      "patterns": [
+        {
+          "match": "\\b([0-9]+\\.[0-9]+)\\b",
+          "name": "constant.numeric.float.effekt"
+        },
+        {
+          "match": "\\b([0-9]+)\\b",
+          "name": "constant.numeric.integer.effekt"
+        }
+      ]
+    },
     "punctuation": {
       "patterns": [{
         "match": "[{}\\(\\)\\[\\];,]",