From 6c584dc5923398f43f6df1e09f1e6e07a12d4b44 Mon Sep 17 00:00:00 2001
From: Daniel Biehl <dbiehl@live.de>
Date: Tue, 5 Mar 2024 23:50:37 +0100
Subject: [PATCH] fix(vscode): correct some things in bracket highlightning and
 coloring

---
 language-configuration.json             |   12 -
 package.json                            |   11 +-
 syntaxes/robotframework.tmLanguage.json | 3403 ++++++-----------------
 3 files changed, 864 insertions(+), 2562 deletions(-)

diff --git a/language-configuration.json b/language-configuration.json
index 509f67839..76add2a0a 100644
--- a/language-configuration.json
+++ b/language-configuration.json
@@ -5,9 +5,6 @@
   },
   // symbols used as brackets
   "brackets": [
-    ["${{", "}}"],
-    ["&{{", "}}"],
-    ["@{{", "}}"],
     ["${", "}"],
     ["@{", "}"],
     ["%{", "}"],
@@ -17,9 +14,6 @@
     ["(", ")"]
   ],
   "colorizedBracketPairs": [
-    ["${{", "}}"],
-    ["&{{", "}}"],
-    ["@{{", "}}"],
     ["${", "}"],
     ["@{", "}"],
     ["%{", "}"],
@@ -30,9 +24,6 @@
 	],
   // symbols that are auto closed when typing
   "autoClosingPairs": [
-    ["${{", "}}"],
-    ["&{{", "}}"],
-    ["@{{", "}}"],
     ["${", "}"],
     ["@{", "}"],
     ["%{", "}"],
@@ -45,9 +36,6 @@
   ],
   // symbols that can be used to surround a selection
   "surroundingPairs": [
-    ["${{", "}}"],
-    ["&{{", "}}"],
-    ["@{{", "}}"],
     ["${", "}"],
     ["@{", "}"],
     ["%{", "}"],
diff --git a/package.json b/package.json
index cecf3777a..04c2ef976 100644
--- a/package.json
+++ b/package.json
@@ -284,11 +284,13 @@
             "keyword.modifier.bdd-prefix.robotframework"
           ],
           "continuation": [
-            "punctuation.separator.continuation.robotframework"
+            "keyword.operator.continuation.robotframework"
+          ],
+          "separator": [
+            "keyword.operator.terminator.robotframework"
           ],
-          "separator": [],
           "terminator": [
-            "punctuation.terminator.robotframework"
+            "keyword.operator.terminator.robotframework"
           ],
           "variableBegin": [
             "punctuation.definition.variable.begin.robotframework"
@@ -343,7 +345,8 @@
         "tokenTypes": {
           "string.unquoted.argument.robotframework": "other",
           "variable.expression.robotframework": "other"
-        }
+        },
+        "unbalancedBracketScopes": ["comment.robotframework", "comment"]
       }
     ],
     "keybindings": [
diff --git a/syntaxes/robotframework.tmLanguage.json b/syntaxes/robotframework.tmLanguage.json
index b346490d7..45612f80b 100644
--- a/syntaxes/robotframework.tmLanguage.json
+++ b/syntaxes/robotframework.tmLanguage.json
@@ -1,256 +1,155 @@
 {
-  "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
-
-  "repository": {
-    "header": {
-      "name": "keyword.other.header.robotframework",
-      "match": "(^\\*\\*\\*.*?\\*\\*\\*)|((?<=^\\|)\\s+\\*\\*\\*.*?\\*\\*\\*)"
-    },
-    "variable_setting": {
-      "name": "meta.variable.assign.robotframework",
-      "contentName": "string.unquoted.argument.robotframework",
-      "begin": "^(?:([$@&%]\\{)(.+?}*)(\\})( ?=)?)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.operator.robotframework"
-        },
-        "2": {
-          "name": "variable.other.readwrite.robotframework"
-        },
-        "3": {
-          "name": "keyword.operator.robotframework"
-        },
-        "4": {
-          "name": "keyword.operator.robotframework"
-        }
-      },
-      "end": "^(?!\\s*\\.\\.\\.)",
-      "patterns": [
-        {
-          "include": "#escape"
-        },
-        {
-          "include": "#comment"
-        },
-        {
-          "include": "#line_continuation"
-        },
-        {
-          "include": "#variables"
-        }
-      ]
-    },
-    "variables": {
-      "patterns": [
-        {
-          "include": "#expression_var"
-        },
-        {
-          "include": "#simple_var"
-        }
-      ]
-    },
-    "expression_var": {
-      "name": "meta.variables.robotframework",
-      "match": "(?i)(?:(?:(?<!^)(?<!\\\\)|(?<=\\\\\\\\))([$@&%]\\{\\{)(.*)(\\}\\})(?:(\\[)(?:(\\d+)|(.*?))?(\\]))?)",
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.variable.begin.robotframework"
-        },
-        "2": {
-          "name": "variable.expression.robotframework",
-          "patterns": [
-            {
-              "include": "#expression"
-            }
-          ]
-        },
-        "3": {
-          "name": "punctuation.definition.variable.end.robotframework"
-        },
-        "4": {
-          "name": "meta.variable.as.key.robotframework",
-          "patterns": [
-            {
-              "include": "#variables"
-            }
-          ]
-        }
-      }
-    },
-    "simple_var": {
-      "name": "meta.variables.robotframework",
-      "match": "(?i)(?:(?:(?<!^)(?<!\\\\)|(?<=\\\\\\\\))([$@&%]\\{)(.*)(\\})(?:(\\[)(?:(\\d+)|(.*?))?(\\]))?)",
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.variable.begin.robotframework"
-        },
-        "2": {
-          "name": "variable.other.robotframework",
-          "patterns": [
-            {
-              "include": "#variables"
-            }
-          ]
-        },
-        "3": {
-          "name": "punctuation.definition.variable.end.robotframework"
-        },
-        "4": {
-          "name": "meta.variable.as.key.robotframework",
-          "patterns": [
-            {
-              "include": "#variables"
-            }
-          ]
-        }
-      }
-    },
-    "comment": {
-      "name": "comment.robotframework",
-      "match": "(?:^ *|\\t+| {2,})(#.*)$",
-      "captures": {
-        "1": {
-          "name": "comment.line.robotframework"
-        }
-      }
-    },
-    "setting": {
-      "contentName": "variable.parameter.argument.robotframework",
-      "begin": "(?i)^(\\S+( \\S+)*)(?= {2}| ?\\t| ?$)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.settings.robotframework"
-        }
-      },
-      "end": "^(?!\\s*\\.\\.\\.)",
-      "patterns": [
-        {
-          "include": "#escape"
-        },
-        {
-          "include": "#comment"
-        },
-        {
-          "include": "#variables"
-        },
-        {
-          "include": "#line_continuation"
-        }
-      ]
-    },
-    "testcase_settings": {
-      "contentName": "variable.parameter.argument.robotframework",
-      "begin": "(\\[.*?\\])(?= {2}| ?\\t| ?$)",
-      "beginCaptures": {
-        "0": {
-          "name": "keyword.control.settings.robotframework"
-        }
-      },
-      "end": "^(?!\\s*\\.\\.\\.)",
-      "patterns": [
-        {
-          "include": "#escape"
-        },
-        {
-          "include": "#comment"
-        },
-        {
-          "include": "#variables"
-        },
-        {
-          "include": "#line_continuation"
-        }
-      ]
-    },
-    "keyword_call": {
-      "name": "meta.keyword-call.content.robotframework",
-      "contentName": "string.unquoted.argument.robotframework",
-      "begin": "^(?!(?: {2,}| ?\\t ?)+(?:(?=[$\\[@&%]|\\.)))(?: {2,}| ?\\t ?)+(.*?)(?= {2,}| ?\\t ?| ?$)",
-      "end": "^(?!\\s*\\.\\.\\.)",
-      "beginCaptures": {
-        "1": {
-          "name": "entity.name.function.keyword-call.robotframework"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#comment"
-        },
-        {
-          "include": "#variables"
-        },
-        {
-          "include": "#line_continuation"
-        }
-      ]
-    },
-    "returning_keyword_call": {
-      "name": "meta.returning-keyword-call.robotframework",
-      "contentName": "meta.returning.keyword.content.robotframework",
-      "begin": "^(?=(?: {2,}| ?\\t ?)+(?:(?=[$@&])))(?:\\s)",
-      "end": "^(?!\\s*\\.\\.\\.)",
-      "patterns": [
-        {
-          "include": "#returning_keyword"
-        }
-      ]
-    },
-    "returning_keyword": {
-      "name": "meta.returning-keyword.robotframework",
-      "contentName": "string.unquoted.argument.robotframework",
-      "begin": "(?<=\\s)(?=\\s*(?:(?=[$@&])))((?:\\s)*(?:[$&@]{(?:.*?)}(?:\\[.*?\\])?(?: ?=?\\s*))*)(.*?)(?: {2,}| ?\\t ?|$)",
-      "beginCaptures": {
-        "1": {
-          "name": "variable.other.readwrite.robotframework",
-          "patterns": [
-            {
-              "include": "#variable_assignment_from_kw"
-            }
-          ]
-        },
-        "2": {
-          "name": "entity.name.function.keyword-call.robotframework"
-        }
-      },
-      "end": "^(?!\\s*\\.\\.\\.)",
-      "patterns": [
-        {
-          "include": "#variables"
-        },
-        {
-          "include": "#line_continuation"
-        },
-        {
-          "include": "#comment"
-        }
-      ]
-    },
-    "variable_assignment_from_kw": {
-      "contentName": "meta.variable.assignment.keyword.content.robotframework",
-      "begin": "(?<=^\\s)(?:\\s*)(?=[$@&])",
-      "end": "(?:( ?=)|(?: {2,}| ?\\t+ ?| ?$)(?![#$@& \\n\\r]|\\.\\.\\.)|^(?=\\.\\.\\.)( {2,}| ?\\t+ ?| ?$)(?![#$@&]))",
-      "endCaptures": {
-        "1": {
-          "name": "keyword.operator.robotframework"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#line_continuation"
-        },
-        {
-          "include": "#comment"
-        }
-      ]
-    },
-    "line_continuation": {
-      "match": "^(\\s*\\.\\.\\.)(?: {2,}| ?\\t+| ?$)(?!ELSE)",
-      "name": "keyword.operator.robotframework"
-    },
-
-
-    "impossible": {
+	"$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
+	"repository": {
+		"header": {
+			"name": "keyword.other.header.robotframework",
+			"match": "(^\\*\\*\\*.*?\\*\\*\\*)|((?<=^\\|)\\s+\\*\\*\\*.*?\\*\\*\\*)"
+		},
+		"variable_setting": {
+			"name": "meta.variable.assign.robotframework",
+			"contentName": "string.unquoted.argument.robotframework",
+			"begin": "^(?:([$@&%]\\{)(.*?}*)(\\})( ?=)?)",
+			"beginCaptures": {
+				"1": { "name": "unctuation.definition.variable.begin.robotframework" },
+				"2": { "name": "variable.other.readwrite.robotframework" },
+				"3": { "name": "unctuation.definition.variable.end.robotframework" },
+				"4": { "name": "keyword.operator.robotframework" }
+			},
+			"end": "^(?!\\s*\\.\\.\\.)",
+			"patterns": [
+				{ "include": "#escape" },
+				{ "include": "#comment" },
+				{ "include": "#line_continuation" },
+				{ "include": "#variables" }
+			]
+		},
+		"variables": {
+			"patterns": [
+				{ "include": "#simple_var" },
+				{ "include": "#env_var" }
+			]
+		},
+		"expression_var": {
+			"name": "meta.variables.robotframework",
+			"begin": "\\{",
+			"end": "\\}",
+			"beginCaptures": { "0": { "name": "punctuation.definition.expression.begin.robotframework" } },
+			"endCaptures": { "0": { "name": "punctuation.definition.expression.end.robotframework" } },
+			"patterns": [
+				{ "include": "#expression" },
+				{ "include": "#simple_var" }
+			]
+		},
+		"simple_var": {
+			"name": "meta.variables.robotframework",
+			"contentName": "variable.other.readwrite.robotframework",
+			"begin": "[$@&]\\{",
+			"end": "(\\})|(?= {2}| ?\\t| ?$)",
+			"beginCaptures": { "0": { "name": "punctuation.definition.variable.begin.robotframework" } },
+			"endCaptures": { "1": { "name": "punctuation.definition.variable.end.robotframework" } },
+			"patterns": [ { "include": "#expression_var" } ]
+		},
+		"env_var": {
+			"name": "meta.variables.robotframework",
+			"contentName": "variable.other.readwrite.robotframework",
+			"begin": "%\\{",
+			"end": "(\\})|(?= {2}| ?\\t| ?$)",
+			"beginCaptures": { "0": { "name": "punctuation.definition.envvar.begin.robotframework" } },
+			"endCaptures": { "1": { "name": "punctuation.definition.envvar.end.robotframework" } },
+			"patterns": [ { "include": "#env_key_value_pair" } ]
+		},
+		"env_key_value_pair": {
+			"match": "([^=]*)((=)(.*))?",
+			"captures": {
+				"1": { "patterns": [ { "include": "#variables" } ] },
+				"3": { "name": "keyword.operator.robotframework" },
+				"4": {
+					"name": "string.unquoted.value.robotframework",
+					"patterns": [ { "include": "#variables" } ]
+				}
+			}
+		},
+		"comment": {
+			"name": "comment.robotframework",
+			"match": "(?:^ *|\\t+| {2,})(#.*)$",
+			"captures": { "1": { "name": "comment.line.robotframework" } }
+		},
+		"setting": {
+			"contentName": "variable.parameter.argument.robotframework",
+			"begin": "(?i)^(\\S+( \\S+)*)(?= {2}| ?\\t| ?$)",
+			"beginCaptures": { "1": { "name": "keyword.control.settings.robotframework" } },
+			"end": "^(?!\\s*\\.\\.\\.)",
+			"patterns": [
+				{ "include": "#escape" },
+				{ "include": "#comment" },
+				{ "include": "#variables" },
+				{ "include": "#line_continuation" }
+			]
+		},
+		"testcase_settings": {
+			"contentName": "variable.parameter.argument.robotframework",
+			"begin": "(\\[.*?\\])(?= {2}| ?\\t| ?$)",
+			"beginCaptures": { "0": { "name": "keyword.control.settings.robotframework" } },
+			"end": "^(?!\\s*\\.\\.\\.)",
+			"patterns": [
+				{ "include": "#escape" },
+				{ "include": "#comment" },
+				{ "include": "#variables" },
+				{ "include": "#line_continuation" }
+			]
+		},
+		"keyword_call": {
+			"name": "meta.keyword-call.content.robotframework",
+			"contentName": "string.unquoted.argument.robotframework",
+			"begin": "^(?!(?: {2,}| ?\\t ?)+(?:(?=[$\\[@&%]|\\.)))(?: {2,}| ?\\t ?)+(.*?)(?= {2,}| ?\\t ?| ?$)",
+			"end": "^(?!\\s*\\.\\.\\.)",
+			"beginCaptures": { "1": { "name": "entity.name.function.keyword-call.robotframework" } },
+			"patterns": [
+				{ "include": "#comment" },
+				{ "include": "#variables" },
+				{ "include": "#line_continuation" }
+			]
+		},
+		"returning_keyword_call": {
+			"name": "meta.returning-keyword-call.robotframework",
+			"contentName": "meta.returning.keyword.content.robotframework",
+			"begin": "^(?=(?: {2,}| ?\\t ?)+(?:(?=[$@&])))(?:\\s)",
+			"end": "^(?!\\s*\\.\\.\\.)",
+			"patterns": [ { "include": "#returning_keyword" } ]
+		},
+		"returning_keyword": {
+			"name": "meta.returning-keyword.robotframework",
+			"contentName": "string.unquoted.argument.robotframework",
+			"begin": "(?<=\\s)(?=\\s*(?:(?=[$@&])))((?:\\s)*(?:[$&@]{(?:.*?)}(?:\\[.*?\\])?(?: ?=?\\s*))*)(.*?)(?: {2,}| ?\\t ?|$)",
+			"beginCaptures": {
+				"1": {
+					"name": "variable.other.readwrite.robotframework",
+					"patterns": [ { "include": "#variable_assignment_from_kw" } ]
+				},
+				"2": { "name": "entity.name.function.keyword-call.robotframework" }
+			},
+			"end": "^(?!\\s*\\.\\.\\.)",
+			"patterns": [
+				{ "include": "#variables" },
+				{ "include": "#line_continuation" },
+				{ "include": "#comment" }
+			]
+		},
+		"variable_assignment_from_kw": {
+			"contentName": "meta.variable.assignment.keyword.content.robotframework",
+			"begin": "(?<=^\\s)(?:\\s*)(?=[$@&])",
+			"end": "(?:( ?=)|(?: {2,}| ?\\t+ ?| ?$)(?![#$@& \\n\\r]|\\.\\.\\.)|^(?=\\.\\.\\.)( {2,}| ?\\t+ ?| ?$)(?![#$@&]))",
+			"endCaptures": { "1": { "name": "keyword.operator.robotframework" } },
+			"patterns": [
+				{ "include": "#line_continuation" },
+				{ "include": "#comment" }
+			]
+		},
+		"line_continuation": {
+			"match": "^(\\s*\\.\\.\\.)(?: {2,}| ?\\t+| ?$)(?!ELSE)",
+			"name": "keyword.operator.robotframework"
+		},
+		"impossible": {
 			"comment": "This is a special rule that should be used where no match is desired. It is not a good idea to match something like '1{0}' because in some cases that can result in infinite loops in token generation. So the rule instead matches and impossible expression to allow a match to fail and move to the next token.",
 			"match": "$.^"
 		},
@@ -270,12 +169,8 @@
 					"begin": "(?x)\n  (?:\n    \\# \\s* (type:)\n    \\s*+ (?# we want `\\s*+` which is possessive quantifier since\n             we do not actually want to backtrack when matching\n             whitespace here)\n    (?! $ | \\#)\n  )\n",
 					"end": "(?:$|(?=\\#))",
 					"beginCaptures": {
-						"0": {
-							"name": "meta.typehint.comment.python"
-						},
-						"1": {
-							"name": "comment.typehint.directive.notation.python"
-						}
+						"0": { "name": "meta.typehint.comment.python" },
+						"1": { "name": "comment.typehint.directive.notation.python" }
 					},
 					"patterns": [
 						{
@@ -296,9 +191,7 @@
 						}
 					]
 				},
-				{
-					"include": "#comments-base"
-				}
+				{ "include": "#comments-base" }
 			]
 		},
 		"docstring": {
@@ -307,26 +200,12 @@
 					"name": "string.quoted.docstring.multi.python",
 					"begin": "(\\'\\'\\'|\\\"\\\"\\\")",
 					"end": "(\\1)",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.begin.python"
-						}
-					},
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.end.python"
-						}
-					},
+					"beginCaptures": { "1": { "name": "punctuation.definition.string.begin.python" } },
+					"endCaptures": { "1": { "name": "punctuation.definition.string.end.python" } },
 					"patterns": [
-						{
-							"include": "#docstring-prompt"
-						},
-						{
-							"include": "#codetags"
-						},
-						{
-							"include": "#docstring-guts-unicode"
-						}
+						{ "include": "#docstring-prompt" },
+						{ "include": "#codetags" },
+						{ "include": "#docstring-guts-unicode" }
 					]
 				},
 				{
@@ -334,54 +213,28 @@
 					"begin": "([rR])(\\'\\'\\'|\\\"\\\"\\\")",
 					"end": "(\\2)",
 					"beginCaptures": {
-						"1": {
-							"name": "storage.type.string.python"
-						},
-						"2": {
-							"name": "punctuation.definition.string.begin.python"
-						}
-					},
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.end.python"
-						}
+						"1": { "name": "storage.type.string.python" },
+						"2": { "name": "punctuation.definition.string.begin.python" }
 					},
