From 6a9994c811798d157fe953f15f20ec7122e4c720 Mon Sep 17 00:00:00 2001
From: Timothy Warren <twarren@nabancard.com>
Date: Fri, 3 Dec 2021 11:59:55 -0500
Subject: [PATCH] Update test snapshots

---
 .../EditorTest__testOpenPHP__1.json           | 4890 ++++++++---------
 .../EditorTest__testOpen__1.json              | 3274 +++++------
 2 files changed, 4082 insertions(+), 4082 deletions(-)

diff --git a/tests/__snapshots__/EditorTest__testOpenPHP__1.json b/tests/__snapshots__/EditorTest__testOpenPHP__1.json
index f787657..65c0898 100644
--- a/tests/__snapshots__/EditorTest__testOpenPHP__1.json
+++ b/tests/__snapshots__/EditorTest__testOpenPHP__1.json
@@ -20,13 +20,13 @@
         "tokens": {
             "1": [
                 {
-                    "type": 390,
+                    "type": 389,
                     "typeName": "T_OPEN_TAG",
                     "char": "<?php ",
                     "line": 1
                 },
                 {
-                    "type": 334,
+                    "type": 299,
                     "typeName": "T_DECLARE",
                     "char": "declare",
                     "line": 1
@@ -38,7 +38,7 @@
                     "line": 1
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "strict_types",
                     "line": 1
@@ -50,7 +50,7 @@
                     "line": 1
                 },
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "1",
                     "line": 1
@@ -68,7 +68,7 @@
                     "line": 1
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 1
@@ -77,25 +77,25 @@
             "2": [],
             "3": [
                 {
-                    "type": 368,
+                    "type": 335,
                     "typeName": "T_INTERFACE",
                     "char": "interface",
                     "line": 3
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 3
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "Ifoo",
                     "line": 3
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 3
@@ -113,7 +113,7 @@
                     "line": 3
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 3
@@ -122,61 +122,61 @@
             "4": [],
             "5": [
                 {
-                    "type": 356,
+                    "type": 322,
                     "typeName": "T_ABSTRACT",
                     "char": "abstract",
                     "line": 5
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 5
                 },
                 {
-                    "type": 366,
+                    "type": 333,
                     "typeName": "T_CLASS",
                     "char": "class",
                     "line": 5
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 5
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "Foo",
                     "line": 5
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 5
                 },
                 {
-                    "type": 370,
+                    "type": 338,
                     "typeName": "T_IMPLEMENTS",
                     "char": "implements",
                     "line": 5
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 5
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "Ifoo",
                     "line": 5
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 5
@@ -188,7 +188,7 @@
                     "line": 5
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 5
@@ -196,7 +196,7 @@
             ],
             "6": [
                 {
-                    "type": 389,
+                    "type": 388,
                     "typeName": "T_DOC_COMMENT",
                     "char": "\/**",
                     "line": 6,
@@ -271,7 +271,7 @@
                     "line": 13
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 13
@@ -279,43 +279,43 @@
             ],
             "14": [
                 {
-                    "type": 356,
+                    "type": 322,
                     "typeName": "T_ABSTRACT",
                     "char": "abstract",
                     "line": 14
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 14
                 },
                 {
-                    "type": 360,
+                    "type": 326,
                     "typeName": "T_PUBLIC",
                     "char": "public",
                     "line": 14
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 14
                 },
                 {
-                    "type": 345,
+                    "type": 310,
                     "typeName": "T_FUNCTION",
                     "char": "function",
                     "line": 14
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 14
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "bar",
                     "line": 14
@@ -327,19 +327,19 @@
                     "line": 14
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "int",
                     "line": 14
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 14
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$a",
                     "line": 14
@@ -351,25 +351,25 @@
                     "line": 14
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 14
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "float",
                     "line": 14
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 14
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$b",
                     "line": 14
@@ -381,25 +381,25 @@
                     "line": 14
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 14
                 },
                 {
-                    "type": 373,
+                    "type": 341,
                     "typeName": "T_ARRAY",
                     "char": "array",
                     "line": 14
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 14
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$c",
                     "line": 14
@@ -411,25 +411,25 @@
                     "line": 14
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 14
                 },
                 {
-                    "type": 374,
+                    "type": 342,
                     "typeName": "T_CALLABLE",
                     "char": "callable",
                     "line": 14
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 14
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$d",
                     "line": 14
@@ -441,25 +441,25 @@
                     "line": 14
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 14
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "string",
                     "line": 14
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 14
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$e",
                     "line": 14
@@ -477,13 +477,13 @@
                     "line": 14
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 14
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "string",
                     "line": 14
@@ -495,7 +495,7 @@
                     "line": 14
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n    ",
                     "line": 14
@@ -504,31 +504,31 @@
             "15": [],
             "16": [
                 {
-                    "type": 359,
+                    "type": 325,
                     "typeName": "T_PROTECTED",
                     "char": "protected",
                     "line": 16
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 16
                 },
                 {
-                    "type": 345,
+                    "type": 310,
                     "typeName": "T_FUNCTION",
                     "char": "function",
                     "line": 16
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 16
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "doNothing",
                     "line": 16
@@ -552,19 +552,19 @@
                     "line": 16
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 16
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "void",
                     "line": 16
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 16
@@ -582,7 +582,7 @@
                     "line": 16
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 16
@@ -596,7 +596,7 @@
                     "line": 17
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 17
@@ -605,25 +605,25 @@
             "18": [],
             "19": [
                 {
-                    "type": 366,
+                    "type": 333,
                     "typeName": "T_CLASS",
                     "char": "class",
                     "line": 19
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 19
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "Test",
                     "line": 19
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 19
@@ -635,7 +635,7 @@
                     "line": 19
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 19
@@ -643,31 +643,31 @@
             ],
             "20": [
                 {
-                    "type": 360,
+                    "type": 326,
                     "typeName": "T_PUBLIC",
                     "char": "public",
                     "line": 20
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 20
                 },
                 {
-                    "type": 345,
+                    "type": 310,
                     "typeName": "T_FUNCTION",
                     "char": "function",
                     "line": 20
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 20
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "__construct",
                     "line": 20
@@ -679,31 +679,31 @@
                     "line": 20
                 },
                 {
-                    "type": 360,
+                    "type": 326,
                     "typeName": "T_PUBLIC",
                     "char": "public",
                     "line": 20
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 20
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "string",
                     "line": 20
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 20
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$foo",
                     "line": 20
@@ -715,37 +715,37 @@
                     "line": 20
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 20
                 },
                 {
-                    "type": 360,
+                    "type": 326,
                     "typeName": "T_PUBLIC",
                     "char": "public",
                     "line": 20
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 20
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "string",
                     "line": 20
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 20
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$bar",
                     "line": 20
@@ -757,7 +757,7 @@
                     "line": 20
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 20
@@ -775,7 +775,7 @@
                     "line": 20
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 20
@@ -789,7 +789,7 @@
                     "line": 21
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 21
@@ -798,7 +798,7 @@
             "22": [],
             "23": [
                 {
-                    "type": 389,
+                    "type": 388,
                     "typeName": "T_DOC_COMMENT",
                     "char": "\/**",
                     "line": 23,
@@ -828,7 +828,7 @@
                     "line": 25
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 25
@@ -836,73 +836,73 @@
             ],
             "26": [
                 {
-                    "type": 366,
+                    "type": 333,
                     "typeName": "T_CLASS",
                     "char": "class",
                     "line": 26
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 26
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "FooBar",
                     "line": 26
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 26
                 },
                 {
-                    "type": 369,
+                    "type": 337,
                     "typeName": "T_EXTENDS",
                     "char": "extends",
                     "line": 26
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 26
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "Foo",
                     "line": 26
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 26
                 },
                 {
-                    "type": 370,
+                    "type": 338,
                     "typeName": "T_IMPLEMENTS",
                     "char": "implements",
                     "line": 26
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 26
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "Ifoo",
                     "line": 26
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 26
@@ -914,7 +914,7 @@
                     "line": 26
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 26
@@ -922,31 +922,31 @@
             ],
             "27": [
                 {
-                    "type": 360,
+                    "type": 326,
                     "typeName": "T_PUBLIC",
                     "char": "public",
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 27
                 },
                 {
-                    "type": 345,
+                    "type": 310,
                     "typeName": "T_FUNCTION",
                     "char": "function",
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 27
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "bar",
                     "line": 27
@@ -958,19 +958,19 @@
                     "line": 27
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "int",
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 27
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$a",
                     "line": 27
@@ -982,25 +982,25 @@
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 27
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "float",
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 27
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$b",
                     "line": 27
@@ -1012,25 +1012,25 @@
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 27
                 },
                 {
-                    "type": 373,
+                    "type": 341,
                     "typeName": "T_ARRAY",
                     "char": "array",
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 27
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$c",
                     "line": 27
@@ -1042,25 +1042,25 @@
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 27
                 },
                 {
-                    "type": 374,
+                    "type": 342,
                     "typeName": "T_CALLABLE",
                     "char": "callable",
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 27
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$d",
                     "line": 27
@@ -1072,31 +1072,31 @@
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 27
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "string",
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 27
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$e",
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 27
@@ -1108,13 +1108,13 @@
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 27
                 },
                 {
-                    "type": 318,
+                    "type": 269,
                     "typeName": "T_CONSTANT_ENCAPSED_STRING",
                     "char": "'default'",
                     "line": 27
@@ -1132,19 +1132,19 @@
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 27
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "string",
                     "line": 27
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 27
@@ -1158,7 +1158,7 @@
                     "line": 28
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n        ",
                     "line": 28
@@ -1166,13 +1166,13 @@
             ],
             "29": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$cstr",
                     "line": 29
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 29
@@ -1184,13 +1184,13 @@
                     "line": 29
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 29
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "print_r",
                     "line": 29
@@ -1202,7 +1202,7 @@
                     "line": 29
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$c",
                     "line": 29
@@ -1214,13 +1214,13 @@
                     "line": 29
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 29
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "TRUE",
                     "line": 29
@@ -1238,7 +1238,7 @@
                     "line": 29
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n        ",
                     "line": 29
@@ -1246,7 +1246,7 @@
             ],
             "30": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$d",
                     "line": 30
@@ -1270,7 +1270,7 @@
                     "line": 30
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n        ",
                     "line": 30
@@ -1279,13 +1279,13 @@
             "31": [],
             "32": [
                 {
-                    "type": 348,
+                    "type": 313,
                     "typeName": "T_RETURN",
                     "char": "return",
                     "line": 32
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 32
@@ -1297,13 +1297,13 @@
                     "line": 32
                 },
                 {
-                    "type": 397,
+                    "type": 396,
                     "typeName": "T_CURLY_OPEN",
                     "char": "{",
                     "line": 32
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$a",
                     "line": 32
@@ -1315,19 +1315,19 @@
                     "line": 32
                 },
                 {
-                    "type": 317,
+                    "type": 268,
                     "typeName": "T_ENCAPSED_AND_WHITESPACE",
                     "char": ", ",
                     "line": 32
                 },
                 {
-                    "type": 396,
+                    "type": 395,
                     "typeName": "T_DOLLAR_OPEN_CURLY_BRACES",
                     "char": "${",
                     "line": 32
                 },
                 {
-                    "type": 319,
+                    "type": 270,
                     "typeName": "T_STRING_VARNAME",
                     "char": "b",
                     "line": 32
@@ -1339,7 +1339,7 @@
                     "line": 32
                 },
                 {
-                    "type": 317,
+                    "type": 268,
                     "typeName": "T_ENCAPSED_AND_WHITESPACE",
                     "char": ", ",
                     "line": 32
@@ -1351,7 +1351,7 @@
                     "line": 32
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 32
@@ -1363,13 +1363,13 @@
                     "line": 32
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 32
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$cstr",
                     "line": 32
@@ -1381,7 +1381,7 @@
                     "line": 32
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 32
@@ -1395,7 +1395,7 @@
                     "line": 33
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n    ",
                     "line": 33
@@ -1404,31 +1404,31 @@
             "34": [],
             "35": [
                 {
-                    "type": 358,
+                    "type": 324,
                     "typeName": "T_PRIVATE",
                     "char": "private",
                     "line": 35
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 35
                 },
                 {
-                    "type": 345,
+                    "type": 310,
                     "typeName": "T_FUNCTION",
                     "char": "function",
                     "line": 35
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 35
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "operations",
                     "line": 35
@@ -1440,19 +1440,19 @@
                     "line": 35
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "int",
                     "line": 35
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 35
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$a",
                     "line": 35
@@ -1464,25 +1464,25 @@
                     "line": 35
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 35
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "int",
                     "line": 35
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 35
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$b",
                     "line": 35
@@ -1500,19 +1500,19 @@
                     "line": 35
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 35
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "int",
                     "line": 35
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 35
@@ -1526,7 +1526,7 @@
                     "line": 36
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n        ",
                     "line": 36
@@ -1534,31 +1534,31 @@
             ],
             "37": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$this",
                     "line": 37
                 },
                 {
-                    "type": 387,
+                    "type": 385,
                     "typeName": "T_NULLSAFE_OBJECT_OPERATOR",
                     "char": "?->",
                     "line": 37
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "x",
                     "line": 37
                 },
                 {
-                    "type": 387,
+                    "type": 385,
                     "typeName": "T_NULLSAFE_OBJECT_OPERATOR",
                     "char": "?->",
                     "line": 37
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "bar",
                     "line": 37
@@ -1582,7 +1582,7 @@
                     "line": 37
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n        ",
                     "line": 37
@@ -1591,19 +1591,19 @@
             "38": [],
             "39": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$this",
                     "line": 39
                 },
                 {
-                    "type": 386,
+                    "type": 384,
                     "typeName": "T_OBJECT_OPERATOR",
                     "char": "->",
                     "line": 39
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "doNothing",
                     "line": 39
@@ -1627,7 +1627,7 @@
                     "line": 39
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n        ",
                     "line": 39
@@ -1636,13 +1636,13 @@
             "40": [],
             "41": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$c",
                     "line": 41
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 41
@@ -1654,19 +1654,19 @@
                     "line": 41
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 41
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$a",
                     "line": 41
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 41
@@ -1678,13 +1678,13 @@
                     "line": 41
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 41
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$b",
                     "line": 41
@@ -1696,7 +1696,7 @@
                     "line": 41
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n        ",
                     "line": 41
@@ -1704,13 +1704,13 @@
             ],
             "42": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$a",
                     "line": 42
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 42
@@ -1722,19 +1722,19 @@
                     "line": 42
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 42
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$c",
                     "line": 42
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 42
@@ -1746,13 +1746,13 @@
                     "line": 42
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 42
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$b",
                     "line": 42
@@ -1764,7 +1764,7 @@
                     "line": 42
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n        ",
                     "line": 42
@@ -1773,13 +1773,13 @@
             "43": [],
             "44": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$c",
                     "line": 44
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 44
@@ -1791,19 +1791,19 @@
                     "line": 44
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 44
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$a",
                     "line": 44
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 44
@@ -1815,13 +1815,13 @@
                     "line": 44
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 44
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$b",
                     "line": 44
@@ -1833,7 +1833,7 @@
                     "line": 44
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n        ",
                     "line": 44
@@ -1841,13 +1841,13 @@
             ],
             "45": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$b",
                     "line": 45
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 45
@@ -1859,19 +1859,19 @@
                     "line": 45
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 45
                 },
                 {
-                    "type": 297,
+                    "type": 377,
                     "typeName": "T_INT_CAST",
                     "char": "(int)",
                     "line": 45
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 45
@@ -1883,13 +1883,13 @@
                     "line": 45
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$c",
                     "line": 45
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 45
@@ -1901,13 +1901,13 @@
                     "line": 45
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 45
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$a",
                     "line": 45
@@ -1925,7 +1925,7 @@
                     "line": 45
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n        ",
                     "line": 45
@@ -1934,19 +1934,19 @@
             "46": [],
             "47": [
                 {
-                    "type": 348,
+                    "type": 313,
                     "typeName": "T_RETURN",
                     "char": "return",
                     "line": 47
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 47
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$c",
                     "line": 47
@@ -1958,7 +1958,7 @@
                     "line": 47
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 47
@@ -1972,7 +1972,7 @@
                     "line": 48
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 48
@@ -1986,7 +1986,7 @@
                     "line": 49
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 49
@@ -1995,25 +1995,25 @@
             "50": [],
             "51": [
                 {
-                    "type": 367,
+                    "type": 334,
                     "typeName": "T_TRAIT",
                     "char": "trait",
                     "line": 51
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 51
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "Baz",
                     "line": 51
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 51
@@ -2025,7 +2025,7 @@
                     "line": 51
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 51
@@ -2033,31 +2033,31 @@
             ],
             "52": [
                 {
-                    "type": 360,
+                    "type": 326,
                     "typeName": "T_PUBLIC",
                     "char": "public",
                     "line": 52
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 52
                 },
                 {
-                    "type": 345,
+                    "type": 310,
                     "typeName": "T_FUNCTION",
                     "char": "function",
                     "line": 52
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 52
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "about",
                     "line": 52
@@ -2081,19 +2081,19 @@
                     "line": 52
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 52
                 },
                 {
-                    "type": 373,
+                    "type": 341,
                     "typeName": "T_ARRAY",
                     "char": "array",
                     "line": 52
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 52
@@ -2107,7 +2107,7 @@
                     "line": 53
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n        ",
                     "line": 53
@@ -2115,13 +2115,13 @@
             ],
             "54": [
                 {
-                    "type": 348,
+                    "type": 313,
                     "typeName": "T_RETURN",
                     "char": "return",
                     "line": 54
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 54
@@ -2133,7 +2133,7 @@
                     "line": 54
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n            ",
                     "line": 54
@@ -2141,31 +2141,31 @@
             ],
             "55": [
                 {
-                    "type": 318,
+                    "type": 269,
                     "typeName": "T_CONSTANT_ENCAPSED_STRING",
                     "char": "'__CLASS__'",
                     "line": 55
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 55
                 },
                 {
-                    "type": 269,
+                    "type": 386,
                     "typeName": "T_DOUBLE_ARROW",
                     "char": "=>",
                     "line": 55
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 55
                 },
                 {
-                    "type": 378,
+                    "type": 346,
                     "typeName": "T_CLASS_C",
                     "char": "__CLASS__",
                     "line": 55
@@ -2177,7 +2177,7 @@
                     "line": 55
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n            ",
                     "line": 55
@@ -2185,31 +2185,31 @@
             ],
             "56": [
                 {
-                    "type": 318,
+                    "type": 269,
                     "typeName": "T_CONSTANT_ENCAPSED_STRING",
                     "char": "'__DIR__'",
                     "line": 56
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 56
                 },
                 {
-                    "type": 269,
+                    "type": 386,
                     "typeName": "T_DOUBLE_ARROW",
                     "char": "=>",
                     "line": 56
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 56
                 },
                 {
-                    "type": 377,
+                    "type": 345,
                     "typeName": "T_DIR",
                     "char": "__DIR__",
                     "line": 56
@@ -2221,7 +2221,7 @@
                     "line": 56
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n            ",
                     "line": 56
@@ -2229,31 +2229,31 @@
             ],
             "57": [
                 {
-                    "type": 318,
+                    "type": 269,
                     "typeName": "T_CONSTANT_ENCAPSED_STRING",
                     "char": "'__FILE__'",
                     "line": 57
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 57
                 },
                 {
-                    "type": 269,
+                    "type": 386,
                     "typeName": "T_DOUBLE_ARROW",
                     "char": "=>",
                     "line": 57
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 57
                 },
                 {
-                    "type": 376,
+                    "type": 344,
                     "typeName": "T_FILE",
                     "char": "__FILE__",
                     "line": 57
@@ -2265,7 +2265,7 @@
                     "line": 57
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n            ",
                     "line": 57
@@ -2273,31 +2273,31 @@
             ],
             "58": [
                 {
-                    "type": 318,
+                    "type": 269,
                     "typeName": "T_CONSTANT_ENCAPSED_STRING",
                     "char": "'__FUNCTION__'",
                     "line": 58
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 58
                 },
                 {
-                    "type": 269,
+                    "type": 386,
                     "typeName": "T_DOUBLE_ARROW",
                     "char": "=>",
                     "line": 58
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 58
                 },
                 {
-                    "type": 381,
+                    "type": 349,
                     "typeName": "T_FUNC_C",
                     "char": "__FUNCTION__",
                     "line": 58
@@ -2309,7 +2309,7 @@
                     "line": 58
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n            ",
                     "line": 58
@@ -2317,31 +2317,31 @@
             ],
             "59": [
                 {
-                    "type": 318,
+                    "type": 269,
                     "typeName": "T_CONSTANT_ENCAPSED_STRING",
                     "char": "'__LINE__'",
                     "line": 59
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 59
                 },
                 {
-                    "type": 269,
+                    "type": 386,
                     "typeName": "T_DOUBLE_ARROW",
                     "char": "=>",
                     "line": 59
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 59
                 },
                 {
-                    "type": 375,
+                    "type": 343,
                     "typeName": "T_LINE",
                     "char": "__LINE__",
                     "line": 59
@@ -2353,7 +2353,7 @@
                     "line": 59
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n            ",
                     "line": 59
@@ -2361,31 +2361,31 @@
             ],
             "60": [
                 {
-                    "type": 318,
+                    "type": 269,
                     "typeName": "T_CONSTANT_ENCAPSED_STRING",
                     "char": "'__METHOD__'",
                     "line": 60
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 60
                 },
                 {
-                    "type": 269,
+                    "type": 386,
                     "typeName": "T_DOUBLE_ARROW",
                     "char": "=>",
                     "line": 60
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 60
                 },
                 {
-                    "type": 380,
+                    "type": 348,
                     "typeName": "T_METHOD_C",
                     "char": "__METHOD__",
                     "line": 60
@@ -2397,7 +2397,7 @@
                     "line": 60
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n            ",
                     "line": 60
@@ -2405,31 +2405,31 @@
             ],
             "61": [
                 {
-                    "type": 318,
+                    "type": 269,
                     "typeName": "T_CONSTANT_ENCAPSED_STRING",
                     "char": "'__NAMESPACE__'",
                     "line": 61
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 61
                 },
                 {
-                    "type": 269,
+                    "type": 386,
                     "typeName": "T_DOUBLE_ARROW",
                     "char": "=>",
                     "line": 61
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 61
                 },
                 {
-                    "type": 382,
+                    "type": 350,
                     "typeName": "T_NS_C",
                     "char": "__NAMESPACE__",
                     "line": 61
@@ -2441,7 +2441,7 @@
                     "line": 61
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n            ",
                     "line": 61
@@ -2449,31 +2449,31 @@
             ],
             "62": [
                 {
-                    "type": 318,
+                    "type": 269,
                     "typeName": "T_CONSTANT_ENCAPSED_STRING",
                     "char": "'__TRAIT__'",
                     "line": 62
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 62
                 },
                 {
-                    "type": 269,
+                    "type": 386,
                     "typeName": "T_DOUBLE_ARROW",
                     "char": "=>",
                     "line": 62
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 62
                 },
                 {
-                    "type": 379,
+                    "type": 347,
                     "typeName": "T_TRAIT_C",
                     "char": "__TRAIT__",
                     "line": 62
@@ -2485,7 +2485,7 @@
                     "line": 62
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n        ",
                     "line": 62
@@ -2505,7 +2505,7 @@
                     "line": 63
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 63
@@ -2519,7 +2519,7 @@
                     "line": 64
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 64
@@ -2533,7 +2533,7 @@
                     "line": 65
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 65
@@ -2542,13 +2542,13 @@
             "66": [],
             "67": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$square",
                     "line": 67
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 67
@@ -2560,19 +2560,19 @@
                     "line": 67
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 67
                 },
                 {
-                    "type": 346,
+                    "type": 311,
                     "typeName": "T_FN",
                     "char": "fn",
                     "line": 67
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 67
@@ -2584,19 +2584,19 @@
                     "line": 67
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "int",
                     "line": 67
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 67
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$x",
                     "line": 67
@@ -2608,49 +2608,49 @@
                     "line": 67
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 67
                 },
                 {
-                    "type": 269,
+                    "type": 386,
                     "typeName": "T_DOUBLE_ARROW",
                     "char": "=>",
                     "line": 67
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 67
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$x",
                     "line": 67
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 67
                 },
                 {
-                    "type": 304,
+                    "type": 401,
                     "typeName": "T_POW",
                     "char": "**",
                     "line": 67
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 67
                 },
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "2",
                     "line": 67
@@ -2662,7 +2662,7 @@
                     "line": 67
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 67
@@ -2671,13 +2671,13 @@
             "68": [],
             "69": [
                 {
-                    "type": 332,
+                    "type": 297,
                     "typeName": "T_FOREACH",
                     "char": "foreach",
                     "line": 69
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 69
@@ -2701,7 +2701,7 @@
                     "line": 69
                 },
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "1",
                     "line": 69
@@ -2713,13 +2713,13 @@
                     "line": 69
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 69
                 },
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "0",
                     "line": 69
@@ -2731,13 +2731,13 @@
                     "line": 69
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 69
                 },
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "1",
                     "line": 69
@@ -2749,13 +2749,13 @@
                     "line": 69
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 69
                 },
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "2",
                     "line": 69
@@ -2767,25 +2767,25 @@
                     "line": 69
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 69
                 },
                 {
-                    "type": 336,
+                    "type": 301,
                     "typeName": "T_AS",
                     "char": "as",
                     "line": 69
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 69
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$x",
                     "line": 69
@@ -2797,7 +2797,7 @@
                     "line": 69
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 69
@@ -2811,7 +2811,7 @@
                     "line": 70
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 70
@@ -2819,13 +2819,13 @@
             ],
             "71": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$not",
                     "line": 71
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 71
@@ -2837,19 +2837,19 @@
                     "line": 71
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 71
                 },
                 {
-                    "type": 341,
+                    "type": 306,
                     "typeName": "T_MATCH",
                     "char": "match",
                     "line": 71
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 71
@@ -2861,7 +2861,7 @@
                     "line": 71
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$x",
                     "line": 71
@@ -2873,7 +2873,7 @@
                     "line": 71
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 71
@@ -2885,7 +2885,7 @@
                     "line": 71
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n        ",
                     "line": 71
@@ -2893,31 +2893,31 @@
             ],
             "72": [
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "0",
                     "line": 72
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 72
                 },
                 {
-                    "type": 269,
+                    "type": 386,
                     "typeName": "T_DOUBLE_ARROW",
                     "char": "=>",
                     "line": 72
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 72
                 },
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "1",
                     "line": 72
@@ -2929,7 +2929,7 @@
                     "line": 72
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n        ",
                     "line": 72
@@ -2937,7 +2937,7 @@
             ],
             "73": [
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "1",
                     "line": 73
@@ -2955,31 +2955,31 @@
                     "line": 73
                 },
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "1",
                     "line": 73
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 73
                 },
                 {
-                    "type": 269,
+                    "type": 386,
                     "typeName": "T_DOUBLE_ARROW",
                     "char": "=>",
                     "line": 73
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 73
                 },
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "0",
                     "line": 73
@@ -2991,7 +2991,7 @@
                     "line": 73
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n        ",
                     "line": 73
@@ -2999,31 +2999,31 @@
             ],
             "74": [
                 {
-                    "type": 340,
+                    "type": 305,
                     "typeName": "T_DEFAULT",
                     "char": "default",
                     "line": 74
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 74
                 },
                 {
-                    "type": 269,
+                    "type": 386,
                     "typeName": "T_DOUBLE_ARROW",
                     "char": "=>",
                     "line": 74
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 74
                 },
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "0",
                     "line": 74
@@ -3035,7 +3035,7 @@
                     "line": 74
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 74
@@ -3055,7 +3055,7 @@
                     "line": 75
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 75
@@ -3069,7 +3069,7 @@
                     "line": 76
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 76
@@ -3078,7 +3078,7 @@
             "77": [],
             "78": [
                 {
-                    "type": 388,
+                    "type": 387,
                     "typeName": "T_COMMENT",
                     "char": "\/*",
                     "line": 78,
@@ -3108,7 +3108,7 @@
                     "line": 80
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 80
@@ -3116,13 +3116,13 @@
             ],
             "81": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$foobar",
                     "line": 81
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 81
@@ -3134,25 +3134,25 @@
                     "line": 81
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 81
                 },
                 {
-                    "type": 322,
+                    "type": 284,
                     "typeName": "T_NEW",
                     "char": "new",
                     "line": 81
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 81
                 },
                 {
-                    "type": 311,
+                    "type": 262,
                     "typeName": "T_STRING",
                     "char": "FooBar",
                     "line": 81
@@ -3176,7 +3176,7 @@
                     "line": 81
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 81
@@ -3185,13 +3185,13 @@
             "82": [],
             "83": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$baz",
                     "line": 83
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 83
@@ -3203,7 +3203,7 @@
                     "line": 83
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 83
@@ -3215,31 +3215,31 @@
                     "line": 83
                 },
                 {
-                    "type": 318,
+                    "type": 269,
                     "typeName": "T_CONSTANT_ENCAPSED_STRING",
                     "char": "'a'",
                     "line": 83
                 },
                 {
-                    "type": 393,
+                    "type": 392,
+                    "typeName": "T_WHITESPACE",
+                    "char": " ",
+                    "line": 83
+                },
+                {
+                    "type": 386,
+                    "typeName": "T_DOUBLE_ARROW",
+                    "char": "=>",
+                    "line": 83
+                },
+                {
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 83
                 },
                 {
                     "type": 269,
-                    "typeName": "T_DOUBLE_ARROW",
-                    "char": "=>",
-                    "line": 83
-                },
-                {
-                    "type": 393,
-                    "typeName": "T_WHITESPACE",
-                    "char": " ",
-                    "line": 83
-                },
-                {
-                    "type": 318,
                     "typeName": "T_CONSTANT_ENCAPSED_STRING",
                     "char": "'b'",
                     "line": 83
@@ -3257,7 +3257,7 @@
                     "line": 83
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 83
@@ -3266,13 +3266,13 @@
             "84": [],
             "85": [
                 {
-                    "type": 388,
+                    "type": 387,
                     "typeName": "T_COMMENT",
                     "char": "\/\/ C++ style comment",
                     "line": 85
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 85
@@ -3280,13 +3280,13 @@
             ],
             "86": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$x",
                     "line": 86
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 86
@@ -3298,13 +3298,13 @@
                     "line": 86
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 86
                 },
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "3",
                     "line": 86
@@ -3316,7 +3316,7 @@
                     "line": 86
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 86
@@ -3325,13 +3325,13 @@
             "87": [],
             "88": [
                 {
-                    "type": 388,
+                    "type": 387,
                     "typeName": "T_COMMENT",
                     "char": "# Perl-style comment",
                     "line": 88
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 88
@@ -3339,13 +3339,13 @@
             ],
             "89": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$y",
                     "line": 89
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 89
@@ -3357,7 +3357,7 @@
                     "line": 89
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 89
@@ -3369,7 +3369,7 @@
                     "line": 89
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 89
@@ -3377,7 +3377,7 @@
             ],
             "90": [
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "1",
                     "line": 90
@@ -3389,7 +3389,7 @@
                     "line": 90
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 90
@@ -3397,7 +3397,7 @@
             ],
             "91": [
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "2",
                     "line": 91
@@ -3409,7 +3409,7 @@
                     "line": 91
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 91
@@ -3417,13 +3417,13 @@
             ],
             "92": [
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "3",
                     "line": 92
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 92
@@ -3443,7 +3443,7 @@
                     "line": 93
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 93
@@ -3452,13 +3452,13 @@
             "94": [],
             "95": [
                 {
-                    "type": 388,
+                    "type": 387,
                     "typeName": "T_COMMENT",
                     "char": "\/\/ Multi-line ternary statement",
                     "line": 95
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 95
@@ -3466,13 +3466,13 @@
             ],
             "96": [
                 {
-                    "type": 388,
+                    "type": 387,
                     "typeName": "T_COMMENT",
                     "char": "#{Attribute]",
                     "line": 96
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 96
@@ -3480,13 +3480,13 @@
             ],
             "97": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$q",
                     "line": 97
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 97
@@ -3498,7 +3498,7 @@
                     "line": 97
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 97
@@ -3510,31 +3510,31 @@
                     "line": 97
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$x",
                     "line": 97
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 97
                 },
                 {
-                    "type": 290,
+                    "type": 369,
                     "typeName": "T_IS_NOT_IDENTICAL",
                     "char": "!==",
                     "line": 97
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 97
                 },
                 {
-                    "type": 309,
+                    "type": 260,
                     "typeName": "T_LNUMBER",
                     "char": "2",
                     "line": 97
@@ -3546,7 +3546,7 @@
                     "line": 97
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 97
@@ -3560,19 +3560,19 @@
                     "line": 98
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 98
                 },
                 {
-                    "type": 318,
+                    "type": 269,
                     "typeName": "T_CONSTANT_ENCAPSED_STRING",
                     "char": "'yes'",
                     "line": 98
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n    ",
                     "line": 98
@@ -3586,13 +3586,13 @@
                     "line": 99
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 99
                 },
                 {
-                    "type": 318,
+                    "type": 269,
                     "typeName": "T_CONSTANT_ENCAPSED_STRING",
                     "char": "'no'",
                     "line": 99
@@ -3604,7 +3604,7 @@
                     "line": 99
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 99
@@ -3613,7 +3613,7 @@
             "100": [],
             "101": [
                 {
-                    "type": 388,
+                    "type": 387,
                     "typeName": "T_COMMENT",
                     "char": "\/*",
                     "line": 101,
@@ -3643,13 +3643,13 @@
                     "line": 103
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$z",
                     "line": 103
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 103
@@ -3661,19 +3661,19 @@
                     "line": 103
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 103
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$x",
                     "line": 103
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 103
@@ -3685,13 +3685,13 @@
                     "line": 103
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 103
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$y",
                     "line": 103
@@ -3703,7 +3703,7 @@
                     "line": 103
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 103
@@ -3711,13 +3711,13 @@
             ],
             "104": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$sql",
                     "line": 104
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 104
@@ -3729,13 +3729,13 @@
                     "line": 104
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 104
                 },
                 {
-                    "type": 394,
+                    "type": 393,
                     "typeName": "T_START_HEREDOC",
                     "char": "<<<SQL",
                     "line": 104,
@@ -3750,19 +3750,19 @@
             ],
             "105": [
                 {
-                    "type": 317,
+                    "type": 268,
                     "typeName": "T_ENCAPSED_AND_WHITESPACE",
                     "char": "    SELECT * FROM \"foo\" WHERE \"bar\"='baz' AND id=",
                     "line": 105
                 },
                 {
-                    "type": 397,
+                    "type": 396,
                     "typeName": "T_CURLY_OPEN",
                     "char": "{",
                     "line": 105
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$x",
                     "line": 105
@@ -3774,7 +3774,7 @@
                     "line": 105
                 },
                 {
-                    "type": 317,
+                    "type": 268,
                     "typeName": "T_ENCAPSED_AND_WHITESPACE",
                     "char": ";",
                     "line": 105,
@@ -3789,7 +3789,7 @@
             ],
             "106": [
                 {
-                    "type": 395,
+                    "type": 394,
                     "typeName": "T_END_HEREDOC",
                     "char": "SQL",
                     "line": 106
@@ -3801,7 +3801,7 @@
                     "line": 106
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 106
@@ -3810,13 +3810,13 @@
             "107": [],
             "108": [
                 {
-                    "type": 388,
+                    "type": 387,
                     "typeName": "T_COMMENT",
                     "char": "\/* Nowdoc *\/",
                     "line": 108
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n",
                     "line": 108
@@ -3824,13 +3824,13 @@
             ],
             "109": [
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$template",
                     "line": 109
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 109
@@ -3842,13 +3842,13 @@
                     "line": 109
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 109
                 },
                 {
-                    "type": 394,
+                    "type": 393,
                     "typeName": "T_START_HEREDOC",
                     "char": "<<<'TEMPLATE'",
                     "line": 109,
@@ -3863,7 +3863,7 @@
             ],
             "110": [
                 {
-                    "type": 317,
+                    "type": 268,
                     "typeName": "T_ENCAPSED_AND_WHITESPACE",
                     "char": "    <foo>{x}<\/foo>",
                     "line": 110,
@@ -3878,7 +3878,7 @@
             ],
             "111": [
                 {
-                    "type": 395,
+                    "type": 394,
                     "typeName": "T_END_HEREDOC",
                     "char": "TEMPLATE",
                     "line": 111
@@ -3890,7 +3890,7 @@
                     "line": 111
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": "\n\n",
                     "line": 111
@@ -3899,7 +3899,7 @@
             "112": [],
             "113": [
                 {
-                    "type": 392,
+                    "type": 391,
                     "typeName": "T_CLOSE_TAG",
                     "char": "?>",
                     "line": 113,
@@ -3914,7 +3914,7 @@
             ],
             "114": [
                 {
-                    "type": 316,
+                    "type": 267,
                     "typeName": "T_INLINE_HTML",
                     "char": "<!DOCTYPE html>",
                     "line": 114,
@@ -3980,19 +3980,19 @@
                     "line": 120
                 },
                 {
-                    "type": 391,
+                    "type": 390,
                     "typeName": "T_OPEN_TAG_WITH_ECHO",
                     "char": "<?=",
                     "line": 120
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 120
                 },
                 {
-                    "type": 315,
+                    "type": 266,
                     "typeName": "T_VARIABLE",
                     "char": "$_SERVER",
                     "line": 120
@@ -4004,7 +4004,7 @@
                     "line": 120
                 },
                 {
-                    "type": 318,
+                    "type": 269,
                     "typeName": "T_CONSTANT_ENCAPSED_STRING",
                     "char": "'HTTP_HOST'",
                     "line": 120
@@ -4016,19 +4016,19 @@
                     "line": 120
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 120
                 },
                 {
-                    "type": 392,
+                    "type": 391,
                     "typeName": "T_CLOSE_TAG",
                     "char": "?>",
                     "line": 120
                 },
                 {
-                    "type": 316,
+                    "type": 267,
                     "typeName": "T_INLINE_HTML",
                     "char": "<\/h1>",
                     "line": 120,
@@ -4061,13 +4061,13 @@
             ],
             "123": [
                 {
-                    "type": 390,
+                    "type": 389,
                     "typeName": "T_OPEN_TAG",
                     "char": "<?php ",
                     "line": 123
                 },
                 {
-                    "type": 323,
+                    "type": 286,
                     "typeName": "T_EXIT",
                     "char": "exit",
                     "line": 123
@@ -4091,13 +4091,13 @@
                     "line": 123
                 },
                 {
-                    "type": 393,
+                    "type": 392,
                     "typeName": "T_WHITESPACE",
                     "char": " ",
                     "line": 123
                 },
                 {
-                    "type": 392,
+                    "type": 391,
                     "typeName": "T_CLOSE_TAG",
                     "char": "?>",
                     "line": 123,
@@ -4117,36 +4117,36 @@
             {
                 "render": "<?php declare(strict_types=1);",
                 "hl": [
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    9,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    7,
-                    6,
-                    9,
-                    7
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Delimiter",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Operator",
+                    "Number",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 0
             },
@@ -4158,23 +4158,23 @@
             {
                 "render": "interface Ifoo {}",
                 "hl": [
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    0,
-                    9,
-                    9
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Delimiter",
+                    "Delimiter"
                 ],
                 "idx": 2
             },
@@ -4186,336 +4186,336 @@
             {
                 "render": "abstract class Foo implements Ifoo {",
                 "hl": [
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    0,
-                    9
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Delimiter"
                 ],
                 "idx": 4
             },
             {
                 "render": "    \/**",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    2,
-                    2,
-                    2
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 5
             },
             {
                 "render": "     * @param int $a",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 6
             },
             {
                 "render": "     * @param float $b",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 7
             },
             {
                 "render": "     * @param array $c",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 8
             },
             {
                 "render": "     * @param callable $d",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 9
             },
             {
                 "render": "     * @param string $e",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 10
             },
             {
                 "render": "     * @return string",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 11
             },
             {
                 "render": "     *\/",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 12
             },
             {
                 "render": "    abstract public function bar(int $a, float $b, array $c, callable $d, string $e): string;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    9,
-                    12,
-                    12,
-                    12,
-                    0,
-                    8,
-                    8,
-                    7,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    0,
-                    8,
-                    8,
-                    7,
-                    0,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    0,
-                    8,
-                    8,
-                    7,
-                    0,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    8,
-                    8,
-                    7,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    0,
-                    8,
-                    8,
-                    9,
-                    7,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Delimiter",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Operator",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Operator",
+                    "Normal",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Operator",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Operator",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Delimiter",
+                    "Operator",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Operator"
                 ],
                 "idx": 13
             },
@@ -4527,56 +4527,56 @@
             {
                 "render": "    protected function doNothing(): void {}",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    9,
-                    9,
-                    7,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    0,
-                    9,
-                    9
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Delimiter",
+                    "Delimiter",
+                    "Operator",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Delimiter",
+                    "Delimiter"
                 ],
                 "idx": 15
             },
             {
                 "render": "}",
                 "hl": [
-                    9
+                    "Delimiter"
                 ],
                 "idx": 16
             },
@@ -4588,105 +4588,105 @@
             {
                 "render": "class Test {",
                 "hl": [
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    0,
-                    9
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Delimiter"
                 ],
                 "idx": 18
             },
             {
                 "render": "    public function __construct(public string $foo, public string $bar) {}",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    9,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    0,
-                    8,
-                    8,
-                    8,
-                    8,
-                    7,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    0,
-                    8,
-                    8,
-                    8,
-                    8,
-                    9,
-                    0,
-                    9,
-                    9
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Delimiter",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Operator",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Delimiter",
+                    "Normal",
+                    "Delimiter",
+                    "Delimiter"
                 ],
                 "idx": 19
             },
             {
                 "render": "}",
                 "hl": [
-                    9
+                    "Delimiter"
                 ],
                 "idx": 20
             },
@@ -4698,262 +4698,262 @@
             {
                 "render": "\/**",
                 "hl": [
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 22
             },
             {
                 "render": " * Docblock comment",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 23
             },
             {
                 "render": " *\/",
                 "hl": [
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 24
             },
             {
                 "render": "class FooBar extends Foo implements Ifoo {",
                 "hl": [
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    0,
-                    9
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Delimiter"
                 ],
                 "idx": 25
             },
             {
                 "render": "    public function bar(int $a, float $b, array $c, callable $d, string $e = 'default'): string",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    9,
-                    12,
-                    12,
-                    12,
-                    0,
-                    8,
-                    8,
-                    7,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    0,
-                    8,
-                    8,
-                    7,
-                    0,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    0,
-                    8,
-                    8,
-                    7,
-                    0,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    8,
-                    8,
-                    7,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    0,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    9,
-                    7,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Delimiter",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Operator",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Operator",
+                    "Normal",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Operator",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Operator",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "Delimiter",
+                    "Operator",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier"
                 ],
                 "idx": 26
             },
             {
                 "render": "    {",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    9
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter"
                 ],
                 "idx": 27
             },
             {
                 "render": "        $cstr = print_r($c, TRUE);",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    9,
-                    8,
-                    8,
-                    7,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    9,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Delimiter",
+                    "Variable",
+                    "Variable",
+                    "Operator",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 28
             },
             {
                 "render": "        $d();",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    8,
-                    8,
-                    9,
-                    9,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Delimiter",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 29
             },
@@ -4965,55 +4965,55 @@
             {
                 "render": "        return \"{$a}, ${b}, \" . $cstr;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    9,
-                    9,
-                    8,
-                    8,
-                    9,
-                    5,
-                    5,
-                    9,
-                    9,
-                    8,
-                    9,
-                    5,
-                    5,
-                    9,
-                    0,
-                    7,
-                    0,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Delimiter",
+                    "Delimiter",
+                    "Variable",
+                    "Variable",
+                    "Delimiter",
+                    "String",
+                    "String",
+                    "Delimiter",
+                    "Delimiter",
+                    "Variable",
+                    "Delimiter",
+                    "String",
+                    "String",
+                    "Delimiter",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Operator"
                 ],
                 "idx": 31
             },
             {
                 "render": "    }",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    9
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter"
                 ],
                 "idx": 32
             },
@@ -5025,101 +5025,101 @@
             {
                 "render": "    private function operations(int $a, int $b): int",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    9,
-                    12,
-                    12,
-                    12,
-                    0,
-                    8,
-                    8,
-                    7,
-                    0,
-                    12,
-                    12,
-                    12,
-                    0,
-                    8,
-                    8,
-                    9,
-                    7,
-                    0,
-                    12,
-                    12,
-                    12
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Delimiter",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Operator",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Delimiter",
+                    "Operator",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier"
                 ],
                 "idx": 34
             },
             {
                 "render": "    {",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    9
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter"
                 ],
                 "idx": 35
             },
             {
                 "render": "        $this?->x?->bar();",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    7,
-                    7,
-                    7,
-                    12,
-                    7,
-                    7,
-                    7,
-                    12,
-                    12,
-                    12,
-                    9,
-                    9,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Operator",
+                    "Operator",
+                    "Operator",
+                    "Identifier",
+                    "Operator",
+                    "Operator",
+                    "Operator",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Delimiter",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 36
             },
@@ -5131,33 +5131,33 @@
             {
                 "render": "        $this->doNothing();",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    7,
-                    7,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    9,
-                    9,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Operator",
+                    "Operator",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Delimiter",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 38
             },
@@ -5169,54 +5169,54 @@
             {
                 "render": "        $c = $a + $b;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    8,
-                    8,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Operator"
                 ],
                 "idx": 40
             },
             {
                 "render": "        $a = $c - $b;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    8,
-                    8,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Operator"
                 ],
                 "idx": 41
             },
@@ -5228,62 +5228,62 @@
             {
                 "render": "        $c = $a * $b;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    8,
-                    8,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Operator"
                 ],
                 "idx": 43
             },
             {
                 "render": "        $b = (int) ($c \/ $a);",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    9,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    8,
-                    8,
-                    9,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Delimiter",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 44
             },
@@ -5295,42 +5295,42 @@
             {
                 "render": "        return $c;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    8,
-                    8,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Operator"
                 ],
                 "idx": 46
             },
             {
                 "render": "    }",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    9
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter"
                 ],
                 "idx": 47
             },
             {
                 "render": "}",
                 "hl": [
-                    9
+                    "Delimiter"
                 ],
                 "idx": 48
             },
@@ -5342,476 +5342,476 @@
             {
                 "render": "trait Baz {",
                 "hl": [
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    0,
-                    9
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Delimiter"
                 ],
                 "idx": 50
             },
             {
                 "render": "    public function about(): array",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    9,
-                    9,
-                    7,
-                    0,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Delimiter",
+                    "Delimiter",
+                    "Operator",
+                    "Normal",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter"
                 ],
                 "idx": 51
             },
             {
                 "render": "    {",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    9
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter"
                 ],
                 "idx": 52
             },
             {
                 "render": "        return [",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    9
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Delimiter"
                 ],
                 "idx": 53
             },
             {
                 "render": "            '__CLASS__' => __CLASS__,",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    0,
-                    7,
-                    7,
-                    0,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 54
             },
             {
                 "render": "            '__DIR__' => __DIR__,",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    0,
-                    7,
-                    7,
-                    0,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 55
             },
             {
                 "render": "            '__FILE__' => __FILE__,",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    0,
-                    7,
-                    7,
-                    0,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 56
             },
             {
                 "render": "            '__FUNCTION__' => __FUNCTION__,",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    0,
-                    7,
-                    7,
-                    0,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 57
             },
             {
                 "render": "            '__LINE__' => __LINE__,",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    0,
-                    7,
-                    7,
-                    0,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 58
             },
             {
                 "render": "            '__METHOD__' => __METHOD__,",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    0,
-                    7,
-                    7,
-                    0,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 59
             },
             {
                 "render": "            '__NAMESPACE__' => __NAMESPACE__,",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    0,
-                    7,
-                    7,
-                    0,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 60
             },
             {
                 "render": "            '__TRAIT__' => __TRAIT__,",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    0,
-                    7,
-                    7,
-                    0,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    6,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 61
             },
             {
                 "render": "        ];",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    9,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 62
             },
             {
                 "render": "    }",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    9
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter"
                 ],
                 "idx": 63
             },
             {
                 "render": "}",
                 "hl": [
-                    9
+                    "Delimiter"
                 ],
                 "idx": 64
             },
@@ -5823,39 +5823,39 @@
             {
                 "render": "$square = fn (int $x) => $x ** 2;",
                 "hl": [
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    3,
-                    3,
-                    0,
-                    9,
-                    12,
-                    12,
-                    12,
-                    0,
-                    8,
-                    8,
-                    9,
-                    0,
-                    7,
-                    7,
-                    0,
-                    8,
-                    8,
-                    0,
-                    7,
-                    7,
-                    0,
-                    6,
-                    7
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Delimiter",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Delimiter",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 66
             },
@@ -5867,162 +5867,162 @@
             {
                 "render": "foreach ([-1, 0, 1, 2] as $x)",
                 "hl": [
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    9,
-                    9,
-                    7,
-                    6,
-                    7,
-                    0,
-                    6,
-                    7,
-                    0,
-                    6,
-                    7,
-                    0,
-                    6,
-                    9,
-                    0,
-                    7,
-                    7,
-                    0,
-                    8,
-                    8,
-                    9
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Delimiter",
+                    "Delimiter",
+                    "Operator",
+                    "Number",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Delimiter",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Delimiter"
                 ],
                 "idx": 68
             },
             {
                 "render": "{",
                 "hl": [
-                    9
+                    "Delimiter"
                 ],
                 "idx": 69
             },
             {
                 "render": "    $not = match ($x) {",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    8,
-                    8,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    9,
-                    8,
-                    8,
-                    9,
-                    0,
-                    9
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Delimiter",
+                    "Variable",
+                    "Variable",
+                    "Delimiter",
+                    "Normal",
+                    "Delimiter"
                 ],
                 "idx": 70
             },
             {
                 "render": "        0 => 1,",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    6,
-                    0,
-                    7,
-                    7,
-                    0,
-                    6,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Number",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 71
             },
             {
                 "render": "        1,-1 => 0,",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    6,
-                    7,
-                    7,
-                    6,
-                    0,
-                    7,
-                    7,
-                    0,
-                    6,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Number",
+                    "Operator",
+                    "Operator",
+                    "Number",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 72
             },
             {
                 "render": "        default => 0,",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    7,
-                    7,
-                    0,
-                    6,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 73
             },
             {
                 "render": "    };",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    9,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 74
             },
             {
                 "render": "}",
                 "hl": [
-                    9
+                    "Delimiter"
                 ],
                 "idx": 75
             },
@@ -6034,73 +6034,73 @@
             {
                 "render": "\/*",
                 "hl": [
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 77
             },
             {
                 "render": " * Multi-line comment",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 78
             },
             {
                 "render": " *\/",
                 "hl": [
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 79
             },
             {
                 "render": "$foobar = new FooBar();",
                 "hl": [
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    3,
-                    3,
-                    3,
-                    0,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    12,
-                    9,
-                    9,
-                    7
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Identifier",
+                    "Delimiter",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 80
             },
@@ -6112,26 +6112,26 @@
             {
                 "render": "$baz = ['a' => 'b'];",
                 "hl": [
-                    8,
-                    8,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    9,
-                    5,
-                    5,
-                    5,
-                    0,
-                    7,
-                    7,
-                    0,
-                    5,
-                    5,
-                    5,
-                    9,
-                    7
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Delimiter",
+                    "String",
+                    "String",
+                    "String",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 82
             },
@@ -6143,39 +6143,39 @@
             {
                 "render": "\/\/ C++ style comment",
                 "hl": [
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment"
                 ],
                 "idx": 84
             },
             {
                 "render": "$x = 3;",
                 "hl": [
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    6,
-                    7
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 85
             },
@@ -6187,81 +6187,81 @@
             {
                 "render": "# Perl-style comment",
                 "hl": [
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment"
                 ],
                 "idx": 87
             },
             {
                 "render": "$y = [",
                 "hl": [
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    9
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Delimiter"
                 ],
                 "idx": 88
             },
             {
                 "render": "    1,",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    6,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 89
             },
             {
                 "render": "    2,",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    6,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Number",
+                    "Operator"
                 ],
                 "idx": 90
             },
             {
                 "render": "    3",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    6
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Number"
                 ],
                 "idx": 91
             },
             {
                 "render": "];",
                 "hl": [
-                    9,
-                    7
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 92
             },
@@ -6273,110 +6273,110 @@
             {
                 "render": "\/\/ Multi-line ternary statement",
                 "hl": [
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment"
                 ],
                 "idx": 94
             },
             {
                 "render": "#{Attribute]",
                 "hl": [
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment"
                 ],
                 "idx": 95
             },
             {
                 "render": "$q = ($x !== 2)",
                 "hl": [
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    9,
-                    8,
-                    8,
-                    0,
-                    7,
-                    7,
-                    7,
-                    0,
-                    6,
-                    9
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Delimiter",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Operator",
+                    "Normal",
+                    "Number",
+                    "Delimiter"
                 ],
                 "idx": 96
             },
             {
                 "render": "    ? 'yes'",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    7,
-                    0,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String"
                 ],
                 "idx": 97
             },
             {
                 "render": "    : 'no';",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    7,
-                    0,
-                    5,
-                    5,
-                    5,
-                    5,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "Operator"
                 ],
                 "idx": 98
             },
@@ -6388,131 +6388,131 @@
             {
                 "render": "\/*",
                 "hl": [
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 100
             },
             {
                 "render": "Heredoc",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 101
             },
             {
                 "render": "*\/$z = $x + $y;",
                 "hl": [
-                    2,
-                    2,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    8,
-                    8,
-                    7
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Operator"
                 ],
                 "idx": 102
             },
             {
                 "render": "$sql = <<<SQL",
                 "hl": [
-                    8,
-                    8,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter"
                 ],
                 "idx": 103
             },
             {
                 "render": "    SELECT * FROM \"foo\" WHERE \"bar\"='baz' AND id={$x};",
                 "hl": [
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    9,
-                    8,
-                    8,
-                    9,
-                    5
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "Delimiter",
+                    "Variable",
+                    "Variable",
+                    "Delimiter",
+                    "String"
                 ],
                 "idx": 104
             },
             {
                 "render": "SQL;",
                 "hl": [
-                    9,
-                    9,
-                    9,
-                    7
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 105
             },
@@ -6524,88 +6524,88 @@
             {
                 "render": "\/* Nowdoc *\/",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 107
             },
             {
                 "render": "$template = <<<'TEMPLATE'",
                 "hl": [
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    0,
-                    7,
-                    0,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter"
                 ],
                 "idx": 108
             },
             {
                 "render": "    <foo>{x}<\/foo>",
                 "hl": [
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String"
                 ],
                 "idx": 109
             },
             {
                 "render": "TEMPLATE;",
                 "hl": [
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    7
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 110
             },
@@ -6617,204 +6617,204 @@
             {
                 "render": "?>",
                 "hl": [
-                    9,
-                    9
+                    "Delimiter",
+                    "Delimiter"
                 ],
                 "idx": 112
             },
             {
                 "render": "<!DOCTYPE html>",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal"
                 ],
                 "idx": 113
             },
             {
                 "render": "<html lang=\"en\">",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal"
                 ],
                 "idx": 114
             },
             {
                 "render": "<head>",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal"
                 ],
                 "idx": 115
             },
             {
                 "render": "<title>HTML<\/title>",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal"
                 ],
                 "idx": 116
             },
             {
                 "render": "<\/head>",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal"
                 ],
                 "idx": 117
             },
             {
                 "render": "<body>",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal"
                 ],
                 "idx": 118
             },
             {
                 "render": "<h1><?= $_SERVER['HTTP_HOST'] ?><\/h1>",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    9,
-                    9,
-                    9,
-                    0,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    8,
-                    9,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    9,
-                    0,
-                    9,
-                    9,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Normal",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Variable",
+                    "Delimiter",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "Delimiter",
+                    "Normal",
+                    "Delimiter",
+                    "Delimiter",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal"
                 ],
                 "idx": 119
             },
             {
                 "render": "<\/body>",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal"
                 ],
                 "idx": 120
             },
             {
                 "render": "<\/html>",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal"
                 ],
                 "idx": 121
             },
             {
                 "render": "<?php exit(); ?>",
                 "hl": [
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    9,
-                    3,
-                    3,
-                    3,
-                    3,
-                    9,
-                    9,
-                    7,
-                    0,
-                    9,
-                    9
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Delimiter",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Delimiter",
+                    "Delimiter",
+                    "Operator",
+                    "Normal",
+                    "Delimiter",
+                    "Delimiter"
                 ],
                 "idx": 122
             }
diff --git a/tests/__snapshots__/EditorTest__testOpen__1.json b/tests/__snapshots__/EditorTest__testOpen__1.json
index ce1f0b1..d44ea8a 100644
--- a/tests/__snapshots__/EditorTest__testOpen__1.json
+++ b/tests/__snapshots__/EditorTest__testOpen__1.json
@@ -108,191 +108,191 @@
             {
                 "render": "\/**",
                 "hl": [
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 0
             },
             {
                 "render": " * Interfaces for PHP FFI",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 1
             },
             {
                 "render": " *",
                 "hl": [
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 2
             },
             {
                 "render": " * Most of the structure code is cribbed from GLib",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 3
             },
             {
                 "render": " *",
                 "hl": [
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 4
             },
             {
                 "render": " * Defines are not (generally) recognized by the FFI integration",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 5
             },
             {
                 "render": " *\/",
                 "hl": [
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 6
             },
@@ -304,196 +304,196 @@
             {
                 "render": "\/\/ PHP 'constants' for FFI integration",
                 "hl": [
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment"
                 ],
                 "idx": 8
             },
             {
                 "render": "\/\/ These seem to be the only define statements supported by the FFI integration",
                 "hl": [
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment"
                 ],
                 "idx": 9
             },
             {
                 "render": "#define FFI_SCOPE \"terminal\"",
                 "hl": [
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String"
                 ],
                 "idx": 10
             },
             {
                 "render": "#define FFI_LIB \"libc.so.6\"",
                 "hl": [
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String"
                 ],
                 "idx": 11
             },
@@ -505,194 +505,194 @@
             {
                 "render": "\/\/ Nonsense for a test with a single quote",
                 "hl": [
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment"
                 ],
                 "idx": 13
             },
             {
                 "render": "\/\/ Ignored by PHP due to the octothorpe (#)",
                 "hl": [
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment"
                 ],
                 "idx": 14
             },
             {
                 "render": "#if 0",
                 "hl": [
-                    4,
-                    4,
-                    4,
-                    0,
-                    6
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Number"
                 ],
                 "idx": 15
             },
             {
                 "render": "#    char* x = \"String with \\\" escape char\";",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    4,
-                    4,
-                    4,
-                    4,
-                    7,
-                    0,
-                    0,
-                    0,
-                    7,
-                    0,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    5,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Operator",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "String",
+                    "Operator"
                 ],
                 "idx": 16
             },
             {
                 "render": "#    char y = 'q';",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    7,
-                    0,
-                    13,
-                    13,
-                    13,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Character",
+                    "Character",
+                    "Character",
+                    "Operator"
                 ],
                 "idx": 17
             },
             {
                 "render": "#endif",
                 "hl": [
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2"
                 ],
                 "idx": 18
             },
@@ -704,193 +704,193 @@
             {
                 "render": "\/\/ -----------------------------------------------------------------------------",
                 "hl": [
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment"
                 ],
                 "idx": 20
             },
             {
                 "render": "\/\/! <termios.h>",
                 "hl": [
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment"
                 ],
                 "idx": 21
             },
             {
                 "render": "\/\/ -----------------------------------------------------------------------------",
                 "hl": [
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment"
                 ],
                 "idx": 22
             },
@@ -902,90 +902,90 @@
             {
                 "render": "\/* Type of terminal control flag masks.  *\/",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 24
             },
             {
                 "render": "typedef unsigned long int tcflag_t;",
                 "hl": [
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator"
                 ],
                 "idx": 25
             },
@@ -997,73 +997,73 @@
             {
                 "render": "\/* Type of control characters.  *\/",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 27
             },
             {
                 "render": "typedef unsigned char cc_t;",
                 "hl": [
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator"
                 ],
                 "idx": 28
             },
@@ -1075,73 +1075,73 @@
             {
                 "render": "\/* Type of baud rate specifiers.  *\/",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 30
             },
             {
                 "render": "typedef long int speed_t;",
                 "hl": [
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator"
                 ],
                 "idx": 31
             },
@@ -1153,119 +1153,119 @@
             {
                 "render": "\/* Terminal control structure.  *\/",
                 "hl": [
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 33
             },
             {
                 "render": "struct termios",
                 "hl": [
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal"
                 ],
                 "idx": 34
             },
             {
                 "render": "{",
                 "hl": [
-                    9
+                    "Delimiter"
                 ],
                 "idx": 35
             },
             {
                 "render": "  \/* Input modes.  *\/",
                 "hl": [
-                    0,
-                    0,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "Normal",
+                    "Normal",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 36
             },
             {
                 "render": "  tcflag_t c_iflag;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator"
                 ],
                 "idx": 37
             },
@@ -1277,53 +1277,53 @@
             {
                 "render": "  \/* Output modes.  *\/",
                 "hl": [
-                    0,
-                    0,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "Normal",
+                    "Normal",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 39
             },
             {
                 "render": "  tcflag_t c_oflag;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator"
                 ],
                 "idx": 40
             },
@@ -1335,54 +1335,54 @@
             {
                 "render": "  \/* Control modes.  *\/",
                 "hl": [
-                    0,
-                    0,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "Normal",
+                    "Normal",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 42
             },
             {
                 "render": "  tcflag_t c_cflag;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator"
                 ],
                 "idx": 43
             },
@@ -1394,52 +1394,52 @@
             {
                 "render": "  \/* Local modes.  *\/",
                 "hl": [
-                    0,
-                    0,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "Normal",
+                    "Normal",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 45
             },
             {
                 "render": "  tcflag_t c_lflag;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator"
                 ],
                 "idx": 46
             },
@@ -1451,56 +1451,56 @@
             {
                 "render": "  \/* Control characters.  *\/",
                 "hl": [
-                    0,
-                    0,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "Normal",
+                    "Normal",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 48
             },
             {
                 "render": "  cc_t c_cc[20];",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    9,
-                    6,
-                    6,
-                    9,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter",
+                    "Number",
+                    "Number",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 49
             },
@@ -1512,86 +1512,86 @@
             {
                 "render": "  \/* Input and output baud rates.  *\/",
                 "hl": [
-                    0,
-                    0,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2,
-                    2
+                    "Normal",
+                    "Normal",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment",
+                    "MultiLineComment"
                 ],
                 "idx": 51
             },
             {
                 "render": "  speed_t __ispeed, __ospeed;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator"
                 ],
                 "idx": 52
             },
             {
                 "render": "};",
                 "hl": [
-                    9,
-                    7
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 53
             },
@@ -1603,140 +1603,140 @@
             {
                 "render": "int tcgetattr (int fd, struct termios *termios_p);",
                 "hl": [
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    9,
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    7,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    9,
-                    7
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 55
             },
             {
                 "render": "int tcsetattr (int fd, int optional_actions, const struct termios *termios_p);",
                 "hl": [
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    9,
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    7,
-                    0,
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    9,
-                    7
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 56
             },
@@ -1748,391 +1748,391 @@
             {
                 "render": "\/\/ -----------------------------------------------------------------------------",
                 "hl": [
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment"
                 ],
                 "idx": 58
             },
             {
                 "render": "\/\/! <sys\/ioctl.h>",
                 "hl": [
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment"
                 ],
                 "idx": 59
             },
             {
                 "render": "\/\/ -----------------------------------------------------------------------------",
                 "hl": [
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1,
-                    1
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment",
+                    "Comment"
                 ],
                 "idx": 60
             },
             {
                 "render": "struct winsize {",
                 "hl": [
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    3,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    9
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Keyword1",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter"
                 ],
                 "idx": 61
             },
             {
                 "render": "    unsigned short ws_row;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator"
                 ],
                 "idx": 62
             },
             {
                 "render": "    unsigned short ws_col;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator"
                 ],
                 "idx": 63
             },
             {
                 "render": "    unsigned short ws_xpixel;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator"
                 ],
                 "idx": 64
             },
             {
                 "render": "    unsigned short ws_ypixel;",
                 "hl": [
-                    0,
-                    0,
-                    0,
-                    0,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    7
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Operator"
                 ],
                 "idx": 65
             },
             {
                 "render": "};",
                 "hl": [
-                    9,
-                    7
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 66
             },
             {
                 "render": "int ioctl (int, int, ...);",
                 "hl": [
-                    4,
-                    4,
-                    4,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    9,
-                    4,
-                    4,
-                    4,
-                    7,
-                    0,
-                    4,
-                    4,
-                    4,
-                    7,
-                    0,
-                    7,
-                    7,
-                    7,
-                    9,
-                    7
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Normal",
+                    "Delimiter",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Operator",
+                    "Normal",
+                    "Keyword2",
+                    "Keyword2",
+                    "Keyword2",
+                    "Operator",
+                    "Normal",
+                    "Operator",
+                    "Operator",
+                    "Operator",
+                    "Delimiter",
+                    "Operator"
                 ],
                 "idx": 67
             }