Simplify and extract literals

Author: jiribenes

syntaxes/effekt.tmLanguage.json

@@ -8,9 +8,7 @@
     { "include": "#definitions" },
     { "include": "#keywords" },
     { "include": "#names" },
-    { "include": "#strings" },
-    { "include": "#characters" },
-    { "include": "#numbers" },
+    { "include": "#literals" },
     { "include": "#holes" }
   ],
   "repository": {
@@ -112,46 +110,68 @@
         "name": "keyword.control"
       }]
     },
-    "names": {
+    "literals": {
       "patterns": [{
         "match": "\\b(true|false)\\b",
-        "name": "constant.language"
+        "name": "constant.language.boolean.effekt"
       }, {
-        "match": "\\b([a-z][a-zA-Z0-9_]*)\\b[\\s]*[({\\[]",
-        "captures": {
-          "1": { "name": "entity.name.function" }
-        }
+        "match": "\\b([0-9]+\\.[0-9]+)\\b",
+        "name": "constant.numeric.float.effekt"
       }, {
-        "match": "\\b[a-z][a-zA-Z0-9_]*\\b",
-        "name": "variable"
+        "match": "\\b([0-9]+)\\b",
+        "name": "constant.numeric.integer.effekt"
       }, {
-        "match": "\\b[A-Z][a-zA-Z0-9_]*\\b",
-        "name": "entity.name.type"
+        "include": "#characters"
+      }, {
+        "include": "#strings"
+      }]
+    },
+    "characters": {
+      "name": "string.quoted.single.effekt",
+      "begin": "'",
+      "end": "'",
+      "patterns": [{
+        "name": "constant.character.escape.effekt",
+        "match": "\\\\((u[0-9a-fA-F]{4})|.)"
       }]
     },
     "strings": {
       "patterns": [{
+        "name": "string.quoted.triple.effekt",
         "begin": "\"\"\"",
         "end": "\"\"\"",
-        "name": "string.quoted.triple.literal",
         "patterns": [{
-          "include": "#stringTemplates"
+          "name": "constant.character.escape.effekt",
+          "match": "\\\\((u[0-9a-fA-F]{4})|.)"
         }, {
-          "match": "\\\\.",
-          "name": "constant.character.escape.effekt"
+          "include": "#stringTemplates"
         }]
       }, {
+        "name": "string.quoted.double.effekt",
         "begin": "\"",
         "end": "\"",
-        "name": "string.quoted.double.literal",
         "patterns": [{
-          "include": "#stringTemplates"
+          "name": "constant.character.escape.effekt",
+          "match": "\\\\((u[0-9a-fA-F]{4})|.)"
         }, {
-          "match": "\\\\.",
-          "name": "constant.character.escape.effekt"
+          "include": "#stringTemplates"
         }]
       }]
     },
+    "names": {
+      "patterns": [{
+        "match": "\\b([a-z][a-zA-Z0-9_]*)\\b[\\s]*[({\\[]",
+        "captures": {
+          "1": { "name": "entity.name.function" }
+        }
+      }, {
+        "match": "\\b[a-z][a-zA-Z0-9_]*\\b",
+        "name": "variable"
+      }, {
+        "match": "\\b[A-Z][a-zA-Z0-9_]*\\b",
+        "name": "entity.name.type"
+      }]
+    },
     "stringTemplates": {
       "begin": "\\$\\{",
       "beginCaptures": {
@@ -166,27 +186,6 @@
         { "include": "$self" }
       ]
     },
-    "characters": {
-      "patterns": [{
-        "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": "[{}\\(\\)\\[\\];,]",