+					"endCaptures": { "1": { "name": "punctuation.definition.string.end.python" } },
 					"patterns": [
-						{
-							"include": "#string-consume-escape"
-						},
-						{
-							"include": "#docstring-prompt"
-						},
-						{
-							"include": "#codetags"
-						}
+						{ "include": "#string-consume-escape" },
+						{ "include": "#docstring-prompt" },
+						{ "include": "#codetags" }
 					]
 				},
 				{
 					"name": "string.quoted.docstring.single.python",
 					"begin": "(\\'|\\\")",
 					"end": "(\\1)|(\\n)",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.begin.python"
-						}
-					},
+					"beginCaptures": { "1": { "name": "punctuation.definition.string.begin.python" } },
 					"endCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.end.python"
-						},
-						"2": {
-							"name": "invalid.illegal.newline.python"
-						}
+						"1": { "name": "punctuation.definition.string.end.python" },
+						"2": { "name": "invalid.illegal.newline.python" }
 					},
 					"patterns": [
-						{
-							"include": "#codetags"
-						},
-						{
-							"include": "#docstring-guts-unicode"
-						}
+						{ "include": "#codetags" },
+						{ "include": "#docstring-guts-unicode" }
 					]
 				},
 				{
@@ -389,160 +242,75 @@
 					"begin": "([rR])(\\'|\\\")",
 					"end": "(\\2)|(\\n)",
 					"beginCaptures": {
-						"1": {
-							"name": "storage.type.string.python"
-						},
-						"2": {
-							"name": "punctuation.definition.string.begin.python"
-						}
+						"1": { "name": "storage.type.string.python" },
+						"2": { "name": "punctuation.definition.string.begin.python" }
 					},
 					"endCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.end.python"
-						},
-						"2": {
-							"name": "invalid.illegal.newline.python"
-						}
+						"1": { "name": "punctuation.definition.string.end.python" },
+						"2": { "name": "invalid.illegal.newline.python" }
 					},
 					"patterns": [
-						{
-							"include": "#string-consume-escape"
-						},
-						{
-							"include": "#codetags"
-						}
+						{ "include": "#string-consume-escape" },
+						{ "include": "#codetags" }
 					]
 				}
 			]
 		},
 		"docstring-guts-unicode": {
 			"patterns": [
-				{
-					"include": "#escape-sequence-unicode"
-				},
-				{
-					"include": "#escape-sequence"
-				},
-				{
-					"include": "#string-line-continuation"
-				}
+				{ "include": "#escape-sequence-unicode" },
+				{ "include": "#escape-sequence" },
+				{ "include": "#string-line-continuation" }
 			]
 		},
 		"docstring-prompt": {
 			"match": "(?x)\n  (?:\n    (?:^|\\G) \\s* (?# '\\G' is necessary for ST)\n    ((?:>>>|\\.\\.\\.) \\s) (?=\\s*\\S)\n  )\n",
-			"captures": {
-				"1": {
-					"name": "keyword.control.flow.python"
-				}
-			}
+			"captures": { "1": { "name": "keyword.control.flow.python" } }
 		},
-
 		"expression-bare": {
 			"comment": "valid Python expressions w/o comments and line continuation",
 			"patterns": [
-				{
-					"include": "#backticks"
-				},
-				{
-					"include": "#illegal-anno"
-				},
-				{
-					"include": "#literal"
-				},
-				{
-					"include": "#regexp"
-				},
-				{
-					"include": "#string"
-				},
-				{
-					"include": "#lambda"
-				},
-				{
-					"include": "#generator"
-				},
-				{
-					"include": "#illegal-operator"
-				},
-        {
-          "include": "#robot-variable-names"
-        },
-				{
-					"include": "#operator"
-				},
-				{
-					"include": "#curly-braces"
-				},
-				{
-					"include": "#item-access"
-				},
-				{
-					"include": "#list"
-				},
-				{
-					"include": "#odd-function-call"
-				},
-				{
-					"include": "#round-braces"
-				},
-				{
-					"include": "#function-call"
-				},
-				{
-					"include": "#builtin-functions"
-				},
-				{
-					"include": "#builtin-types"
-				},
-				{
-					"include": "#builtin-exceptions"
-				},
-				{
-					"include": "#magic-names"
-				},
-				{
-					"include": "#special-names"
-				},
-				{
-					"include": "#illegal-names"
-				},
-				{
-					"include": "#special-variables"
-				},
-				{
-					"include": "#ellipsis"
-				},
-				{
-					"include": "#punctuation"
-				},
-				{
-					"include": "#line-continuation"
-				}
+				{ "include": "#backticks" },
+				{ "include": "#illegal-anno" },
+				{ "include": "#literal" },
+				{ "include": "#regexp" },
+				{ "include": "#string" },
+				{ "include": "#lambda" },
+				{ "include": "#generator" },
+				{ "include": "#illegal-operator" },
+				{ "include": "#robot-variable-names" },
+				{ "include": "#operator" },
+				{ "include": "#curly-braces" },
+				{ "include": "#item-access" },
+				{ "include": "#list" },
+				{ "include": "#odd-function-call" },
+				{ "include": "#round-braces" },
+				{ "include": "#function-call" },
+				{ "include": "#builtin-functions" },
+				{ "include": "#builtin-types" },
+				{ "include": "#builtin-exceptions" },
+				{ "include": "#magic-names" },
+				{ "include": "#special-names" },
+				{ "include": "#illegal-names" },
+				{ "include": "#special-variables" },
+				{ "include": "#ellipsis" },
+				{ "include": "#punctuation" },
+				{ "include": "#line-continuation" }
 			]
 		},
 		"expression-base": {
 			"comment": "valid Python expressions with comments and line continuation",
 			"patterns": [
-				{
-					"include": "#comments"
-				},
-				{
-					"include": "#expression-bare"
-				},
-				{
-					"include": "#line-continuation"
-				}
+				{ "include": "#comments" },
+				{ "include": "#expression-bare" },
+				{ "include": "#line-continuation" }
 			]
 		},
 		"expression": {
 			"comment": "All valid Python expressions",
 			"patterns": [
-				{
-					"include": "#expression-base"
-				},
-				{
-					"include": "#member-access"
-				},
+				{ "include": "#expression-base" },
+				{ "include": "#member-access" },
 				{
 					"comment": "Tokenize identifiers to help linters",
 					"match": "(?x) \\b ([[:alpha:]_]\\w*) \\b"
@@ -553,43 +321,21 @@
 			"name": "meta.member.access.python",
 			"begin": "(\\.)\\s*(?!\\.)",
 			"end": "(?x)\n  # stop when you've just read non-whitespace followed by non-word\n  # i.e. when finished reading an identifier or function call\n  (?<=\\S)(?=\\W) |\n  # stop when seeing the start of something that's not a word,\n  # i.e. when seeing a non-identifier\n  (^|(?<=\\s))(?=[^\\\\\\w\\s]) |\n  $\n",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.separator.period.python"
-				}
-			},
+			"beginCaptures": { "1": { "name": "punctuation.separator.period.python" } },
 			"patterns": [
-				{
-					"include": "#function-call"
-				},
-				{
-					"include": "#member-access-base"
-				},
-				{
-					"include": "#member-access-attribute"
-				}
+				{ "include": "#function-call" },
+				{ "include": "#member-access-base" },
+				{ "include": "#member-access-attribute" }
 			]
 		},
 		"member-access-base": {
 			"patterns": [
-				{
-					"include": "#magic-names"
-				},
-				{
-					"include": "#illegal-names"
-				},
-				{
-					"include": "#illegal-object-name"
-				},
-				{
-					"include": "#special-names"
-				},
-				{
-					"include": "#line-continuation"
-				},
-				{
-					"include": "#item-access"
-				}
+				{ "include": "#magic-names" },
+				{ "include": "#illegal-names" },
+				{ "include": "#illegal-object-name" },
+				{ "include": "#special-names" },
+				{ "include": "#line-continuation" },
+				{ "include": "#item-access" }
 			]
 		},
 		"member-access-attribute": {
@@ -598,116 +344,58 @@
 			"match": "(?x)\n  \\b ([[:alpha:]_]\\w*) \\b\n"
 		},
 		"special-names": {
-			"patterns": [
-        {
-          "include": "#robot-variable-names"
-        }
-      ]
+			"patterns": [ { "include": "#robot-variable-names" } ]
 		},
 		"curly-braces": {
 			"begin": "\\{",
 			"end": "\\}",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.dict.begin.python"
-				}
-			},
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.dict.end.python"
-				}
-			},
+			"beginCaptures": { "0": { "name": "punctuation.definition.dict.begin.python" } },
+			"endCaptures": { "0": { "name": "punctuation.definition.dict.end.python" } },
 			"patterns": [
 				{
 					"name": "punctuation.separator.dict.python",
 					"match": ":"
 				},
-				{
-					"include": "#expression"
-				}
+				{ "include": "#expression" }
 			]
 		},
 		"list": {
 			"begin": "\\[",
 			"end": "\\]",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.list.begin.python"
-				}
-			},
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.list.end.python"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#expression"
-				}
-			]
+			"beginCaptures": { "0": { "name": "punctuation.definition.list.begin.python" } },
+			"endCaptures": { "0": { "name": "punctuation.definition.list.end.python" } },
+			"patterns": [ { "include": "#expression" } ]
 		},
 		"odd-function-call": {
 			"comment": "A bit obscured function call where there may have been an\narbitrary number of other operations to get the function.\nE.g. \"arr[idx](args)\"\n",
 			"begin": "(?x)\n  (?<= \\] | \\) ) \\s*\n  (?=\\()\n",
 			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.arguments.end.python"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#function-arguments"
-				}
-			]
+			"endCaptures": { "1": { "name": "punctuation.definition.arguments.end.python" } },
+			"patterns": [ { "include": "#function-arguments" } ]
 		},
 		"round-braces": {
 			"begin": "\\(",
 			"end": "\\)",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.parenthesis.begin.python"
-				}
-			},
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.parenthesis.end.python"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#expression"
-				}
-			]
+			"beginCaptures": { "0": { "name": "punctuation.parenthesis.begin.python" } },
+			"endCaptures": { "0": { "name": "punctuation.parenthesis.end.python" } },
+			"patterns": [ { "include": "#expression" } ]
 		},
 		"line-continuation": {
 			"patterns": [
 				{
 					"match": "(\\\\)\\s*(\\S.*$\\n?)",
 					"captures": {
-						"1": {
-							"name": "punctuation.separator.continuation.line.python"
-						},
-						"2": {
-							"name": "invalid.illegal.line.continuation.python"
-						}
+						"1": { "name": "punctuation.separator.continuation.line.python" },
+						"2": { "name": "invalid.illegal.line.continuation.python" }
 					}
 				},
 				{
 					"begin": "(\\\\)\\s*$\\n?",
 					"end": "(?x)\n  (?=^\\s*$)\n  |\n  (?! (\\s* [rR]? (\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))\n      |\n      (\\G $)  (?# '\\G' is necessary for ST)\n  )\n",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.separator.continuation.line.python"
-						}
-					},
+					"beginCaptures": { "1": { "name": "punctuation.separator.continuation.line.python" } },
 					"patterns": [
-						{
-							"include": "#regexp"
-						},
-						{
-							"include": "#string"
-						}
+						{ "include": "#regexp" },
+						{ "include": "#string" }
 					]
 				}
 			]
