Fix rules.

package.json

@@ -4,7 +4,7 @@
 	"displayName": "Rhai Language Support",
 	"description": "Highlight and formatter for Rhai",
 	"publisher": "rhaiscript",
-	"version": "0.5.0",
+	"version": "0.5.1",
 	"icon": "assets/icon.png",
 	"repository": {
 		"type": "git",

syntax/rhai.YAML-tmLanguage

@@ -7,6 +7,7 @@ information_for_contributors:
 patterns:
   - include: '#comment'
   - include: '#literal'
+  - include: '#operator'
 repository:
   comment:
     patterns:
@@ -36,15 +37,15 @@ repository:
         match: (//).*$\n?
         captures:
           '1': {name: punctuation.definition.comment.line.rhai}
+
   literal:
     patterns:
       - include: '#keyword'
       - include: '#string'
       - include: '#number'
       - include: '#symbol'
       - include: '#variable'
-      - include: '#dict'
-      - include: '#operators'
+
   keyword:
     patterns:
       - match: \b(let|const)\b
@@ -67,20 +68,22 @@ repository:
         name: keyword.other.rhai support.function.rhai
       - match: \b(var|static|begin|end|shared|each|then|goto|exit|unless|match|case|public|protected|new|use|with|module|package|super|thread|spawn|go|await|async|sync|yield|default|void|null|nil)\b
         name: invalid.illegal.rhai
-  operators:
+
+  operator:
     patterns:
       - match: (==|!=|<=|>=|<|>)
         name: keyword.operator.comparison.rhai
       - match: (\+|-|\*|/|\*\*|%)
         name: keyword.operator.arithmetic.rhai
-      - match: (\||&|>>|<<|^)
+      - match: (\||&|>>|<<|\^)
         name: keyword.operator.bitwise.rhai
-      - match: (=|\+=|-=|\*=|/=|\*\*=|%=|\|=|&=|^=|>>=|<<=)
+      - match: (=|\+=|-=|\*=|/=|\*\*=|%=|\|=|&=|\^=|>>=|<<=)
         name: keyword.operator.assignment.rhai
       - match: (!)
         name: keyword.operator.infix.rhai
       - match: (\|\||&&)
         name: keyword.operator.logical.rhai
+
   number:
     patterns:
       - match: (?<!\w)(0x[0-9a-fA-F][_0-9a-fA-F]*)(?!\w)
@@ -95,6 +98,7 @@ repository:
         name: constant.numeric.decimal.rhai
       - match: ([\+-]?[0-9][_0-9]*)
         name: constant.numeric.integer.rhai
+
   string:
     patterns:
       - name: string.quoted.block.rhai
@@ -114,19 +118,6 @@ repository:
         patterns:
           - match: \\([tnr"\\\n]|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})
             name: constant.character.escape.rhai
-  dict:
-    patterns:
-      - begin: (#\{)
-        beginCaptures:
-          '1': {name: variable.other.readwrite.begin.rhai}
-        end: (\})
-        endCaptures:
-          '1': {name: variable.other.readwrite.end.rhai}
-        patterns:
-          - include: '#comment'
-          - match: (?<!\w)([_a-zA-Z][_0-9a-zA-Z]*)\s*(:)\s*(?!\w)
-            name: variable.other.readwrite.rhai
-          - include: '#literal'
 
   symbol:
     patterns:

syntax/rhai.markdown.json

@@ -36,4 +36,4 @@
             ]
         }
     ]
-}
+}

syntax/rhai.tmLanguage.json

@@ -12,6 +12,9 @@
     },
     {
       "include": "#literal"
+    },
+    {
+      "include": "#operator"
     }
   ],
   "repository": {
@@ -93,12 +96,6 @@
         },
         {
           "include": "#variable"
-        },
-        {
-          "include": "#dict"
-        },
-        {
-          "include": "#operators"
         }
       ]
     },
@@ -146,7 +143,7 @@
         }
       ]
     },
-    "operators": {
+    "operator": {
       "patterns": [
         {
           "match": "(==|!=|<=|>=|<|>)",
@@ -157,11 +154,11 @@
           "name": "keyword.operator.arithmetic.rhai"
         },
         {
-          "match": "(\\||&|>>|<<|^)",
+          "match": "(\\||&|>>|<<|\\^)",
           "name": "keyword.operator.bitwise.rhai"
         },
         {
-          "match": "(=|\\+=|-=|\\*=|/=|\\*\\*=|%=|\\|=|&=|^=|>>=|<<=)",
+          "match": "(=|\\+=|-=|\\*=|/=|\\*\\*=|%=|\\|=|&=|\\^=|>>=|<<=)",
           "name": "keyword.operator.assignment.rhai"
         },
         {
@@ -241,36 +238,6 @@
         }
       ]
     },
-    "dict": {
-      "patterns": [
-        {
-          "begin": "(#\\{)",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.other.readwrite.begin.rhai"
-            }
-          },
-          "end": "(\\})",
-          "endCaptures": {
-            "1": {
-              "name": "variable.other.readwrite.end.rhai"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#comment"
-            },
-            {
-              "match": "(?<!\\w)([_a-zA-Z][_0-9a-zA-Z]*)\\s*(:)\\s*(?!\\w)",
-              "name": "variable.other.readwrite.rhai"
-            },
-            {
-              "include": "#literal"
-            }
-          ]
-        }
-      ]
-    },
     "symbol": {
       "patterns": [
         {