@@ -719,24 +407,12 @@
 		"operator": {
 			"match": "(?x)\n    \\b(?<!\\.)\n      (?:\n        (and | or | not | in | is)                         (?# 1)\n        |\n        (for | if | else | await | (?:yield(?:\\s+from)?))  (?# 2)\n      )\n    (?!\\s*:)\\b\n\n    | (<< | >> | & | \\| | \\^ | ~)                          (?# 3)\n\n    | (\\*\\* | \\* | \\+ | - | % | // | / | @)                (?# 4)\n\n    | (!= | == | >= | <= | < | >)                          (?# 5)\n\n    | (:=)                                                 (?# 6)\n",
 			"captures": {
-				"1": {
-					"name": "keyword.operator.logical.python"
-				},
-				"2": {
-					"name": "keyword.control.flow.python"
-				},
-				"3": {
-					"name": "keyword.operator.bitwise.python"
-				},
-				"4": {
-					"name": "keyword.operator.arithmetic.python"
-				},
-				"5": {
-					"name": "keyword.operator.comparison.python"
-				},
-				"6": {
-					"name": "keyword.operator.assignment.python"
-				}
+				"1": { "name": "keyword.operator.logical.python" },
+				"2": { "name": "keyword.control.flow.python" },
+				"3": { "name": "keyword.operator.bitwise.python" },
+				"4": { "name": "keyword.operator.arithmetic.python" },
+				"5": { "name": "keyword.operator.comparison.python" },
+				"6": { "name": "keyword.operator.assignment.python" }
 			}
 		},
 		"punctuation": {
@@ -757,32 +433,18 @@
 					"name": "constant.language.python",
 					"match": "\\b(True|False|None|NotImplemented|Ellipsis)\\b"
 				},
-				{
-					"include": "#number"
-				}
+				{ "include": "#number" }
 			]
 		},
 		"number": {
 			"name": "constant.numeric.python",
 			"patterns": [
-				{
-					"include": "#number-float"
-				},
-				{
-					"include": "#number-dec"
-				},
-				{
-					"include": "#number-hex"
-				},
-				{
-					"include": "#number-oct"
-				},
-				{
-					"include": "#number-bin"
-				},
-				{
-					"include": "#number-long"
-				},
+				{ "include": "#number-float" },
+				{ "include": "#number-dec" },
+				{ "include": "#number-hex" },
+				{ "include": "#number-oct" },
+				{ "include": "#number-bin" },
+				{ "include": "#number-long" },
 				{
 					"name": "invalid.illegal.name.python",
 					"match": "\\b[0-9]+\\w+"
@@ -792,134 +454,68 @@
 		"number-float": {
 			"name": "constant.numeric.float.python",
 			"match": "(?x)\n  (?<! \\w)(?:\n    (?:\n      \\.[0-9](?: _?[0-9] )*\n      |\n      [0-9](?: _?[0-9] )* \\. [0-9](?: _?[0-9] )*\n      |\n      [0-9](?: _?[0-9] )* \\.\n    ) (?: [eE][+-]?[0-9](?: _?[0-9] )* )?\n    |\n    [0-9](?: _?[0-9] )* (?: [eE][+-]?[0-9](?: _?[0-9] )* )\n  )([jJ])?\\b\n",
-			"captures": {
-				"1": {
-					"name": "storage.type.imaginary.number.python"
-				}
-			}
+			"captures": { "1": { "name": "storage.type.imaginary.number.python" } }
 		},
 		"number-dec": {
 			"name": "constant.numeric.dec.python",
 			"match": "(?x)\n  (?<![\\w\\.])(?:\n      [1-9](?: _?[0-9] )*\n      |\n      0+\n      |\n      [0-9](?: _?[0-9] )* ([jJ])\n      |\n      0 ([0-9]+)(?![eE\\.])\n  )\\b\n",
 			"captures": {
-				"1": {
-					"name": "storage.type.imaginary.number.python"
-				},
-				"2": {
-					"name": "invalid.illegal.dec.python"
-				}
+				"1": { "name": "storage.type.imaginary.number.python" },
+				"2": { "name": "invalid.illegal.dec.python" }
 			}
 		},
 		"number-hex": {
 			"name": "constant.numeric.hex.python",
 			"match": "(?x)\n  (?<![\\w\\.])\n    (0[xX]) (_?[0-9a-fA-F])+\n  \\b\n",
-			"captures": {
-				"1": {
-					"name": "storage.type.number.python"
-				}
-			}
+			"captures": { "1": { "name": "storage.type.number.python" } }
 		},
 		"number-oct": {
 			"name": "constant.numeric.oct.python",
 			"match": "(?x)\n  (?<![\\w\\.])\n    (0[oO]) (_?[0-7])+\n  \\b\n",
-			"captures": {
-				"1": {
-					"name": "storage.type.number.python"
-				}
-			}
+			"captures": { "1": { "name": "storage.type.number.python" } }
 		},
 		"number-bin": {
 			"name": "constant.numeric.bin.python",
 			"match": "(?x)\n  (?<![\\w\\.])\n    (0[bB]) (_?[01])+\n  \\b\n",
-			"captures": {
-				"1": {
-					"name": "storage.type.number.python"
-				}
-			}
+			"captures": { "1": { "name": "storage.type.number.python" } }
 		},
 		"number-long": {
 			"name": "constant.numeric.bin.python",
 			"comment": "this is to support python2 syntax for long ints",
 			"match": "(?x)\n  (?<![\\w\\.])\n    ([1-9][0-9]* | 0) ([lL])\n  \\b\n",
-			"captures": {
-				"2": {
-					"name": "storage.type.number.python"
-				}
-			}
+			"captures": { "2": { "name": "storage.type.number.python" } }
 		},
 		"regexp": {
 			"patterns": [
-				{
-					"include": "#regexp-single-three-line"
-				},
-				{
-					"include": "#regexp-double-three-line"
-				},
-				{
-					"include": "#regexp-single-one-line"
-				},
-				{
-					"include": "#regexp-double-one-line"
-				}
+				{ "include": "#regexp-single-three-line" },
+				{ "include": "#regexp-double-three-line" },
+				{ "include": "#regexp-single-one-line" },
+				{ "include": "#regexp-double-one-line" }
 			]
 		},
 		"string": {
 			"patterns": [
-				{
-					"include": "#string-quoted-multi-line"
-				},
-				{
-					"include": "#string-quoted-single-line"
-				},
-				{
-					"include": "#string-bin-quoted-multi-line"
-				},
-				{
-					"include": "#string-bin-quoted-single-line"
-				},
-				{
-					"include": "#string-raw-quoted-multi-line"
-				},
-				{
-					"include": "#string-raw-quoted-single-line"
-				},
-				{
-					"include": "#string-raw-bin-quoted-multi-line"
-				},
-				{
-					"include": "#string-raw-bin-quoted-single-line"
-				},
-				{
-					"include": "#fstring-fnorm-quoted-multi-line"
-				},
-				{
-					"include": "#fstring-fnorm-quoted-single-line"
-				},
-				{
-					"include": "#fstring-normf-quoted-multi-line"
-				},
-				{
-					"include": "#fstring-normf-quoted-single-line"
-				},
-				{
-					"include": "#fstring-raw-quoted-multi-line"
-				},
-				{
-					"include": "#fstring-raw-quoted-single-line"
-				}
+				{ "include": "#string-quoted-multi-line" },
+				{ "include": "#string-quoted-single-line" },
+				{ "include": "#string-bin-quoted-multi-line" },
+				{ "include": "#string-bin-quoted-single-line" },
+				{ "include": "#string-raw-quoted-multi-line" },
+				{ "include": "#string-raw-quoted-single-line" },
+				{ "include": "#string-raw-bin-quoted-multi-line" },
+				{ "include": "#string-raw-bin-quoted-single-line" },
+				{ "include": "#fstring-fnorm-quoted-multi-line" },
+				{ "include": "#fstring-fnorm-quoted-single-line" },
+				{ "include": "#fstring-normf-quoted-multi-line" },
+				{ "include": "#fstring-normf-quoted-single-line" },
+				{ "include": "#fstring-raw-quoted-multi-line" },
+				{ "include": "#fstring-raw-quoted-single-line" }
 			]
 		},
 		"string-unicode-guts": {
 			"patterns": [
-				{
-					"include": "#escape-sequence-unicode"
-				},
-				{
-					"include": "#string-entity"
-				},
-				{
-					"include": "#string-brace-formatting"
-				}
+				{ "include": "#escape-sequence-unicode" },
+				{ "include": "#string-entity" },
+				{ "include": "#string-brace-formatting" }
 			]
 		},
 		"string-consume-escape": {
@@ -927,105 +523,57 @@
 		},
 		"string-raw-guts": {
 			"patterns": [
-				{
-					"include": "#string-consume-escape"
-				},
-				{
-					"include": "#string-formatting"
-				},
-				{
-					"include": "#string-brace-formatting"
-				}
+				{ "include": "#string-consume-escape" },
+				{ "include": "#string-formatting" },
+				{ "include": "#string-brace-formatting" }
 			]
 		},
 		"string-raw-bin-guts": {
 			"patterns": [
-				{
-					"include": "#string-consume-escape"
-				},
-				{
-					"include": "#string-formatting"
-				}
+				{ "include": "#string-consume-escape" },
+				{ "include": "#string-formatting" }
 			]
 		},
 		"string-entity": {
 			"patterns": [
-				{
-					"include": "#escape-sequence"
-				},
-				{
-					"include": "#string-line-continuation"
-				},
-				{
-					"include": "#string-formatting"
-				}
+				{ "include": "#escape-sequence" },
+				{ "include": "#string-line-continuation" },
+				{ "include": "#string-formatting" }
 			]
 		},
 		"fstring-guts": {
 			"patterns": [
-				{
-					"include": "#escape-sequence-unicode"
-				},
-				{
-					"include": "#escape-sequence"
-				},
-				{
-					"include": "#string-line-continuation"
-				},
-				{
-					"include": "#fstring-formatting"
-				}
+				{ "include": "#escape-sequence-unicode" },
+				{ "include": "#escape-sequence" },
+				{ "include": "#string-line-continuation" },
+				{ "include": "#fstring-formatting" }
 			]
 		},
 		"fstring-raw-guts": {
 			"patterns": [
-				{
-					"include": "#string-consume-escape"
-				},
-				{
-					"include": "#fstring-formatting"
-				}
+				{ "include": "#string-consume-escape" },
+				{ "include": "#fstring-formatting" }
 			]
 		},
 		"fstring-illegal-single-brace": {
 			"comment": "it is illegal to have a multiline brace inside a single-line string",
 			"begin": "(\\{)(?=[^\\n}]*$\\n?)",
 			"end": "(\\})|(?=\\n)",
-			"beginCaptures": {
-				"1": {
-					"name": "constant.character.format.placeholder.other.python"
-				}
-			},
-			"endCaptures": {
-				"1": {
-					"name": "constant.character.format.placeholder.other.python"
-				}
-			},
+			"beginCaptures": { "1": { "name": "constant.character.format.placeholder.other.python" } },
+			"endCaptures": { "1": { "name": "constant.character.format.placeholder.other.python" } },
 			"patterns": [
-				{
-					"include": "#fstring-terminator-single"
-				},
-				{
-					"include": "#f-expression"
-				}
+				{ "include": "#fstring-terminator-single" },
+				{ "include": "#f-expression" }
 			]
 		},
 		"fstring-illegal-multi-brace": {
-			"patterns": [
-				{
-					"include": "#impossible"
-				}
-			]
+			"patterns": [ { "include": "#impossible" } ]
 		},
 		"f-expression": {
 			"comment": "All valid Python expressions, except comments and line continuation",
 			"patterns": [
-				{
-					"include": "#expression-bare"
-				},
-				{
-					"include": "#member-access"
-				},
+				{ "include": "#expression-bare" },
+				{ "include": "#member-access" },
 				{
 					"comment": "Tokenize identifiers to help linters",
 					"match": "(?x) \\b ([[:alpha:]_]\\w*) \\b"
@@ -1051,11 +599,7 @@
 		"string-formatting": {
 			"name": "meta.format.percent.python",
 			"match": "(?x)\n  (\n    % (\\([\\w\\s]*\\))?\n      [-+#0 ]*\n      (\\d+|\\*)? (\\.(\\d+|\\*))?\n      ([hlL])?\n      [diouxXeEfFgGcrsab%]\n  )\n",
-			"captures": {
-				"1": {
-					"name": "constant.character.format.placeholder.other.python"
-				}
-			}
+			"captures": { "1": { "name": "constant.character.format.placeholder.other.python" } }
 		},
 		"string-brace-formatting": {
 			"patterns": [
@@ -1063,42 +607,26 @@
 					"name": "meta.format.brace.python",
 					"match": "(?x)\n  (\n    {{ | }}\n    | (?:\n      {\n        \\w* (\\.[[:alpha:]_]\\w* | \\[[^\\]'\"]+\\])*\n        (![rsa])?\n        ( : \\w? [<>=^]? [-+ ]? \\#?\n          \\d* ,? (\\.\\d+)? [bcdeEfFgGnosxX%]? )?\n      })\n  )\n",
 					"captures": {
-						"1": {
-							"name": "constant.character.format.placeholder.other.python"
-						},
-						"3": {
-							"name": "storage.type.format.python"
-						},
-						"4": {
-							"name": "storage.type.format.python"
-						}
+						"1": { "name": "constant.character.format.placeholder.other.python" },
+						"3": { "name": "storage.type.format.python" },
+						"4": { "name": "storage.type.format.python" }
 					}
 				},
 				{
 					"name": "meta.format.brace.python",
 					"match": "(?x)\n  (\n    {\n      \\w* (\\.[[:alpha:]_]\\w* | \\[[^\\]'\"]+\\])*\n      (![rsa])?\n      (:)\n        [^'\"{}\\n]* (?:\n          \\{ [^'\"}\\n]*? \\} [^'\"{}\\n]*\n        )*\n    }\n  )\n",
 					"captures": {
-						"1": {
-							"name": "constant.character.format.placeholder.other.python"
-						},
-						"3": {
-							"name": "storage.type.format.python"
-						},
-						"4": {
-							"name": "storage.type.format.python"
-						}
+						"1": { "name": "constant.character.format.placeholder.other.python" },
+						"3": { "name": "storage.type.format.python" },
+						"4": { "name": "storage.type.format.python" }
 					}
 				}
 			]
 		},
 		"fstring-formatting": {
 			"patterns": [
-				{
-					"include": "#fstring-formatting-braces"
-				},
-				{
-					"include": "#fstring-formatting-singe-brace"
-				}
+				{ "include": "#fstring-formatting-braces" },
+				{ "include": "#fstring-formatting-singe-brace" }
 			]
 		},
 		"fstring-formatting-singe-brace": {
@@ -1109,34 +637,18 @@
 			"patterns": [
 				{
 					"match": "((?<=\\.)lambda|lambda(?=\\s*[\\.=]))",
-					"captures": {
-						"1": {
-							"name": "keyword.control.flow.python"
-						}
-					}
+					"captures": { "1": { "name": "keyword.control.flow.python" } }
 				},
 				{
 					"match": "\\b(lambda)\\s*?(?=[,\\n]|$)",
-					"captures": {
-						"1": {
-							"name": "storage.type.function.lambda.python"
-						}
-					}
+					"captures": { "1": { "name": "storage.type.function.lambda.python" } }
 				},
 				{
 					"name": "meta.lambda-function.python",
 					"begin": "(?x)\n  \\b (lambda) \\b\n",
 					"end": "(:)|(\\n)",
-					"beginCaptures": {
-						"1": {
-							"name": "storage.type.function.lambda.python"
-						}
-					},
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.section.function.lambda.begin.python"
-						}
-					},
+					"beginCaptures": { "1": { "name": "storage.type.function.lambda.python" } },
+					"endCaptures": { "1": { "name": "punctuation.section.function.lambda.begin.python" } },
 					"contentName": "meta.function.lambda.parameters.python",
 					"patterns": [
 						{
@@ -1147,41 +659,21 @@
 							"name": "keyword.operator.unpacking.parameter.python",
 							"match": "(\\*\\*|\\*)"
 						},
-						{
-							"include": "#lambda-nested-incomplete"
-						},
-						{
-							"include": "#illegal-names"
-						},
+						{ "include": "#lambda-nested-incomplete" },
+						{ "include": "#illegal-names" },
 						{
 							"match": "([[:alpha:]_]\\w*)\\s*(?:(,)|(?=:|$))",
 							"captures": {
-								"1": {
-									"name": "variable.parameter.function.language.python"
-								},
-								"2": {
-									"name": "punctuation.separator.parameters.python"
-								}
+								"1": { "name": "variable.parameter.function.language.python" },
+								"2": { "name": "punctuation.separator.parameters.python" }
 							}
 						},
-						{
-							"include": "#comments"
-						},
-						{
-							"include": "#backticks"
-						},
-						{
-							"include": "#illegal-anno"
-						},
-						{
-							"include": "#lambda-parameter-with-default"
-						},
-						{
-							"include": "#line-continuation"
-						},
-						{
-							"include": "#illegal-operator"
-						}
+						{ "include": "#comments" },
+						{ "include": "#backticks" },
+						{ "include": "#illegal-anno" },
+						{ "include": "#lambda-parameter-with-default" },
+						{ "include": "#line-continuation" },
+						{ "include": "#illegal-operator" }
 					]
 				}
 			]
@@ -1198,43 +690,19 @@
 			"begin": "(?x)\n  \\b\n  ([[:alpha:]_]\\w*) \\s* (=)\n",
 			"end": "(,)|(?=:|$)",
 			"beginCaptures": {
-				"1": {
-					"name": "variable.parameter.function.language.python"
-				},
-				"2": {
-					"name": "keyword.operator.python"
-				}
-			},
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.separator.parameters.python"
-				}
+				"1": { "name": "variable.parameter.function.language.python" },
+				"2": { "name": "keyword.operator.python" }
 			},
-			"patterns": [
-				{
-					"include": "#expression"
-				}
-			]
+			"endCaptures": { "1": { "name": "punctuation.separator.parameters.python" } },
+			"patterns": [ { "include": "#expression" } ]
 		},
 		"generator": {
 			"comment": "Match \"for ... in\" construct used in generators and for loops to\ncorrectly identify the \"in\" as a control flow keyword.\n",
 			"begin": "\\bfor\\b",
-			"beginCaptures": {
-				"0": {
-					"name": "keyword.control.flow.python"
-				}
-			},
+			"beginCaptures": { "0": { "name": "keyword.control.flow.python" } },
 			"end": "\\bin\\b",
-			"endCaptures": {
-				"0": {
-					"name": "keyword.control.flow.python"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#expression"
-				}
-			]
+			"endCaptures": { "0": { "name": "keyword.control.flow.python" } },
+			"patterns": [ { "include": "#expression" } ]
 		},
 		"item-access": {
 			"patterns": [
@@ -1242,36 +710,20 @@
 					"name": "meta.item-access.python",
 					"begin": "(?x)\n  \\b(?=\n    [[:alpha:]_]\\w* \\s* \\[\n  )\n",
 					"end": "(\\])",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.definition.arguments.end.python"
-						}
-					},
+					"endCaptures": { "1": { "name": "punctuation.definition.arguments.end.python" } },
 					"patterns": [
-						{
-							"include": "#item-name"
-						},
-						{
-							"include": "#item-index"
-						},
-						{
-							"include": "#expression"
-						}
+						{ "include": "#item-name" },
+						{ "include": "#item-index" },
+						{ "include": "#expression" }
 					]
 				}
 			]
 		},
 		"item-name": {
 			"patterns": [
-				{
-					"include": "#special-variables"
-				},
-				{
-					"include": "#builtin-functions"
-				},
-				{
-					"include": "#special-names"
-				},
+				{ "include": "#special-variables" },
+				{ "include": "#builtin-functions" },
+				{ "include": "#special-names" },
 				{
 					"name": "meta.indexed-name.python",
 					"match": "(?x)\n  \\b ([[:alpha:]_]\\w*) \\b\n"
@@ -1281,20 +733,14 @@
 		"item-index": {
 			"begin": "(\\[)",
 			"end": "(?=\\])",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.definition.arguments.begin.python"
-				}
-			},
+			"beginCaptures": { "1": { "name": "punctuation.definition.arguments.begin.python" } },
 			"contentName": "meta.item-access.arguments.python",
 			"patterns": [
 				{
 					"name": "punctuation.separator.slice.python",
 					"match": ":"
 				},
-				{
-					"include": "#expression"
-				}
+				{ "include": "#expression" }
 			]
 		},
 		"function-call": {
@@ -1302,28 +748,16 @@
 			"comment": "Regular function call of the type \"name(args)\"",
 			"begin": "(?x)\n  \\b(?=\n    ([[:alpha:]_]\\w*) \\s* (\\()\n  )\n",
 			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.arguments.end.python"
-				}
-			},
+			"endCaptures": { "1": { "name": "punctuation.definition.arguments.end.python" } },
 			"patterns": [
-				{
-					"include": "#special-variables"
-				},
-				{
-					"include": "#function-name"
-				},
-				{
-					"include": "#function-arguments"
-				}
+				{ "include": "#special-variables" },
+				{ "include": "#function-name" },
+				{ "include": "#function-arguments" }
 			]
 		},
 		"function-name": {
 			"patterns": [
-				{
-					"include": "#builtin-possible-callables"
-				},
+				{ "include": "#builtin-possible-callables" },
 				{
 					"comment": "Some color schemas support meta.function-call.generic scope",
 					"name": "meta.function-call.generic.python",
@@ -1334,11 +768,7 @@
 		"function-arguments": {
 			"begin": "(\\()",
 			"end": "(?=\\))(?!\\)\\s*\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.definition.arguments.begin.python"
-				}
-			},
+			"beginCaptures": { "1": { "name": "punctuation.definition.arguments.begin.python" } },
 			"contentName": "meta.function-call.arguments.python",
 			"patterns": [
 				{
@@ -1347,76 +777,44 @@
 				},
 				{
 					"match": "(?x)\n  (?:(?<=[,(])|^) \\s* (\\*{1,2})\n",
-					"captures": {
-						"1": {
-							"name": "keyword.operator.unpacking.arguments.python"
-						}
-					}
-				},
-				{
-					"include": "#lambda-incomplete"
-				},
-				{
-					"include": "#illegal-names"
+					"captures": { "1": { "name": "keyword.operator.unpacking.arguments.python" } }
 				},
+				{ "include": "#lambda-incomplete" },
+				{ "include": "#illegal-names" },
 				{
 					"match": "\\b([[:alpha:]_]\\w*)\\s*(=)(?!=)",
 					"captures": {
-						"1": {
-							"name": "variable.parameter.function-call.python"
-						},
-						"2": {
-							"name": "keyword.operator.assignment.python"
-						}
+						"1": { "name": "variable.parameter.function-call.python" },
+						"2": { "name": "keyword.operator.assignment.python" }
 					}
 				},
 				{
 					"name": "keyword.operator.assignment.python",
 					"match": "=(?!=)"
 				},
-				{
-					"include": "#expression"
-				},
+				{ "include": "#expression" },
 				{
 					"match": "\\s*(\\))\\s*(\\()",
 					"captures": {
-						"1": {
-							"name": "punctuation.definition.arguments.end.python"
-						},
-						"2": {
-							"name": "punctuation.definition.arguments.begin.python"
-						}
+						"1": { "name": "punctuation.definition.arguments.end.python" },
+						"2": { "name": "punctuation.definition.arguments.begin.python" }
 					}
 				}
 			]
 		},
 		"builtin-callables": {
 			"patterns": [
-				{
-					"include": "#illegal-names"
-				},
-				{
-					"include": "#illegal-object-name"
-				},
-				{
-					"include": "#builtin-exceptions"
-				},
-				{
-					"include": "#builtin-functions"
-				},
-				{
-					"include": "#builtin-types"
-				}
+				{ "include": "#illegal-names" },
+				{ "include": "#illegal-object-name" },
+				{ "include": "#builtin-exceptions" },
+				{ "include": "#builtin-functions" },
+				{ "include": "#builtin-types" }
 			]
 		},
 		"builtin-possible-callables": {
 			"patterns": [
-				{
-					"include": "#builtin-callables"
-				},
-				{
-					"include": "#magic-names"
-				}
+				{ "include": "#builtin-callables" },
+				{ "include": "#magic-names" }
 			]
 		},
 		"builtin-exceptions": {
@@ -1442,72 +840,44 @@
 		"magic-function-names": {
 			"comment": "these methods have magic interpretation by python and are generally called\nindirectly through syntactic constructs\n",
 			"match": "(?x)\n  \\b(\n    __(?:\n      abs | add | aenter | aexit | aiter | and | anext\n      | await | bool | call | ceil | class_getitem\n      | cmp | coerce | complex | contains | copy\n      | deepcopy | del | delattr | delete | delitem\n      | delslice | dir | div | divmod | enter | eq\n      | exit | float | floor | floordiv | format | ge\n      | get | getattr | getattribute | getinitargs\n      | getitem | getnewargs | getslice | getstate | gt\n      | hash | hex | iadd | iand | idiv | ifloordiv |\n      | ilshift | imod | imul | index | init\n      | instancecheck | int | invert | ior | ipow\n      | irshift | isub | iter | itruediv | ixor | le\n      | len | long | lshift | lt | missing | mod | mul\n      | ne | neg | new | next | nonzero | oct | or | pos\n      | pow | radd | rand | rdiv | rdivmod | reduce\n      | reduce_ex | repr | reversed | rfloordiv |\n      | rlshift | rmod | rmul | ror | round | rpow\n      | rrshift | rshift | rsub | rtruediv | rxor | set\n      | setattr | setitem | set_name | setslice\n      | setstate | sizeof | str | sub | subclasscheck\n      | truediv | trunc | unicode | xor | matmul\n      | rmatmul | imatmul | init_subclass | set_name\n      | fspath | bytes | prepare | length_hint\n    )__\n  )\\b\n",
-			"captures": {
-				"1": {
-					"name": "support.function.magic.python"
-				}
-			}
+			"captures": { "1": { "name": "support.function.magic.python" } }
 		},
 		"magic-variable-names": {
 			"comment": "magic variables which a class/module may have.",
 			"match": "(?x)\n  \\b(\n    __(?:\n      all | annotations | bases | builtins | class\n      | closure | code | debug | defaults | dict | doc | file | func\n      | globals | kwdefaults | match_args | members | metaclass | methods\n      | module | mro | mro_entries | name | qualname | post_init | self\n      | signature | slots | subclasses | version | weakref | wrapped\n      | classcell | spec | path | package | future | traceback\n    )__\n  )\\b\n",
-			"captures": {
-				"1": {
-					"name": "support.variable.magic.python"
-				}
-			}
+			"captures": { "1": { "name": "support.variable.magic.python" } }
 		},
 		"magic-names": {
 			"patterns": [
-				{
-					"include": "#magic-function-names"
-				},
-				{
-					"include": "#magic-variable-names"
-				}
+				{ "include": "#magic-function-names" },
+				{ "include": "#magic-variable-names" }
 			]
 		},
 		"illegal-names": {
 			"match": "(?x)\n  \\b(?:\n    (\n      and | assert | async | await | break | class | continue | def\n      | del | elif | else | except | finally | for | from | global\n      | if | in | is | (?<=\\.)lambda | lambda(?=\\s*[\\.=])\n      | nonlocal | not | or | pass | raise | return | try | while | with\n      | yield\n    ) | (\n      as | import\n    )\n  )\\b\n",
 			"captures": {
-				"1": {
-					"name": "keyword.control.flow.python"
-				},
-				"2": {
-					"name": "keyword.control.import.python"
-				}
+				"1": { "name": "keyword.control.flow.python" },
+				"2": { "name": "keyword.control.import.python" }
 			}
 		},
 		"special-variables": {
 			"match": "(?x)\n  \\b (?<!\\.) (?:\n    (self) | (cls)\n  )\\b\n",
 			"captures": {
-				"1": {
-					"name": "variable.language.special.self.python"
-				},
-				"2": {
-					"name": "variable.language.special.cls.python"
-				}
+				"1": { "name": "variable.language.special.self.python" },
+				"2": { "name": "variable.language.special.cls.python" }
 			}
 		},
-    "robot-variable-names": {
+		"robot-variable-names": {
 			"patterns": [
-        {
-          "include": "#robot-expression-variable"
-        },
-        {
-          "include": "#variables"
-        }
-      ]
+				{ "include": "#robot-expression-variable" },
+				{ "include": "#variables" }
+			]
 		},
 		"robot-expression-variable": {
 			"match": "(\\$)([[:alpha:]_]\\w*)",
 			"captures": {
-				"1": {
-					"name": "punctuation.definition.variable.begin.robotframework"
-				},
-				"2": {
-					"name": "variable.other.readwrite.robotframework"
-				}
+				"1": { "name": "punctuation.definition.variable.begin.robotframework" },
+				"2": { "name": "variable.other.readwrite.robotframework" }
 			}
 		},
 		"ellipsis": {
@@ -1518,11 +888,7 @@
 			"name": "invalid.deprecated.backtick.python",
 			"begin": "\\`",
 			"end": "(?:\\`|(?<!\\\\)(\\n))",
-			"patterns": [
-				{
-					"include": "#expression"
-				}
-			]
+			"patterns": [ { "include": "#expression" } ]
 		},
 		"illegal-operator": {
 			"patterns": [
@@ -1548,28 +914,16 @@
 		},
 		"regexp-base-expression": {
 			"patterns": [
-				{
-					"include": "#regexp-quantifier"
-				},
-				{
-					"include": "#regexp-base-common"
-				}
+				{ "include": "#regexp-quantifier" },
+				{ "include": "#regexp-base-common" }
 			]
 		},
 		"fregexp-base-expression": {
 			"patterns": [
-				{
-					"include": "#fregexp-quantifier"
-				},
-				{
-					"include": "#fstring-formatting-braces"
-				},
-				{
-					"match": "\\{.*?\\}"
-				},
-				{
-					"include": "#regexp-base-common"
-				}
+				{ "include": "#fregexp-quantifier" },
+				{ "include": "#fstring-formatting-braces" },
+				{ "match": "\\{.*?\\}" },
+				{ "include": "#regexp-base-common" }
 			]
 		},
 		"fstring-formatting-braces": {
@@ -1578,15 +932,9 @@
 					"comment": "empty braces are illegal",
 					"match": "({)(\\s*?)(})",
 					"captures": {
-						"1": {
-							"name": "constant.character.format.placeholder.other.python"
-						},
-						"2": {
-							"name": "invalid.illegal.brace.python"
-						},
-						"3": {
-							"name": "constant.character.format.placeholder.other.python"
-						}
+						"1": { "name": "constant.character.format.placeholder.other.python" },
+						"2": { "name": "invalid.illegal.brace.python" },
+						"3": { "name": "constant.character.format.placeholder.other.python" }
 					}
 				},
 				{
@@ -1617,9 +965,7 @@
 					"name": "keyword.operator.disjunction.regexp",
 					"match": "\\|"
 				},
-				{
-					"include": "#regexp-escape-sequence"
-				}
+				{ "include": "#regexp-escape-sequence" }
 			]
 		},
 		"regexp-quantifier": {
@@ -1633,25 +979,15 @@
 		"regexp-backreference-number": {
 			"name": "meta.backreference.regexp",
 			"match": "(\\\\[1-9]\\d?)",
-			"captures": {
-				"1": {
-					"name": "entity.name.tag.backreference.regexp"
-				}
-			}
+			"captures": { "1": { "name": "entity.name.tag.backreference.regexp" } }
 		},
 		"regexp-backreference": {
 			"name": "meta.backreference.named.regexp",
 			"match": "(?x)\n  (\\()  (\\?P= \\w+(?:\\s+[[:alnum:]]+)?)  (\\))\n",
 			"captures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.backreference.named.begin.regexp"
-				},
-				"2": {
-					"name": "entity.name.tag.named.backreference.regexp"
-				},
-				"3": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.backreference.named.end.regexp"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.backreference.named.begin.regexp" },
+				"2": { "name": "entity.name.tag.named.backreference.regexp" },
+				"3": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.backreference.named.end.regexp" }
 			}
 		},
 		"regexp-flags": {
@@ -1676,21 +1012,11 @@
 		},
 		"regexp-escape-sequence": {
 			"patterns": [
-				{
-					"include": "#regexp-escape-special"
-				},
-				{
-					"include": "#regexp-escape-character"
-				},
-				{
-					"include": "#regexp-escape-unicode"
-				},
-				{
-					"include": "#regexp-backreference-number"
-				},
-				{
-					"include": "#regexp-escape-catchall"
-				}
+				{ "include": "#regexp-escape-special" },
+				{ "include": "#regexp-escape-character" },
+				{ "include": "#regexp-escape-unicode" },
+				{ "include": "#regexp-backreference-number" },
+				{ "include": "#regexp-escape-catchall" }
 			]
 		},
 		"regexp-charecter-set-escapes": {
@@ -1699,152 +1025,76 @@
 					"name": "constant.character.escape.regexp",
 					"match": "\\\\[abfnrtv\\\\]"
 				},
-				{
-					"include": "#regexp-escape-special"
-				},
+				{ "include": "#regexp-escape-special" },
 				{
 					"name": "constant.character.escape.regexp",
 					"match": "\\\\([0-7]{1,3})"
 				},
-				{
-					"include": "#regexp-escape-character"
-				},
-				{
-					"include": "#regexp-escape-unicode"
-				},
-				{
-					"include": "#regexp-escape-catchall"
-				}
+				{ "include": "#regexp-escape-character" },
+				{ "include": "#regexp-escape-unicode" },
+				{ "include": "#regexp-escape-catchall" }
 			]
 		},
 		"codetags": {
 			"match": "(?:\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b)",
-			"captures": {
-				"1": {
-					"name": "keyword.codetag.notation.python"
-				}
-			}
+			"captures": { "1": { "name": "keyword.codetag.notation.python" } }
 		},
 		"comments-base": {
 			"name": "comment.line.number-sign.python",
 			"begin": "(\\#)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.definition.comment.python"
-				}
-			},
+			"beginCaptures": { "1": { "name": "punctuation.definition.comment.python" } },
 			"end": "($)",
-			"patterns": [
-				{
-					"include": "#codetags"
-				}
-			]
+			"patterns": [ { "include": "#codetags" } ]
 		},
 		"comments-string-single-three": {
 			"name": "comment.line.number-sign.python",
 			"begin": "(\\#)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.definition.comment.python"
-				}
-			},
+			"beginCaptures": { "1": { "name": "punctuation.definition.comment.python" } },
 			"end": "($|(?='''))",
-			"patterns": [
-				{
-					"include": "#codetags"
-				}
-			]
+			"patterns": [ { "include": "#codetags" } ]
 		},
 		"comments-string-double-three": {
 			"name": "comment.line.number-sign.python",
 			"begin": "(\\#)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.definition.comment.python"
-				}
-			},
+			"beginCaptures": { "1": { "name": "punctuation.definition.comment.python" } },
 			"end": "($|(?=\"\"\"))",
-			"patterns": [
-				{
-					"include": "#codetags"
-				}
-			]
+			"patterns": [ { "include": "#codetags" } ]
 		},
 		"single-one-regexp-expression": {
 			"patterns": [
-				{
-					"include": "#regexp-base-expression"
-				},
-				{
-					"include": "#single-one-regexp-character-set"
-				},
-				{
-					"include": "#single-one-regexp-comments"
-				},
-				{
-					"include": "#regexp-flags"
-				},
-				{
-					"include": "#single-one-regexp-named-group"
-				},
-				{
-					"include": "#regexp-backreference"
-				},
-				{
-					"include": "#single-one-regexp-lookahead"
-				},
-				{
-					"include": "#single-one-regexp-lookahead-negative"
-				},
-				{
-					"include": "#single-one-regexp-lookbehind"
-				},
-				{
-					"include": "#single-one-regexp-lookbehind-negative"
-				},
-				{
-					"include": "#single-one-regexp-conditional"
-				},
-				{
-					"include": "#single-one-regexp-parentheses-non-capturing"
-				},
-				{
-					"include": "#single-one-regexp-parentheses"
-				}
+				{ "include": "#regexp-base-expression" },
+				{ "include": "#single-one-regexp-character-set" },
+				{ "include": "#single-one-regexp-comments" },
+				{ "include": "#regexp-flags" },
+				{ "include": "#single-one-regexp-named-group" },
+				{ "include": "#regexp-backreference" },
+				{ "include": "#single-one-regexp-lookahead" },
+				{ "include": "#single-one-regexp-lookahead-negative" },
+				{ "include": "#single-one-regexp-lookbehind" },
+				{ "include": "#single-one-regexp-lookbehind-negative" },
+				{ "include": "#single-one-regexp-conditional" },
+				{ "include": "#single-one-regexp-parentheses-non-capturing" },
+				{ "include": "#single-one-regexp-parentheses" }
 			]
 		},
 		"single-one-regexp-character-set": {
 			"patterns": [
-				{
-					"match": "(?x)\n  \\[ \\^? \\] (?! .*?\\])\n"
-				},
+				{ "match": "(?x)\n  \\[ \\^? \\] (?! .*?\\])\n" },
 				{
 					"name": "meta.character.set.regexp",
 					"begin": "(\\[)(\\^)?(\\])?",
 					"end": "(\\]|(?=\\'))|((?=(?<!\\\\)\\n))",
 					"beginCaptures": {
-						"1": {
-							"name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
-						},
-						"2": {
-							"name": "keyword.operator.negation.regexp"
-						},
-						"3": {
-							"name": "constant.character.set.regexp"
-						}
+						"1": { "name": "punctuation.character.set.begin.regexp constant.other.set.regexp" },
+						"2": { "name": "keyword.operator.negation.regexp" },
+						"3": { "name": "constant.character.set.regexp" }
 					},
 					"endCaptures": {
-						"1": {
-							"name": "punctuation.character.set.end.regexp constant.other.set.regexp"
-						},
-						"2": {
-							"name": "invalid.illegal.newline.python"
-						}
+						"1": { "name": "punctuation.character.set.end.regexp constant.other.set.regexp" },
+						"2": { "name": "invalid.illegal.newline.python" }
 					},
 					"patterns": [
-						{
-							"include": "#regexp-charecter-set-escapes"
-						},
+						{ "include": "#regexp-charecter-set-escapes" },
 						{
 							"name": "constant.character.set.regexp",
 							"match": "[^\\n]"
@@ -1858,297 +1108,147 @@
 			"begin": "(?x)\n  (\\()  (\\?P <\\w+(?:\\s+[[:alnum:]]+)?>)\n",
 			"end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
 			"beginCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
-				},
-				"2": {
-					"name": "entity.name.tag.named.group.regexp"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp" },
+				"2": { "name": "entity.name.tag.named.group.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#single-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#single-one-regexp-expression" } ]
 		},
 		"single-one-regexp-comments": {
 			"name": "comment.regexp",
 			"begin": "\\(\\?#",
 			"end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.comment.begin.regexp"
-				}
-			},
+			"beginCaptures": { "0": { "name": "punctuation.comment.begin.regexp" } },
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.comment.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.comment.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#codetags"
-				}
-			]
+			"patterns": [ { "include": "#codetags" } ]
 		},
 		"single-one-regexp-lookahead": {
 			"begin": "(\\()\\?=",
 			"end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookahead.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookahead.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookahead.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookahead.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#single-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#single-one-regexp-expression" } ]
 		},
 		"single-one-regexp-lookahead-negative": {
 			"begin": "(\\()\\?!",
 			"end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookahead.negative.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookahead.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookahead.negative.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookahead.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#single-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#single-one-regexp-expression" } ]
 		},
 		"single-one-regexp-lookbehind": {
 			"begin": "(\\()\\?<=",
 			"end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookbehind.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookbehind.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookbehind.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookbehind.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#single-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#single-one-regexp-expression" } ]
 		},
 		"single-one-regexp-lookbehind-negative": {
 			"begin": "(\\()\\?<!",
 			"end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookbehind.negative.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookbehind.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookbehind.negative.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookbehind.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#single-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#single-one-regexp-expression" } ]
 		},
 		"single-one-regexp-conditional": {
 			"begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
 			"end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.conditional.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.conditional.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.conditional.regexp" },
+				"1": { "name": "punctuation.parenthesis.conditional.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#single-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#single-one-regexp-expression" } ]
 		},
 		"single-one-regexp-parentheses-non-capturing": {
 			"begin": "\\(\\?:",
 			"end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
-			"beginCaptures": {
-				"0": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp"
-				}
-			},
+			"beginCaptures": { "0": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp" } },
 			"endCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#single-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#single-one-regexp-expression" } ]
 		},
 		"single-one-regexp-parentheses": {
 			"begin": "\\(",
 			"end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
-			"beginCaptures": {
-				"0": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp"
-				}
-			},
+			"beginCaptures": { "0": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp" } },
 			"endCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#single-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#single-one-regexp-expression" } ]
 		},
 		"single-three-regexp-expression": {
 			"patterns": [
-				{
-					"include": "#regexp-base-expression"
-				},
-				{
-					"include": "#single-three-regexp-character-set"
-				},
-				{
-					"include": "#single-three-regexp-comments"
-				},
-				{
-					"include": "#regexp-flags"
-				},
-				{
-					"include": "#single-three-regexp-named-group"
-				},
-				{
-					"include": "#regexp-backreference"
-				},
-				{
-					"include": "#single-three-regexp-lookahead"
-				},
-				{
-					"include": "#single-three-regexp-lookahead-negative"
-				},
-				{
-					"include": "#single-three-regexp-lookbehind"
-				},
-				{
-					"include": "#single-three-regexp-lookbehind-negative"
-				},
-				{
-					"include": "#single-three-regexp-conditional"
-				},
-				{
-					"include": "#single-three-regexp-parentheses-non-capturing"
-				},
-				{
-					"include": "#single-three-regexp-parentheses"
-				},
-				{
-					"include": "#comments-string-single-three"
-				}
+				{ "include": "#regexp-base-expression" },
+				{ "include": "#single-three-regexp-character-set" },
+				{ "include": "#single-three-regexp-comments" },
+				{ "include": "#regexp-flags" },
+				{ "include": "#single-three-regexp-named-group" },
+				{ "include": "#regexp-backreference" },
+				{ "include": "#single-three-regexp-lookahead" },
+				{ "include": "#single-three-regexp-lookahead-negative" },
+				{ "include": "#single-three-regexp-lookbehind" },
+				{ "include": "#single-three-regexp-lookbehind-negative" },
+				{ "include": "#single-three-regexp-conditional" },
+				{ "include": "#single-three-regexp-parentheses-non-capturing" },
+				{ "include": "#single-three-regexp-parentheses" },
+				{ "include": "#comments-string-single-three" }
 			]
 		},
 		"single-three-regexp-character-set": {
 			"patterns": [
-				{
-					"match": "(?x)\n  \\[ \\^? \\] (?! .*?\\])\n"
-				},
+				{ "match": "(?x)\n  \\[ \\^? \\] (?! .*?\\])\n" },
 				{
 					"name": "meta.character.set.regexp",
 					"begin": "(\\[)(\\^)?(\\])?",
 					"end": "(\\]|(?=\\'\\'\\'))",
 					"beginCaptures": {
-						"1": {
-							"name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
-						},
-						"2": {
-							"name": "keyword.operator.negation.regexp"
-						},
-						"3": {
-							"name": "constant.character.set.regexp"
-						}
+						"1": { "name": "punctuation.character.set.begin.regexp constant.other.set.regexp" },
+						"2": { "name": "keyword.operator.negation.regexp" },
+						"3": { "name": "constant.character.set.regexp" }
 					},
 					"endCaptures": {
-						"1": {
-							"name": "punctuation.character.set.end.regexp constant.other.set.regexp"
-						},
-						"2": {
-							"name": "invalid.illegal.newline.python"
-						}
+						"1": { "name": "punctuation.character.set.end.regexp constant.other.set.regexp" },
+						"2": { "name": "invalid.illegal.newline.python" }
 					},
 					"patterns": [
-						{
-							"include": "#regexp-charecter-set-escapes"
-						},
+						{ "include": "#regexp-charecter-set-escapes" },
 						{
 							"name": "constant.character.set.regexp",
 							"match": "[^\\n]"
@@ -2162,318 +1262,170 @@
 			"begin": "(?x)\n  (\\()  (\\?P <\\w+(?:\\s+[[:alnum:]]+)?>)\n",
 			"end": "(\\)|(?=\\'\\'\\'))",
 			"beginCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
-				},
-				"2": {
-					"name": "entity.name.tag.named.group.regexp"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp" },
+				"2": { "name": "entity.name.tag.named.group.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#single-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-single-three"
-				}
+				{ "include": "#single-three-regexp-expression" },
+				{ "include": "#comments-string-single-three" }
 			]
 		},
 		"single-three-regexp-comments": {
 			"name": "comment.regexp",
 			"begin": "\\(\\?#",
 			"end": "(\\)|(?=\\'\\'\\'))",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.comment.begin.regexp"
-				}
-			},
+			"beginCaptures": { "0": { "name": "punctuation.comment.begin.regexp" } },
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.comment.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.comment.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#codetags"
-				}
-			]
+			"patterns": [ { "include": "#codetags" } ]
 		},
 		"single-three-regexp-lookahead": {
 			"begin": "(\\()\\?=",
 			"end": "(\\)|(?=\\'\\'\\'))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookahead.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookahead.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookahead.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookahead.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#single-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-single-three"
-				}
+				{ "include": "#single-three-regexp-expression" },
+				{ "include": "#comments-string-single-three" }
 			]
 		},
 		"single-three-regexp-lookahead-negative": {
 			"begin": "(\\()\\?!",
 			"end": "(\\)|(?=\\'\\'\\'))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookahead.negative.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookahead.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookahead.negative.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookahead.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#single-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-single-three"
-				}
+				{ "include": "#single-three-regexp-expression" },
+				{ "include": "#comments-string-single-three" }
 			]
 		},
 		"single-three-regexp-lookbehind": {
 			"begin": "(\\()\\?<=",
 			"end": "(\\)|(?=\\'\\'\\'))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookbehind.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookbehind.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookbehind.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookbehind.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#single-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-single-three"
-				}
+				{ "include": "#single-three-regexp-expression" },
+				{ "include": "#comments-string-single-three" }
 			]
 		},
 		"single-three-regexp-lookbehind-negative": {
 			"begin": "(\\()\\?<!",
 			"end": "(\\)|(?=\\'\\'\\'))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookbehind.negative.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookbehind.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookbehind.negative.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookbehind.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#single-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-single-three"
-				}
+				{ "include": "#single-three-regexp-expression" },
+				{ "include": "#comments-string-single-three" }
 			]
 		},
 		"single-three-regexp-conditional": {
 			"begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
 			"end": "(\\)|(?=\\'\\'\\'))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.conditional.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.conditional.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.conditional.regexp" },
+				"1": { "name": "punctuation.parenthesis.conditional.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#single-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-single-three"
-				}
+				{ "include": "#single-three-regexp-expression" },
+				{ "include": "#comments-string-single-three" }
 			]
 		},
 		"single-three-regexp-parentheses-non-capturing": {
 			"begin": "\\(\\?:",
 			"end": "(\\)|(?=\\'\\'\\'))",
-			"beginCaptures": {
-				"0": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp"
-				}
-			},
+			"beginCaptures": { "0": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp" } },
 			"endCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#single-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-single-three"
-				}
+				{ "include": "#single-three-regexp-expression" },
+				{ "include": "#comments-string-single-three" }
 			]
 		},
 		"single-three-regexp-parentheses": {
 			"begin": "\\(",
 			"end": "(\\)|(?=\\'\\'\\'))",
-			"beginCaptures": {
-				"0": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp"
-				}
-			},
+			"beginCaptures": { "0": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp" } },
 			"endCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#single-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-single-three"
-				}
+				{ "include": "#single-three-regexp-expression" },
+				{ "include": "#comments-string-single-three" }
 			]
 		},
 		"double-one-regexp-expression": {
 			"patterns": [
-				{
-					"include": "#regexp-base-expression"
-				},
-				{
-					"include": "#double-one-regexp-character-set"
-				},
-				{
-					"include": "#double-one-regexp-comments"
-				},
-				{
-					"include": "#regexp-flags"
-				},
-				{
-					"include": "#double-one-regexp-named-group"
-				},
-				{
-					"include": "#regexp-backreference"
-				},
-				{
-					"include": "#double-one-regexp-lookahead"
-				},
-				{
-					"include": "#double-one-regexp-lookahead-negative"
-				},
-				{
-					"include": "#double-one-regexp-lookbehind"
-				},
-				{
-					"include": "#double-one-regexp-lookbehind-negative"
-				},
-				{
-					"include": "#double-one-regexp-conditional"
-				},
-				{
-					"include": "#double-one-regexp-parentheses-non-capturing"
-				},
-				{
-					"include": "#double-one-regexp-parentheses"
-				}
+				{ "include": "#regexp-base-expression" },
+				{ "include": "#double-one-regexp-character-set" },
+				{ "include": "#double-one-regexp-comments" },
+				{ "include": "#regexp-flags" },
+				{ "include": "#double-one-regexp-named-group" },
+				{ "include": "#regexp-backreference" },
+				{ "include": "#double-one-regexp-lookahead" },
+				{ "include": "#double-one-regexp-lookahead-negative" },
+				{ "include": "#double-one-regexp-lookbehind" },
+				{ "include": "#double-one-regexp-lookbehind-negative" },
+				{ "include": "#double-one-regexp-conditional" },
+				{ "include": "#double-one-regexp-parentheses-non-capturing" },
+				{ "include": "#double-one-regexp-parentheses" }
 			]
 		},
 		"double-one-regexp-character-set": {
 			"patterns": [
-				{
-					"match": "(?x)\n  \\[ \\^? \\] (?! .*?\\])\n"
-				},
+				{ "match": "(?x)\n  \\[ \\^? \\] (?! .*?\\])\n" },
 				{
 					"name": "meta.character.set.regexp",
 					"begin": "(\\[)(\\^)?(\\])?",
 					"end": "(\\]|(?=\"))|((?=(?<!\\\\)\\n))",
 					"beginCaptures": {
-						"1": {
-							"name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
-						},
-						"2": {
-							"name": "keyword.operator.negation.regexp"
-						},
-						"3": {
-							"name": "constant.character.set.regexp"
-						}
+						"1": { "name": "punctuation.character.set.begin.regexp constant.other.set.regexp" },
+						"2": { "name": "keyword.operator.negation.regexp" },
+						"3": { "name": "constant.character.set.regexp" }
 					},
 					"endCaptures": {
-						"1": {
-							"name": "punctuation.character.set.end.regexp constant.other.set.regexp"
-						},
-						"2": {
-							"name": "invalid.illegal.newline.python"
-						}
+						"1": { "name": "punctuation.character.set.end.regexp constant.other.set.regexp" },
+						"2": { "name": "invalid.illegal.newline.python" }
 					},
 					"patterns": [
-						{
-							"include": "#regexp-charecter-set-escapes"
-						},
+						{ "include": "#regexp-charecter-set-escapes" },
 						{
 							"name": "constant.character.set.regexp",
 							"match": "[^\\n]"
@@ -2487,297 +1439,147 @@
 			"begin": "(?x)\n  (\\()  (\\?P <\\w+(?:\\s+[[:alnum:]]+)?>)\n",
 			"end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
 			"beginCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
-				},
-				"2": {
-					"name": "entity.name.tag.named.group.regexp"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp" },
+				"2": { "name": "entity.name.tag.named.group.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#double-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#double-one-regexp-expression" } ]
 		},
 		"double-one-regexp-comments": {
 			"name": "comment.regexp",
 			"begin": "\\(\\?#",
 			"end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.comment.begin.regexp"
-				}
-			},
+			"beginCaptures": { "0": { "name": "punctuation.comment.begin.regexp" } },
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.comment.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.comment.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#codetags"
-				}
-			]
+			"patterns": [ { "include": "#codetags" } ]
 		},
 		"double-one-regexp-lookahead": {
 			"begin": "(\\()\\?=",
 			"end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookahead.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookahead.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookahead.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookahead.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#double-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#double-one-regexp-expression" } ]
 		},
 		"double-one-regexp-lookahead-negative": {
 			"begin": "(\\()\\?!",
 			"end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookahead.negative.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookahead.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookahead.negative.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookahead.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#double-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#double-one-regexp-expression" } ]
 		},
 		"double-one-regexp-lookbehind": {
 			"begin": "(\\()\\?<=",
 			"end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookbehind.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookbehind.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookbehind.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookbehind.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#double-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#double-one-regexp-expression" } ]
 		},
 		"double-one-regexp-lookbehind-negative": {
 			"begin": "(\\()\\?<!",
 			"end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookbehind.negative.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookbehind.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookbehind.negative.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookbehind.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#double-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#double-one-regexp-expression" } ]
 		},
 		"double-one-regexp-conditional": {
 			"begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
 			"end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.conditional.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.conditional.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.conditional.regexp" },
+				"1": { "name": "punctuation.parenthesis.conditional.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#double-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#double-one-regexp-expression" } ]
 		},
 		"double-one-regexp-parentheses-non-capturing": {
 			"begin": "\\(\\?:",
 			"end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
-			"beginCaptures": {
-				"0": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp"
-				}
-			},
+			"beginCaptures": { "0": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp" } },
 			"endCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#double-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#double-one-regexp-expression" } ]
 		},
 		"double-one-regexp-parentheses": {
 			"begin": "\\(",
 			"end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
-			"beginCaptures": {
-				"0": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp"
-				}
-			},
+			"beginCaptures": { "0": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp" } },
 			"endCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#double-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#double-one-regexp-expression" } ]
 		},
 		"double-three-regexp-expression": {
 			"patterns": [
-				{
-					"include": "#regexp-base-expression"
-				},
-				{
-					"include": "#double-three-regexp-character-set"
-				},
-				{
-					"include": "#double-three-regexp-comments"
-				},
-				{
-					"include": "#regexp-flags"
-				},
-				{
-					"include": "#double-three-regexp-named-group"
-				},
-				{
-					"include": "#regexp-backreference"
-				},
-				{
-					"include": "#double-three-regexp-lookahead"
-				},
-				{
-					"include": "#double-three-regexp-lookahead-negative"
-				},
-				{
-					"include": "#double-three-regexp-lookbehind"
-				},
-				{
-					"include": "#double-three-regexp-lookbehind-negative"
-				},
-				{
-					"include": "#double-three-regexp-conditional"
-				},
-				{
-					"include": "#double-three-regexp-parentheses-non-capturing"
-				},
-				{
-					"include": "#double-three-regexp-parentheses"
-				},
-				{
-					"include": "#comments-string-double-three"
-				}
+				{ "include": "#regexp-base-expression" },
+				{ "include": "#double-three-regexp-character-set" },
+				{ "include": "#double-three-regexp-comments" },
+				{ "include": "#regexp-flags" },
+				{ "include": "#double-three-regexp-named-group" },
+				{ "include": "#regexp-backreference" },
+				{ "include": "#double-three-regexp-lookahead" },
+				{ "include": "#double-three-regexp-lookahead-negative" },
+				{ "include": "#double-three-regexp-lookbehind" },
+				{ "include": "#double-three-regexp-lookbehind-negative" },
+				{ "include": "#double-three-regexp-conditional" },
+				{ "include": "#double-three-regexp-parentheses-non-capturing" },
+				{ "include": "#double-three-regexp-parentheses" },
+				{ "include": "#comments-string-double-three" }
 			]
 		},
 		"double-three-regexp-character-set": {
 			"patterns": [
-				{
-					"match": "(?x)\n  \\[ \\^? \\] (?! .*?\\])\n"
-				},
+				{ "match": "(?x)\n  \\[ \\^? \\] (?! .*?\\])\n" },
 				{
 					"name": "meta.character.set.regexp",
 					"begin": "(\\[)(\\^)?(\\])?",
 					"end": "(\\]|(?=\"\"\"))",
 					"beginCaptures": {
-						"1": {
-							"name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
-						},
-						"2": {
-							"name": "keyword.operator.negation.regexp"
-						},
-						"3": {
-							"name": "constant.character.set.regexp"
-						}
+						"1": { "name": "punctuation.character.set.begin.regexp constant.other.set.regexp" },
+						"2": { "name": "keyword.operator.negation.regexp" },
+						"3": { "name": "constant.character.set.regexp" }
 					},
 					"endCaptures": {
-						"1": {
-							"name": "punctuation.character.set.end.regexp constant.other.set.regexp"
-						},
-						"2": {
-							"name": "invalid.illegal.newline.python"
-						}
+						"1": { "name": "punctuation.character.set.end.regexp constant.other.set.regexp" },
+						"2": { "name": "invalid.illegal.newline.python" }
 					},
 					"patterns": [
-						{
-							"include": "#regexp-charecter-set-escapes"
-						},
+						{ "include": "#regexp-charecter-set-escapes" },
 						{
 							"name": "constant.character.set.regexp",
 							"match": "[^\\n]"
@@ -2791,241 +1593,133 @@
 			"begin": "(?x)\n  (\\()  (\\?P <\\w+(?:\\s+[[:alnum:]]+)?>)\n",
 			"end": "(\\)|(?=\"\"\"))",
 			"beginCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
-				},
-				"2": {
-					"name": "entity.name.tag.named.group.regexp"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp" },
+				"2": { "name": "entity.name.tag.named.group.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#double-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-double-three"
-				}
+				{ "include": "#double-three-regexp-expression" },
+				{ "include": "#comments-string-double-three" }
 			]
 		},
 		"double-three-regexp-comments": {
 			"name": "comment.regexp",
 			"begin": "\\(\\?#",
 			"end": "(\\)|(?=\"\"\"))",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.comment.begin.regexp"
-				}
-			},
+			"beginCaptures": { "0": { "name": "punctuation.comment.begin.regexp" } },
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.comment.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.comment.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#codetags"
-				}
-			]
+			"patterns": [ { "include": "#codetags" } ]
 		},
 		"double-three-regexp-lookahead": {
 			"begin": "(\\()\\?=",
 			"end": "(\\)|(?=\"\"\"))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookahead.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookahead.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookahead.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookahead.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#double-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-double-three"
-				}
+				{ "include": "#double-three-regexp-expression" },
+				{ "include": "#comments-string-double-three" }
 			]
 		},
 		"double-three-regexp-lookahead-negative": {
 			"begin": "(\\()\\?!",
 			"end": "(\\)|(?=\"\"\"))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookahead.negative.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookahead.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookahead.negative.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookahead.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#double-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-double-three"
-				}
+				{ "include": "#double-three-regexp-expression" },
+				{ "include": "#comments-string-double-three" }
 			]
 		},
 		"double-three-regexp-lookbehind": {
 			"begin": "(\\()\\?<=",
 			"end": "(\\)|(?=\"\"\"))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookbehind.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookbehind.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookbehind.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookbehind.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#double-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-double-three"
-				}
+				{ "include": "#double-three-regexp-expression" },
+				{ "include": "#comments-string-double-three" }
 			]
 		},
 		"double-three-regexp-lookbehind-negative": {
 			"begin": "(\\()\\?<!",
 			"end": "(\\)|(?=\"\"\"))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.lookbehind.negative.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.lookbehind.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.lookbehind.negative.regexp" },
+				"1": { "name": "punctuation.parenthesis.lookbehind.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#double-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-double-three"
-				}
+				{ "include": "#double-three-regexp-expression" },
+				{ "include": "#comments-string-double-three" }
 			]
 		},
 		"double-three-regexp-conditional": {
 			"begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
 			"end": "(\\)|(?=\"\"\"))",
 			"beginCaptures": {
-				"0": {
-					"name": "keyword.operator.conditional.regexp"
-				},
-				"1": {
-					"name": "punctuation.parenthesis.conditional.begin.regexp"
-				}
+				"0": { "name": "keyword.operator.conditional.regexp" },
+				"1": { "name": "punctuation.parenthesis.conditional.begin.regexp" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#double-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-double-three"
-				}
+				{ "include": "#double-three-regexp-expression" },
+				{ "include": "#comments-string-double-three" }
 			]
 		},
 		"double-three-regexp-parentheses-non-capturing": {
 			"begin": "\\(\\?:",
 			"end": "(\\)|(?=\"\"\"))",
-			"beginCaptures": {
-				"0": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp"
-				}
-			},
+			"beginCaptures": { "0": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp" } },
 			"endCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#double-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-double-three"
-				}
+				{ "include": "#double-three-regexp-expression" },
+				{ "include": "#comments-string-double-three" }
 			]
 		},
 		"double-three-regexp-parentheses": {
 			"begin": "\\(",
 			"end": "(\\)|(?=\"\"\"))",
-			"beginCaptures": {
-				"0": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp"
-				}
-			},
+			"beginCaptures": { "0": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp" } },
 			"endCaptures": {
-				"1": {
-					"name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#double-three-regexp-expression"
-				},
-				{
-					"include": "#comments-string-double-three"
-				}
+				{ "include": "#double-three-regexp-expression" },
+				{ "include": "#comments-string-double-three" }
 			]
 		},
 		"regexp-single-one-line": {
@@ -3033,162 +1727,82 @@
 			"begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(\\')",
 			"end": "(\\')|(?<!\\\\)(\\n)",
 			"beginCaptures": {
-				"2": {
-					"name": "invalid.deprecated.prefix.python"
-				},
-				"3": {
-					"name": "storage.type.string.python"
-				},
-				"4": {
-					"name": "storage.type.string.python"
-				},
-				"5": {
-					"name": "punctuation.definition.string.begin.python"
-				}
+				"2": { "name": "invalid.deprecated.prefix.python" },
+				"3": { "name": "storage.type.string.python" },
+				"4": { "name": "storage.type.string.python" },
+				"5": { "name": "punctuation.definition.string.begin.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#single-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#single-one-regexp-expression" } ]
 		},
 		"regexp-single-three-line": {
 			"name": "string.regexp.quoted.multi.python",
 			"begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(\\'\\'\\')",
 			"end": "(\\'\\'\\')",
 			"beginCaptures": {
-				"2": {
-					"name": "invalid.deprecated.prefix.python"
-				},
-				"3": {
-					"name": "storage.type.string.python"
-				},
-				"4": {
-					"name": "storage.type.string.python"
-				},
-				"5": {
-					"name": "punctuation.definition.string.begin.python"
-				}
+				"2": { "name": "invalid.deprecated.prefix.python" },
+				"3": { "name": "storage.type.string.python" },
+				"4": { "name": "storage.type.string.python" },
+				"5": { "name": "punctuation.definition.string.begin.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#single-three-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#single-three-regexp-expression" } ]
 		},
 		"regexp-double-one-line": {
 			"name": "string.regexp.quoted.single.python",
 			"begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(\")",
 			"end": "(\")|(?<!\\\\)(\\n)",
 			"beginCaptures": {
-				"2": {
-					"name": "invalid.deprecated.prefix.python"
-				},
-				"3": {
-					"name": "storage.type.string.python"
-				},
-				"4": {
-					"name": "storage.type.string.python"
-				},
-				"5": {
-					"name": "punctuation.definition.string.begin.python"
-				}
+				"2": { "name": "invalid.deprecated.prefix.python" },
+				"3": { "name": "storage.type.string.python" },
+				"4": { "name": "storage.type.string.python" },
+				"5": { "name": "punctuation.definition.string.begin.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#double-one-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#double-one-regexp-expression" } ]
 		},
 		"regexp-double-three-line": {
 			"name": "string.regexp.quoted.multi.python",
 			"begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(\"\"\")",
 			"end": "(\"\"\")",
 			"beginCaptures": {
-				"2": {
-					"name": "invalid.deprecated.prefix.python"
-				},
-				"3": {
-					"name": "storage.type.string.python"
-				},
-				"4": {
-					"name": "storage.type.string.python"
-				},
-				"5": {
-					"name": "punctuation.definition.string.begin.python"
-				}
+				"2": { "name": "invalid.deprecated.prefix.python" },
+				"3": { "name": "storage.type.string.python" },
+				"4": { "name": "storage.type.string.python" },
+				"5": { "name": "punctuation.definition.string.begin.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#double-three-regexp-expression"
-				}
-			]
+			"patterns": [ { "include": "#double-three-regexp-expression" } ]
 		},
 		"string-raw-quoted-single-line": {
 			"name": "string.quoted.raw.single.python",
 			"begin": "\\b(([uU]R)|(R))((['\"]))",
 			"end": "(\\4)|((?<!\\\\)\\n)",
 			"beginCaptures": {
-				"2": {
-					"name": "invalid.deprecated.prefix.python"
-				},
-				"3": {
-					"name": "storage.type.string.python"
-				},
-				"4": {
-					"name": "punctuation.definition.string.begin.python"
-				}
+				"2": { "name": "invalid.deprecated.prefix.python" },
+				"3": { "name": "storage.type.string.python" },
+				"4": { "name": "punctuation.definition.string.begin.python" }
 			},
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+			"endCaptures": {
+				"1": { "name": "punctuation.definition.string.end.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#string-single-bad-brace1-formatting-raw"
-				},
-				{
-					"include": "#string-single-bad-brace2-formatting-raw"
-				},
-				{
-					"include": "#string-raw-guts"
-				}
+				{ "include": "#string-single-bad-brace1-formatting-raw" },
+				{ "include": "#string-single-bad-brace2-formatting-raw" },
+				{ "include": "#string-raw-guts" }
 			]
 		},
 		"string-bin-quoted-single-line": {
@@ -3196,86 +1810,46 @@
 			"begin": "(\\b[bB])((['\"]))",
 			"end": "(\\2)|((?<!\\\\)\\n)",
 			"beginCaptures": {
-				"1": {
-					"name": "storage.type.string.python"
-				},
-				"2": {
-					"name": "punctuation.definition.string.begin.python"
-				}
+				"1": { "name": "storage.type.string.python" },
+				"2": { "name": "punctuation.definition.string.begin.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#string-entity"
-				}
-			]
+			"patterns": [ { "include": "#string-entity" } ]
 		},
 		"string-raw-bin-quoted-single-line": {
 			"name": "string.quoted.raw.binary.single.python",
 			"begin": "(\\b(?:R[bB]|[bB]R))((['\"]))",
 			"end": "(\\2)|((?<!\\\\)\\n)",
 			"beginCaptures": {
-				"1": {
-					"name": "storage.type.string.python"
-				},
-				"2": {
-					"name": "punctuation.definition.string.begin.python"
-				}
+				"1": { "name": "storage.type.string.python" },
+				"2": { "name": "punctuation.definition.string.begin.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#string-raw-bin-guts"
-				}
-			]
+			"patterns": [ { "include": "#string-raw-bin-guts" } ]
 		},
 		"string-quoted-single-line": {
 			"name": "string.quoted.single.python",
 			"begin": "(?:\\b([rR])(?=[uU]))?([uU])?((['\"]))",
 			"end": "(\\3)|((?<!\\\\)\\n)",
 			"beginCaptures": {
-				"1": {
-					"name": "invalid.illegal.prefix.python"
-				},
-				"2": {
-					"name": "storage.type.string.python"
-				},
-				"3": {
-					"name": "punctuation.definition.string.begin.python"
-				}
+				"1": { "name": "invalid.illegal.prefix.python" },
+				"2": { "name": "storage.type.string.python" },
+				"3": { "name": "punctuation.definition.string.begin.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#string-single-bad-brace1-formatting-unicode"
-				},
-				{
-					"include": "#string-single-bad-brace2-formatting-unicode"
-				},
-				{
-					"include": "#string-unicode-guts"
-				}
+				{ "include": "#string-single-bad-brace1-formatting-unicode" },
+				{ "include": "#string-single-bad-brace2-formatting-unicode" },
+				{ "include": "#string-unicode-guts" }
 			]
 		},
 		"string-single-bad-brace1-formatting-unicode": {
@@ -3283,38 +1857,24 @@
 			"begin": "(?x)\n    (?= \\{%\n          ( .*? (?!(['\"])|((?<!\\\\)\\n)) )\n        %\\}\n    )\n",
 			"end": "(?=(['\"])|((?<!\\\\)\\n))",
 			"patterns": [
-				{
-					"include": "#escape-sequence-unicode"
-				},
-				{
-					"include": "#escape-sequence"
-				},
-				{
-					"include": "#string-line-continuation"
-				}
+				{ "include": "#escape-sequence-unicode" },
+				{ "include": "#escape-sequence" },
+				{ "include": "#string-line-continuation" }
 			]
 		},
 		"string-single-bad-brace1-formatting-raw": {
 			"comment": "template using {% ... %}",
 			"begin": "(?x)\n    (?= \\{%\n          ( .*? (?!(['\"])|((?<!\\\\)\\n)) )\n        %\\}\n    )\n",
 			"end": "(?=(['\"])|((?<!\\\\)\\n))",
-			"patterns": [
-				{
-					"include": "#string-consume-escape"
-				}
-			]
+			"patterns": [ { "include": "#string-consume-escape" } ]
 		},
 		"string-single-bad-brace2-formatting-unicode": {
 			"comment": "odd format or format-like syntax",
 			"begin": "(?x)\n    (?!\\{\\{)\n    (?= \\{ (\n              \\w*? (?!(['\"])|((?<!\\\\)\\n)) [^!:\\.\\[}\\w]\n           )\n        .*?(?!(['\"])|((?<!\\\\)\\n))\n        \\}\n    )\n",
 			"end": "(?=(['\"])|((?<!\\\\)\\n))",
 			"patterns": [
-				{
-					"include": "#escape-sequence-unicode"
-				},
-				{
-					"include": "#string-entity"
-				}
+				{ "include": "#escape-sequence-unicode" },
+				{ "include": "#string-entity" }
 			]
 		},
 		"string-single-bad-brace2-formatting-raw": {
@@ -3322,12 +1882,8 @@
 			"begin": "(?x)\n    (?!\\{\\{)\n    (?= \\{ (\n              \\w*? (?!(['\"])|((?<!\\\\)\\n)) [^!:\\.\\[}\\w]\n           )\n        .*?(?!(['\"])|((?<!\\\\)\\n))\n        \\}\n    )\n",
 			"end": "(?=(['\"])|((?<!\\\\)\\n))",
 			"patterns": [
-				{
-					"include": "#string-consume-escape"
-				},
-				{
-					"include": "#string-formatting"
-				}
+				{ "include": "#string-consume-escape" },
+				{ "include": "#string-formatting" }
 			]
 		},
 		"string-raw-quoted-multi-line": {
@@ -3335,34 +1891,18 @@
 			"begin": "\\b(([uU]R)|(R))('''|\"\"\")",
 			"end": "(\\4)",
 			"beginCaptures": {
-				"2": {
-					"name": "invalid.deprecated.prefix.python"
-				},
-				"3": {
-					"name": "storage.type.string.python"
-				},
-				"4": {
-					"name": "punctuation.definition.string.begin.python"
-				}
+				"2": { "name": "invalid.deprecated.prefix.python" },
+				"3": { "name": "storage.type.string.python" },
+				"4": { "name": "punctuation.definition.string.begin.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#string-multi-bad-brace1-formatting-raw"
-				},
-				{
-					"include": "#string-multi-bad-brace2-formatting-raw"
-				},
-				{
-					"include": "#string-raw-guts"
-				}
+				{ "include": "#string-multi-bad-brace1-formatting-raw" },
+				{ "include": "#string-multi-bad-brace2-formatting-raw" },
+				{ "include": "#string-raw-guts" }
 			]
 		},
 		"string-bin-quoted-multi-line": {
@@ -3370,86 +1910,46 @@
 			"begin": "(\\b[bB])('''|\"\"\")",
 			"end": "(\\2)",
 			"beginCaptures": {
-				"1": {
-					"name": "storage.type.string.python"
-				},
-				"2": {
-					"name": "punctuation.definition.string.begin.python"
-				}
+				"1": { "name": "storage.type.string.python" },
+				"2": { "name": "punctuation.definition.string.begin.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#string-entity"
-				}
-			]
+			"patterns": [ { "include": "#string-entity" } ]
 		},
 		"string-raw-bin-quoted-multi-line": {
 			"name": "string.quoted.raw.binary.multi.python",
 			"begin": "(\\b(?:R[bB]|[bB]R))('''|\"\"\")",
 			"end": "(\\2)",
 			"beginCaptures": {
-				"1": {
-					"name": "storage.type.string.python"
-				},
-				"2": {
-					"name": "punctuation.definition.string.begin.python"
-				}
+				"1": { "name": "storage.type.string.python" },
+				"2": { "name": "punctuation.definition.string.begin.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
-			"patterns": [
-				{
-					"include": "#string-raw-bin-guts"
-				}
-			]
+			"patterns": [ { "include": "#string-raw-bin-guts" } ]
 		},
 		"string-quoted-multi-line": {
 			"name": "string.quoted.multi.python",
 			"begin": "(?:\\b([rR])(?=[uU]))?([uU])?('''|\"\"\")",
 			"end": "(\\3)",
 			"beginCaptures": {
-				"1": {
-					"name": "invalid.illegal.prefix.python"
-				},
-				"2": {
-					"name": "storage.type.string.python"
-				},
-				"3": {
-					"name": "punctuation.definition.string.begin.python"
-				}
+				"1": { "name": "invalid.illegal.prefix.python" },
+				"2": { "name": "storage.type.string.python" },
+				"3": { "name": "punctuation.definition.string.begin.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#string-multi-bad-brace1-formatting-unicode"
-				},
-				{
-					"include": "#string-multi-bad-brace2-formatting-unicode"
-				},
-				{
-					"include": "#string-unicode-guts"
-				}
+				{ "include": "#string-multi-bad-brace1-formatting-unicode" },
+				{ "include": "#string-multi-bad-brace2-formatting-unicode" },
+				{ "include": "#string-unicode-guts" }
 			]
 		},
 		"string-multi-bad-brace1-formatting-unicode": {
@@ -3457,38 +1957,24 @@
 			"begin": "(?x)\n    (?= \\{%\n          ( .*? (?!'''|\"\"\") )\n        %\\}\n    )\n",
 			"end": "(?='''|\"\"\")",
 			"patterns": [
-				{
-					"include": "#escape-sequence-unicode"
-				},
-				{
-					"include": "#escape-sequence"
-				},
-				{
-					"include": "#string-line-continuation"
-				}
+				{ "include": "#escape-sequence-unicode" },
+				{ "include": "#escape-sequence" },
+				{ "include": "#string-line-continuation" }
 			]
 		},
 		"string-multi-bad-brace1-formatting-raw": {
 			"comment": "template using {% ... %}",
 			"begin": "(?x)\n    (?= \\{%\n          ( .*? (?!'''|\"\"\") )\n        %\\}\n    )\n",
 			"end": "(?='''|\"\"\")",
-			"patterns": [
-				{
-					"include": "#string-consume-escape"
-				}
-			]
+			"patterns": [ { "include": "#string-consume-escape" } ]
 		},
 		"string-multi-bad-brace2-formatting-unicode": {
 			"comment": "odd format or format-like syntax",
 			"begin": "(?x)\n    (?!\\{\\{)\n    (?= \\{ (\n              \\w*? (?!'''|\"\"\") [^!:\\.\\[}\\w]\n           )\n        .*?(?!'''|\"\"\")\n        \\}\n    )\n",
 			"end": "(?='''|\"\"\")",
 			"patterns": [
-				{
-					"include": "#escape-sequence-unicode"
-				},
-				{
-					"include": "#string-entity"
-				}
+				{ "include": "#escape-sequence-unicode" },
+				{ "include": "#string-entity" }
 			]
 		},
 		"string-multi-bad-brace2-formatting-raw": {
@@ -3496,12 +1982,8 @@
 			"begin": "(?x)\n    (?!\\{\\{)\n    (?= \\{ (\n              \\w*? (?!'''|\"\"\") [^!:\\.\\[}\\w]\n           )\n        .*?(?!'''|\"\"\")\n        \\}\n    )\n",
 			"end": "(?='''|\"\"\")",
 			"patterns": [
-				{
-					"include": "#string-consume-escape"
-				},
-				{
-					"include": "#string-formatting"
-				}
+				{ "include": "#string-consume-escape" },
+				{ "include": "#string-formatting" }
 			]
 		},
 		"fstring-fnorm-quoted-single-line": {
@@ -3509,37 +1991,19 @@
 			"begin": "(\\b[fF])([bBuU])?((['\"]))",
 			"end": "(\\3)|((?<!\\\\)\\n)",
 			"beginCaptures": {
-				"1": {
-					"name": "string.interpolated.python string.quoted.single.python storage.type.string.python"
-				},
-				"2": {
-					"name": "invalid.illegal.prefix.python"
-				},
-				"3": {
-					"name": "punctuation.definition.string.begin.python string.interpolated.python string.quoted.single.python"
-				}
+				"1": { "name": "string.interpolated.python string.quoted.single.python storage.type.string.python" },
+				"2": { "name": "invalid.illegal.prefix.python" },
+				"3": { "name": "punctuation.definition.string.begin.python string.interpolated.python string.quoted.single.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python string.interpolated.python string.quoted.single.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python string.interpolated.python string.quoted.single.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#fstring-guts"
-				},
-				{
-					"include": "#fstring-illegal-single-brace"
-				},
-				{
-					"include": "#fstring-single-brace"
-				},
-				{
-					"include": "#fstring-single-core"
-				}
+				{ "include": "#fstring-guts" },
+				{ "include": "#fstring-illegal-single-brace" },
+				{ "include": "#fstring-single-brace" },
+				{ "include": "#fstring-single-core" }
 			]
 		},
 		"fstring-normf-quoted-single-line": {
@@ -3547,37 +2011,19 @@
 			"begin": "(\\b[bBuU])([fF])((['\"]))",
 			"end": "(\\3)|((?<!\\\\)\\n)",
 			"beginCaptures": {
-				"1": {
-					"name": "invalid.illegal.prefix.python"
-				},
-				"2": {
-					"name": "string.interpolated.python string.quoted.single.python storage.type.string.python"
-				},
-				"3": {
-					"name": "punctuation.definition.string.begin.python string.quoted.single.python"
-				}
+				"1": { "name": "invalid.illegal.prefix.python" },
+				"2": { "name": "string.interpolated.python string.quoted.single.python storage.type.string.python" },
+				"3": { "name": "punctuation.definition.string.begin.python string.quoted.single.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python string.interpolated.python string.quoted.single.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python string.interpolated.python string.quoted.single.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#fstring-guts"
-				},
-				{
-					"include": "#fstring-illegal-single-brace"
-				},
-				{
-					"include": "#fstring-single-brace"
-				},
-				{
-					"include": "#fstring-single-core"
-				}
+				{ "include": "#fstring-guts" },
+				{ "include": "#fstring-illegal-single-brace" },
+				{ "include": "#fstring-single-brace" },
+				{ "include": "#fstring-single-core" }
 			]
 		},
 		"fstring-raw-quoted-single-line": {
@@ -3585,34 +2031,18 @@
 			"begin": "(\\b(?:[rR][fF]|[fF][rR]))((['\"]))",
 			"end": "(\\2)|((?<!\\\\)\\n)",
 			"beginCaptures": {
-				"1": {
-					"name": "string.interpolated.python string.quoted.raw.single.python storage.type.string.python"
-				},
-				"2": {
-					"name": "punctuation.definition.string.begin.python string.quoted.raw.single.python"
-				}
+				"1": { "name": "string.interpolated.python string.quoted.raw.single.python storage.type.string.python" },
+				"2": { "name": "punctuation.definition.string.begin.python string.quoted.raw.single.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python string.interpolated.python string.quoted.raw.single.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python string.interpolated.python string.quoted.raw.single.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#fstring-raw-guts"
-				},
-				{
-					"include": "#fstring-illegal-single-brace"
-				},
-				{
-					"include": "#fstring-single-brace"
-				},
-				{
-					"include": "#fstring-raw-single-core"
-				}
+				{ "include": "#fstring-raw-guts" },
+				{ "include": "#fstring-illegal-single-brace" },
+				{ "include": "#fstring-single-brace" },
+				{ "include": "#fstring-raw-single-core" }
 			]
 		},
 		"fstring-single-core": {
@@ -3627,23 +2057,11 @@
 			"comment": "value interpolation using { ... }",
 			"begin": "(\\{)",
 			"end": "(?x)\n  (\\})|(?=\\n)\n",
-			"beginCaptures": {
-				"1": {
-					"name": "constant.character.format.placeholder.other.python"
-				}
-			},
-			"endCaptures": {
-				"1": {
-					"name": "constant.character.format.placeholder.other.python"
-				}
-			},
+			"beginCaptures": { "1": { "name": "constant.character.format.placeholder.other.python" } },
+			"endCaptures": { "1": { "name": "constant.character.format.placeholder.other.python" } },
 			"patterns": [
-				{
-					"include": "#fstring-terminator-single"
-				},
-				{
-					"include": "#f-expression"
-				}
+				{ "include": "#fstring-terminator-single" },
+				{ "include": "#f-expression" }
 			]
 		},
 		"fstring-terminator-single": {
@@ -3659,37 +2077,23 @@
 				{
 					"match": "(?x)\n  ( (?: =?) (?: ![rsa])? )\n    ( : \\w? [<>=^]? [-+ ]? \\#?\n      \\d* ,? (\\.\\d+)? [bcdeEfFgGnosxX%]? )(?=})\n",
 					"captures": {
-						"1": {
-							"name": "storage.type.format.python"
-						},
-						"2": {
-							"name": "storage.type.format.python"
-						}
+						"1": { "name": "storage.type.format.python" },
+						"2": { "name": "storage.type.format.python" }
 					}
 				},
-				{
-					"include": "#fstring-terminator-single-tail"
-				}
+				{ "include": "#fstring-terminator-single-tail" }
 			]
 		},
 		"fstring-terminator-single-tail": {
 			"begin": "((?:=?)(?:![rsa])?)(:)(?=.*?{)",
 			"end": "(?=})|(?=\\n)",
 			"beginCaptures": {
-				"1": {
-					"name": "storage.type.format.python"
-				},
-				"2": {
-					"name": "storage.type.format.python"
-				}
+				"1": { "name": "storage.type.format.python" },
+				"2": { "name": "storage.type.format.python" }
 			},
 			"patterns": [
-				{
-					"include": "#fstring-illegal-single-brace"
-				},
-				{
-					"include": "#fstring-single-brace"
-				},
+				{ "include": "#fstring-illegal-single-brace" },
+				{ "include": "#fstring-single-brace" },
 				{
 					"name": "storage.type.format.python",
 					"match": "([bcdeEfFgGnosxX%])(?=})"
@@ -3729,37 +2133,19 @@
 			"begin": "(\\b[fF])([bBuU])?('''|\"\"\")",
 			"end": "(\\3)",
 			"beginCaptures": {
-				"1": {
-					"name": "string.interpolated.python string.quoted.multi.python storage.type.string.python"
-				},
-				"2": {
-					"name": "invalid.illegal.prefix.python"
-				},
-				"3": {
-					"name": "punctuation.definition.string.begin.python string.interpolated.python string.quoted.multi.python"
-				}
+				"1": { "name": "string.interpolated.python string.quoted.multi.python storage.type.string.python" },
+				"2": { "name": "invalid.illegal.prefix.python" },
+				"3": { "name": "punctuation.definition.string.begin.python string.interpolated.python string.quoted.multi.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python string.interpolated.python string.quoted.multi.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python string.interpolated.python string.quoted.multi.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#fstring-guts"
-				},
-				{
-					"include": "#fstring-illegal-multi-brace"
-				},
-				{
-					"include": "#fstring-multi-brace"
-				},
-				{
-					"include": "#fstring-multi-core"
-				}
+				{ "include": "#fstring-guts" },
+				{ "include": "#fstring-illegal-multi-brace" },
+				{ "include": "#fstring-multi-brace" },
+				{ "include": "#fstring-multi-core" }
 			]
 		},
 		"fstring-normf-quoted-multi-line": {
@@ -3767,37 +2153,19 @@
 			"begin": "(\\b[bBuU])([fF])('''|\"\"\")",
 			"end": "(\\3)",
 			"beginCaptures": {
-				"1": {
-					"name": "invalid.illegal.prefix.python"
-				},
-				"2": {
-					"name": "string.interpolated.python string.quoted.multi.python storage.type.string.python"
-				},
-				"3": {
-					"name": "punctuation.definition.string.begin.python string.quoted.multi.python"
-				}
+				"1": { "name": "invalid.illegal.prefix.python" },
+				"2": { "name": "string.interpolated.python string.quoted.multi.python storage.type.string.python" },
+				"3": { "name": "punctuation.definition.string.begin.python string.quoted.multi.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python string.interpolated.python string.quoted.multi.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python string.interpolated.python string.quoted.multi.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#fstring-guts"
-				},
-				{
-					"include": "#fstring-illegal-multi-brace"
-				},
-				{
-					"include": "#fstring-multi-brace"
-				},
-				{
-					"include": "#fstring-multi-core"
-				}
+				{ "include": "#fstring-guts" },
+				{ "include": "#fstring-illegal-multi-brace" },
+				{ "include": "#fstring-multi-brace" },
+				{ "include": "#fstring-multi-core" }
 			]
 		},
 		"fstring-raw-quoted-multi-line": {
@@ -3805,34 +2173,18 @@
 			"begin": "(\\b(?:[rR][fF]|[fF][rR]))('''|\"\"\")",
 			"end": "(\\2)",
 			"beginCaptures": {
-				"1": {
-					"name": "string.interpolated.python string.quoted.raw.multi.python storage.type.string.python"
-				},
-				"2": {
-					"name": "punctuation.definition.string.begin.python string.quoted.raw.multi.python"
-				}
+				"1": { "name": "string.interpolated.python string.quoted.raw.multi.python storage.type.string.python" },
+				"2": { "name": "punctuation.definition.string.begin.python string.quoted.raw.multi.python" }
 			},
 			"endCaptures": {
-				"1": {
-					"name": "punctuation.definition.string.end.python string.interpolated.python string.quoted.raw.multi.python"
-				},
-				"2": {
-					"name": "invalid.illegal.newline.python"
-				}
+				"1": { "name": "punctuation.definition.string.end.python string.interpolated.python string.quoted.raw.multi.python" },
+				"2": { "name": "invalid.illegal.newline.python" }
 			},
 			"patterns": [
-				{
-					"include": "#fstring-raw-guts"
-				},
-				{
-					"include": "#fstring-illegal-multi-brace"
-				},
-				{
-					"include": "#fstring-multi-brace"
-				},
-				{
-					"include": "#fstring-raw-multi-core"
-				}
+				{ "include": "#fstring-raw-guts" },
+				{ "include": "#fstring-illegal-multi-brace" },
+				{ "include": "#fstring-multi-brace" },
+				{ "include": "#fstring-raw-multi-core" }
 			]
 		},
 		"fstring-multi-core": {
@@ -3847,23 +2199,11 @@
 			"comment": "value interpolation using { ... }",
 			"begin": "(\\{)",
 			"end": "(?x)\n  (\\})\n",
-			"beginCaptures": {
-				"1": {
-					"name": "constant.character.format.placeholder.other.python"
-				}
-			},
-			"endCaptures": {
-				"1": {
-					"name": "constant.character.format.placeholder.other.python"
-				}
-			},
+			"beginCaptures": { "1": { "name": "constant.character.format.placeholder.other.python" } },
+			"endCaptures": { "1": { "name": "constant.character.format.placeholder.other.python" } },
 			"patterns": [
-				{
-					"include": "#fstring-terminator-multi"
-				},
-				{
-					"include": "#f-expression"
-				}
+				{ "include": "#fstring-terminator-multi" },
+				{ "include": "#f-expression" }
 			]
 		},
 		"fstring-terminator-multi": {
@@ -3879,37 +2219,23 @@
 				{
 					"match": "(?x)\n  ( (?: =?) (?: ![rsa])? )\n    ( : \\w? [<>=^]? [-+ ]? \\#?\n      \\d* ,? (\\.\\d+)? [bcdeEfFgGnosxX%]? )(?=})\n",
 					"captures": {
-						"1": {
-							"name": "storage.type.format.python"
-						},
-						"2": {
-							"name": "storage.type.format.python"
-						}
+						"1": { "name": "storage.type.format.python" },
+						"2": { "name": "storage.type.format.python" }
 					}
 				},
-				{
-					"include": "#fstring-terminator-multi-tail"
-				}
+				{ "include": "#fstring-terminator-multi-tail" }
 			]
 		},
 		"fstring-terminator-multi-tail": {
 			"begin": "((?:=?)(?:![rsa])?)(:)(?=.*?{)",
 			"end": "(?=})",
 			"beginCaptures": {
-				"1": {
-					"name": "storage.type.format.python"
-				},
-				"2": {
-					"name": "storage.type.format.python"
-				}
+				"1": { "name": "storage.type.format.python" },
+				"2": { "name": "storage.type.format.python" }
 			},
 			"patterns": [
-				{
-					"include": "#fstring-illegal-multi-brace"
-				},
-				{
-					"include": "#fstring-multi-brace"
-				},
+				{ "include": "#fstring-illegal-multi-brace" },
+				{ "include": "#fstring-multi-brace" },
 				{
 					"name": "storage.type.format.python",
 					"match": "([bcdeEfFgGnosxX%])(?=})"
@@ -3944,33 +2270,18 @@
 				}
 			]
 		}
-  },
-  "patterns": [
-    {
-      "include": "#comment"
-    },
-    {
-      "include": "#header"
-    },
-    {
-      "include": "#variable_setting"
-    },
-    {
-      "include": "#setting"
-    },
-    {
-      "include": "#testcase_settings"
-    },
-    {
-      "include": "#keyword_call"
-    },
-    {
-      "include": "#returning_keyword_call"
-    }
-  ],
-
-  "uuid": "a7fae509-bc8d-451e-b5fc-a47feb9d2a9e",
-  "fileTypes": ["robotframework"],
-  "name": "Robot Framework",
-  "scopeName": "source.robotframework"
-}
+	},
+	"patterns": [
+		{ "include": "#comment" },
+		{ "include": "#header" },
+		{ "include": "#variable_setting" },
+		{ "include": "#setting" },
+		{ "include": "#testcase_settings" },
+		{ "include": "#keyword_call" },
+		{ "include": "#returning_keyword_call" }
+	],
+	"uuid": "a7fae509-bc8d-451e-b5fc-a47feb9d2a9e",
+	"fileTypes": [ "robotframework" ],
+	"name": "Robot Framework",
+	"scopeName": "source.robotframework"
+}
\ No newline at end of file