github-linguist 4.8.18 → 5.0.0

data/grammars/source.pony.json

@@ -143,7 +143,7 @@
           "name": "keyword.control.jump.pony"
         },
         {
-          "match": "\\b(if|ifdef|then|elseif|else|end|match|where|try|with|as|recover|consume|object|lambda|digestof)\\b",
+          "match": "\\b(if|ifdef|then|elseif|else|end|match|where|try|with|as|recover|consume|object|digestof)\\b",
           "name": "keyword.control.pony"
         },
         {

data/grammars/source.python.json

@@ -7,6 +7,7 @@
     "rpy",
     "pyw",
     "cpy",
+    "pyi",
     "SConstruct",
     "Sconstruct",
     "sconstruct",
@@ -273,8 +274,8 @@
         }
       ]
     },
-    "expression-base": {
-      "comment": "All valid Python expressions",
+    "expression-bare": {
+      "comment": "valid Python expressions w/o comments and line continuation",
       "patterns": [
         {
           "include": "#backticks"
@@ -282,9 +283,6 @@
         {
           "include": "#illegal-anno"
         },
-        {
-          "include": "#comments"
-        },
         {
           "include": "#literal"
         },
@@ -339,11 +337,28 @@
         {
           "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": "#ellipsis"
+          "include": "#expression-bare"
+        },
+        {
+          "include": "#line-continuation"
         }
       ]
     },
@@ -414,6 +429,10 @@
         }
       },
       "patterns": [
+        {
+          "name": "punctuation.separator.dict.python",
+          "match": ":"
+        },
         {
           "include": "#expression"
         }
@@ -463,7 +482,7 @@
           "match": "(\\\\)\\s*(\\S.*$\\n?)",
           "captures": {
             "1": {
-              "name": "separator.continuation.line.python"
+              "name": "punctuation.separator.continuation.line.python"
             },
             "2": {
               "name": "invalid.illegal.line.continuation.python"
@@ -475,7 +494,7 @@
           "end": "(?x)\n  (?=^\\s*$)\n  |\n  (?! (\\s* [rR]? (\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))\n      |\n      (\\G $)  (?# '\\G' is necessary for ST)\n  )\n",
           "beginCaptures": {
             "1": {
-              "name": "separator.continuation.line.python"
+              "name": "punctuation.separator.continuation.line.python"
             }
           },
           "patterns": [
@@ -513,6 +532,18 @@
         }
       }
     },
+    "punctuation": {
+      "patterns": [
+        {
+          "name": "punctuation.separator.block.begin.python",
+          "match": ":"
+        },
+        {
+          "name": "punctuation.separator.element.python",
+          "match": ","
+        }
+      ]
+    },
     "literal": {
       "patterns": [
         {
@@ -615,138 +646,28 @@
     "regexp": {
       "patterns": [
         {
-          "include": "#regexp-single-quoted-multi-line"
+          "include": "#regexp-single-three-line"
         },
         {
-          "include": "#regexp-double-quoted-multi-line"
+          "include": "#regexp-double-three-line"
         },
         {
-          "include": "#regexp-single-quoted-single-line"
+          "include": "#regexp-single-one-line"
         },
         {
-          "include": "#regexp-double-quoted-single-line"
-        }
-      ]
-    },
-    "regexp-single-quoted-single-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"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.string.end.python"
+          "include": "#regexp-double-one-line"
         },
-        "2": {
-          "name": "invalid.illegal.newline.python"
-        }
-      },
-      "patterns": [
         {
-          "include": "#single-one-regexp-expression"
-        }
-      ]
-    },
-    "regexp-double-quoted-single-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"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.string.end.python"
+          "include": "#fregexp-single-three-line"
         },
-        "2": {
-          "name": "invalid.illegal.newline.python"
-        }
-      },
-      "patterns": [
         {
-          "include": "#double-one-regexp-expression"
-        }
-      ]
-    },
-    "regexp-single-quoted-multi-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"
+          "include": "#fregexp-double-three-line"
         },
-        "5": {
-          "name": "punctuation.definition.string.begin.python"
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.python"
-        }
-      },
-      "patterns": [
         {
-          "include": "#single-three-regexp-expression"
-        }
-      ]
-    },
-    "regexp-double-quoted-multi-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"
+          "include": "#fregexp-single-one-line"
         },
-        "5": {
-          "name": "punctuation.definition.string.begin.python"
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.python"
-        }
-      },
-      "patterns": [
         {
-          "include": "#double-three-regexp-expression"
+          "include": "#fregexp-double-one-line"
         }
       ]
     },
@@ -775,6 +696,24 @@
         },
         {
           "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"
         }
       ]
     },
@@ -830,6 +769,70 @@
         }
       ]
     },
+    "fstring-guts": {
+      "patterns": [
+        {
+          "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"
+        }
+      ]
+    },
+    "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"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#fstring-terminator-single"
+        },
+        {
+          "include": "#f-expression"
+        }
+      ]
+    },
+    "f-expression": {
+      "comment": "All valid Python expressions, except comments and line cont",
+      "patterns": [
+        {
+          "include": "#expression-bare"
+        },
+        {
+          "include": "#member-access"
+        },
+        {
+          "comment": "Tokenize identifiers to help linters",
+          "match": "(?x) \\b ([[:alpha:]_]\\w*) \\b"
+        }
+      ]
+    },
     "escape-sequence-unicode": {
       "patterns": [
         {
@@ -884,6 +887,43 @@
         }
       ]
     },
+    "fstring-formatting": {
+      "patterns": [
+        {
+          "include": "#fstring-formatting-braces"
+        },
+        {
+          "include": "#fstring-formatting-singe-brace"
+        }
+      ]
+    },
+    "fstring-formatting-braces": {
+      "patterns": [
+        {
+          "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"
+            }
+          }
+        },
+        {
+          "name": "constant.character.escape.python",
+          "match": "({{|}})"
+        }
+      ]
+    },
+    "fstring-formatting-singe-brace": {
+      "name": "invalid.illegal.brace.python",
+      "match": "(}(?!}))"
+    },
     "import": {
       "comment": "Import statements\n",
       "patterns": [
@@ -1031,7 +1071,7 @@
           }
         },
         {
-          "match": "\\b(lambda)\\s*?([,\\n]|$)",
+          "match": "\\b(lambda)\\s*?(?=[,\\n]|$)",
           "captures": {
             "1": {
               "name": "storage.type.function.lambda.python"
@@ -1059,7 +1099,7 @@
               "match": "(\\*\\*|\\*)"
             },
             {
-              "include": "#lambda-incomplete"
+              "include": "#lambda-nested-incomplete"
             },
             {
               "include": "#illegal-names"
@@ -1098,6 +1138,10 @@
       ]
     },
     "lambda-incomplete": {
+      "name": "storage.type.function.lambda.python",
+      "match": "\\blambda(?=\\s*[,)])"
+    },
+    "lambda-nested-incomplete": {
       "name": "storage.type.function.lambda.python",
       "match": "\\blambda(?=\\s*[:,)])"
     },
@@ -1349,6 +1393,10 @@
       },
       "contentName": "meta.item-access.arguments.python",
       "patterns": [
+        {
+          "name": "punctuation.separator.slice.python",
+          "match": ":"
+        },
         {
           "include": "#expression"
         }
@@ -1357,7 +1405,7 @@
     "decorator": {
       "name": "meta.function.decorator.python",
       "begin": "(?x)\n  ^\\s*\n  (@) \\s* (?=[[:alpha:]_]\\w*)\n",
-      "end": "(?x)\n  ( \\) ) (?: (?=\\s*\\#|$) | (.*$) )\n  | (?=\\n|\\#)\n",
+      "end": "(?x)\n  ( \\) )\n    # trailing whitespace and comments are legal\n    (?: (.*?) (?=\\s*(?:\\#|$)) )\n  | (?=\\n|\\#)\n",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.decorator.python"
@@ -1665,6 +1713,32 @@
       "match": "->"
     },
     "regexp-base-expression": {
+      "patterns": [
+        {
+          "include": "#regexp-quantifier"
+        },
+        {
+          "include": "#regexp-base-common"
+        }
+      ]
+    },
+    "fregexp-base-expression": {
+      "patterns": [
+        {
+          "include": "#fregexp-quantifier"
+        },
+        {
+          "include": "#fstring-formatting-braces"
+        },
+        {
+          "match": "\\{.*?\\}"
+        },
+        {
+          "include": "#regexp-base-common"
+        }
+      ]
+    },
+    "regexp-base-common": {
       "patterns": [
         {
           "name": "support.other.match.any.regexp",
@@ -1686,15 +1760,19 @@
           "name": "keyword.operator.disjunction.regexp",
           "match": "\\|"
         },
-        {
-          "name": "keyword.operator.quantifier.regexp",
-          "match": "(?x)\n  \\{(\n    \\d+ | \\d+,(\\d+)? | ,\\d+\n  )\\}\n"
-        },
         {
           "include": "#regexp-escape-sequence"
         }
       ]
     },
+    "regexp-quantifier": {
+      "name": "keyword.operator.quantifier.regexp",
+      "match": "(?x)\n  \\{(\n    \\d+ | \\d+,(\\d+)? | ,\\d+\n  )\\}\n"
+    },
+    "fregexp-quantifier": {
+      "name": "keyword.operator.quantifier.regexp",
+      "match": "(?x)\n  \\{\\{(\n    \\d+ | \\d+,(\\d+)? | ,\\d+\n  )\\}\\}\n"
+    },
     "regexp-backreference-number": {
       "name": "meta.backreference.regexp",
       "match": "(\\\\[1-9]\\d?)",
@@ -3085,10 +3163,10 @@
         }
       ]
     },
-    "string-raw-quoted-single-line": {
-      "name": "string.quoted.raw.single.python",
-      "begin": "\\b(([uU]R)|(R))((['\"]))",
-      "end": "(\\4)|((?<!\\\\)\\n)",
+    "regexp-single-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"
@@ -3097,12 +3175,1622 @@
           "name": "storage.type.string.python"
         },
         "4": {
-          "name": "punctuation.definition.string.begin.python"
+          "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"
+        }
+      },
+      "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"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.python"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "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"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.python"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "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"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.python"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-three-regexp-expression"
+        }
+      ]
+    },
+    "single-one-fregexp-expression": {
+      "patterns": [
+        {
+          "include": "#fregexp-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-fregexp-lookahead"
+        },
+        {
+          "include": "#single-one-fregexp-lookahead-negative"
+        },
+        {
+          "include": "#single-one-fregexp-lookbehind"
+        },
+        {
+          "include": "#single-one-fregexp-lookbehind-negative"
+        },
+        {
+          "include": "#single-one-fregexp-conditional"
+        },
+        {
+          "include": "#single-one-fregexp-parentheses-non-capturing"
+        },
+        {
+          "include": "#single-one-fregexp-parentheses"
+        }
+      ]
+    },
+    "single-one-fregexp-named-group": {
+      "name": "meta.named.regexp",
+      "begin": "(?x)\n  (\\()  (\\?P <\\w+(?:\\s+[[:alnum:]]+)?>)\n",
+      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.named.begin.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "entity.name.tag.named.group.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.named.end.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-one-fregexp-expression"
+        }
+      ]
+    },
+    "single-one-fregexp-lookahead": {
+      "begin": "(\\()\\?=",
+      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookahead.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-one-fregexp-expression"
+        }
+      ]
+    },
+    "single-one-fregexp-lookahead-negative": {
+      "begin": "(\\()\\?!",
+      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookahead.negative.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.negative.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-one-fregexp-expression"
+        }
+      ]
+    },
+    "single-one-fregexp-lookbehind": {
+      "begin": "(\\()\\?<=",
+      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookbehind.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-one-fregexp-expression"
+        }
+      ]
+    },
+    "single-one-fregexp-lookbehind-negative": {
+      "begin": "(\\()\\?<!",
+      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookbehind.negative.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.negative.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-one-fregexp-expression"
+        }
+      ]
+    },
+    "single-one-fregexp-conditional": {
+      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.conditional.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.conditional.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.conditional.end.regexp keyword.operator.conditional.negative.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-one-fregexp-expression"
+        }
+      ]
+    },
+    "single-one-fregexp-parentheses-non-capturing": {
+      "begin": "\\(\\?:",
+      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.parenthesis.non-capturing.begin.regexp support.other.parenthesis.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.non-capturing.end.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-one-fregexp-expression"
+        }
+      ]
+    },
+    "single-one-fregexp-parentheses": {
+      "begin": "\\(",
+      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.end.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-one-fregexp-expression"
+        }
+      ]
+    },
+    "single-three-fregexp-expression": {
+      "patterns": [
+        {
+          "include": "#fregexp-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-fregexp-lookahead"
+        },
+        {
+          "include": "#single-three-fregexp-lookahead-negative"
+        },
+        {
+          "include": "#single-three-fregexp-lookbehind"
+        },
+        {
+          "include": "#single-three-fregexp-lookbehind-negative"
+        },
+        {
+          "include": "#single-three-fregexp-conditional"
+        },
+        {
+          "include": "#single-three-fregexp-parentheses-non-capturing"
+        },
+        {
+          "include": "#single-three-fregexp-parentheses"
+        },
+        {
+          "include": "#comments-string-single-three"
+        }
+      ]
+    },
+    "single-three-fregexp-named-group": {
+      "name": "meta.named.regexp",
+      "begin": "(?x)\n  (\\()  (\\?P <\\w+(?:\\s+[[:alnum:]]+)?>)\n",
+      "end": "(\\)|(?=\\'\\'\\'))",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.named.begin.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "entity.name.tag.named.group.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.named.end.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-single-three"
+        }
+      ]
+    },
+    "single-three-fregexp-lookahead": {
+      "begin": "(\\()\\?=",
+      "end": "(\\)|(?=\\'\\'\\'))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookahead.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-single-three"
+        }
+      ]
+    },
+    "single-three-fregexp-lookahead-negative": {
+      "begin": "(\\()\\?!",
+      "end": "(\\)|(?=\\'\\'\\'))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookahead.negative.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.negative.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-single-three"
+        }
+      ]
+    },
+    "single-three-fregexp-lookbehind": {
+      "begin": "(\\()\\?<=",
+      "end": "(\\)|(?=\\'\\'\\'))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookbehind.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-single-three"
+        }
+      ]
+    },
+    "single-three-fregexp-lookbehind-negative": {
+      "begin": "(\\()\\?<!",
+      "end": "(\\)|(?=\\'\\'\\'))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookbehind.negative.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.negative.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-single-three"
+        }
+      ]
+    },
+    "single-three-fregexp-conditional": {
+      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "end": "(\\)|(?=\\'\\'\\'))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.conditional.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.conditional.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.conditional.end.regexp keyword.operator.conditional.negative.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-single-three"
+        }
+      ]
+    },
+    "single-three-fregexp-parentheses-non-capturing": {
+      "begin": "\\(\\?:",
+      "end": "(\\)|(?=\\'\\'\\'))",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.parenthesis.non-capturing.begin.regexp support.other.parenthesis.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.non-capturing.end.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-single-three"
+        }
+      ]
+    },
+    "single-three-fregexp-parentheses": {
+      "begin": "\\(",
+      "end": "(\\)|(?=\\'\\'\\'))",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.end.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-single-three"
+        }
+      ]
+    },
+    "double-one-fregexp-expression": {
+      "patterns": [
+        {
+          "include": "#fregexp-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-fregexp-lookahead"
+        },
+        {
+          "include": "#double-one-fregexp-lookahead-negative"
+        },
+        {
+          "include": "#double-one-fregexp-lookbehind"
+        },
+        {
+          "include": "#double-one-fregexp-lookbehind-negative"
+        },
+        {
+          "include": "#double-one-fregexp-conditional"
+        },
+        {
+          "include": "#double-one-fregexp-parentheses-non-capturing"
+        },
+        {
+          "include": "#double-one-fregexp-parentheses"
+        }
+      ]
+    },
+    "double-one-fregexp-named-group": {
+      "name": "meta.named.regexp",
+      "begin": "(?x)\n  (\\()  (\\?P <\\w+(?:\\s+[[:alnum:]]+)?>)\n",
+      "end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.named.begin.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "entity.name.tag.named.group.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.named.end.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-one-fregexp-expression"
+        }
+      ]
+    },
+    "double-one-fregexp-lookahead": {
+      "begin": "(\\()\\?=",
+      "end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookahead.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-one-fregexp-expression"
+        }
+      ]
+    },
+    "double-one-fregexp-lookahead-negative": {
+      "begin": "(\\()\\?!",
+      "end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookahead.negative.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.negative.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-one-fregexp-expression"
+        }
+      ]
+    },
+    "double-one-fregexp-lookbehind": {
+      "begin": "(\\()\\?<=",
+      "end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookbehind.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-one-fregexp-expression"
+        }
+      ]
+    },
+    "double-one-fregexp-lookbehind-negative": {
+      "begin": "(\\()\\?<!",
+      "end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookbehind.negative.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.negative.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-one-fregexp-expression"
+        }
+      ]
+    },
+    "double-one-fregexp-conditional": {
+      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.conditional.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.conditional.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.conditional.end.regexp keyword.operator.conditional.negative.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-one-fregexp-expression"
+        }
+      ]
+    },
+    "double-one-fregexp-parentheses-non-capturing": {
+      "begin": "\\(\\?:",
+      "end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.parenthesis.non-capturing.begin.regexp support.other.parenthesis.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.non-capturing.end.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-one-fregexp-expression"
+        }
+      ]
+    },
+    "double-one-fregexp-parentheses": {
+      "begin": "\\(",
+      "end": "(\\)|(?=\"))|((?=(?<!\\\\)\\n))",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.end.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-one-fregexp-expression"
+        }
+      ]
+    },
+    "double-three-fregexp-expression": {
+      "patterns": [
+        {
+          "include": "#fregexp-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-fregexp-lookahead"
+        },
+        {
+          "include": "#double-three-fregexp-lookahead-negative"
+        },
+        {
+          "include": "#double-three-fregexp-lookbehind"
+        },
+        {
+          "include": "#double-three-fregexp-lookbehind-negative"
+        },
+        {
+          "include": "#double-three-fregexp-conditional"
+        },
+        {
+          "include": "#double-three-fregexp-parentheses-non-capturing"
+        },
+        {
+          "include": "#double-three-fregexp-parentheses"
+        },
+        {
+          "include": "#comments-string-double-three"
+        }
+      ]
+    },
+    "double-three-fregexp-named-group": {
+      "name": "meta.named.regexp",
+      "begin": "(?x)\n  (\\()  (\\?P <\\w+(?:\\s+[[:alnum:]]+)?>)\n",
+      "end": "(\\)|(?=\"\"\"))",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.named.begin.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "entity.name.tag.named.group.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.named.end.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-double-three"
+        }
+      ]
+    },
+    "double-three-fregexp-lookahead": {
+      "begin": "(\\()\\?=",
+      "end": "(\\)|(?=\"\"\"))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookahead.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-double-three"
+        }
+      ]
+    },
+    "double-three-fregexp-lookahead-negative": {
+      "begin": "(\\()\\?!",
+      "end": "(\\)|(?=\"\"\"))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookahead.negative.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookahead.end.regexp keyword.operator.lookahead.negative.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-double-three"
+        }
+      ]
+    },
+    "double-three-fregexp-lookbehind": {
+      "begin": "(\\()\\?<=",
+      "end": "(\\)|(?=\"\"\"))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookbehind.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-double-three"
+        }
+      ]
+    },
+    "double-three-fregexp-lookbehind-negative": {
+      "begin": "(\\()\\?<!",
+      "end": "(\\)|(?=\"\"\"))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.lookbehind.negative.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.lookbehind.end.regexp keyword.operator.lookbehind.negative.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-double-three"
+        }
+      ]
+    },
+    "double-three-fregexp-conditional": {
+      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "end": "(\\)|(?=\"\"\"))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.conditional.regexp"
+        },
+        "1": {
+          "name": "punctuation.parenthesis.conditional.begin.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.conditional.end.regexp keyword.operator.conditional.negative.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-double-three"
+        }
+      ]
+    },
+    "double-three-fregexp-parentheses-non-capturing": {
+      "begin": "\\(\\?:",
+      "end": "(\\)|(?=\"\"\"))",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.parenthesis.non-capturing.begin.regexp support.other.parenthesis.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.non-capturing.end.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-double-three"
+        }
+      ]
+    },
+    "double-three-fregexp-parentheses": {
+      "begin": "\\(",
+      "end": "(\\)|(?=\"\"\"))",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.parenthesis.end.regexp support.other.parenthesis.regexp"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-three-fregexp-expression"
+        },
+        {
+          "include": "#comments-string-double-three"
+        }
+      ]
+    },
+    "fregexp-single-one-line": {
+      "name": "string.regexp.quoted.single.python string.interpolated.python",
+      "begin": "\\b(([uU]r)|([fF]r)|(r[fF]?))(\\')",
+      "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"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.python"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-one-fregexp-expression"
+        }
+      ]
+    },
+    "fregexp-single-three-line": {
+      "name": "string.regexp.quoted.multi.python string.interpolated.python",
+      "begin": "\\b(([uU]r)|([fF]r)|(r[fF]?))(\\'\\'\\')",
+      "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"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.python"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#single-three-fregexp-expression"
+        }
+      ]
+    },
+    "fregexp-double-one-line": {
+      "name": "string.regexp.quoted.single.python string.interpolated.python",
+      "begin": "\\b(([uU]r)|([fF]r)|(r[fF]?))(\")",
+      "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"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.python"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-one-fregexp-expression"
+        }
+      ]
+    },
+    "fregexp-double-three-line": {
+      "name": "string.regexp.quoted.multi.python string.interpolated.python",
+      "begin": "\\b(([uU]r)|([fF]r)|(r[fF]?))(\"\"\")",
+      "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"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.python"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double-three-fregexp-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"
+        }
+      },
+      "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"
+        }
+      ]
+    },
+    "string-bin-quoted-single-line": {
+      "name": "string.quoted.binary.single.python",
+      "begin": "(\\b[bB])((['\"]))",
+      "end": "(\\2)|((?<!\\\\)\\n)",
+      "beginCaptures": {
+        "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"
+        }
+      },
+      "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"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.python"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "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"
+        }
+      },
+      "endCaptures": {
+        "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"
+        }
+      ]
+    },
+    "string-single-bad-brace1-formatting-unicode": {
+      "comment": "template using {% ... %}",
+      "begin": "(?x)\n    (?= \\{%\n          ( .*? (?!(['\"])|((?<!\\\\)\\n)) )\n        %\\}\n    )\n",
+      "end": "(?=(['\"])|((?<!\\\\)\\n))",
+      "patterns": [
+        {
+          "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"
+        }
+      ]
+    },
+    "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"
+        }
+      ]
+    },
+    "string-single-bad-brace2-formatting-raw": {
+      "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": "#string-consume-escape"
+        },
+        {
+          "include": "#string-formatting"
+        }
+      ]
+    },
+    "string-raw-quoted-multi-line": {
+      "name": "string.quoted.raw.multi.python",
+      "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"
+        }
+      },
+      "endCaptures": {
+        "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"
+        }
+      ]
+    },
+    "string-bin-quoted-multi-line": {
+      "name": "string.quoted.binary.multi.python",
+      "begin": "(\\b[bB])('''|\"\"\")",
+      "end": "(\\2)",
+      "beginCaptures": {
+        "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"
+        }
+      },
+      "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"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.python"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.python"
+        }
+      },
+      "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"
+        }
+      },
+      "endCaptures": {
+        "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"
+        }
+      ]
+    },
+    "string-multi-bad-brace1-formatting-unicode": {
+      "comment": "template using {% ... %}",
+      "begin": "(?x)\n    (?= \\{%\n          ( .*? (?!'''|\"\"\") )\n        %\\}\n    )\n",
+      "end": "(?='''|\"\"\")",
+      "patterns": [
+        {
+          "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"
+        }
+      ]
+    },
+    "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"
+        }
+      ]
+    },
+    "string-multi-bad-brace2-formatting-raw": {
+      "comment": "odd format or format-like syntax",
+      "begin": "(?x)\n    (?!\\{\\{)\n    (?= \\{ (\n              \\w*? (?!'''|\"\"\") [^!:\\.\\[}\\w]\n           )\n        .*?(?!'''|\"\"\")\n        \\}\n    )\n",
+      "end": "(?='''|\"\"\")",
+      "patterns": [
+        {
+          "include": "#string-consume-escape"
+        },
+        {
+          "include": "#string-formatting"
+        }
+      ]
+    },
+    "fstring-fnorm-quoted-single-line": {
+      "name": "meta.fstring.python",
+      "begin": "(\\b[fF])([bBuU])?((['\"]))",
+      "end": "(\\3)|((?<!\\\\)\\n)",
+      "beginCaptures": {
+        "1": {
+          "name": "string.quoted.single.python string.interpolated.python storage.type.string.python"
+        },
+        "2": {
+          "name": "invalid.illegal.prefix.python"
+        },
+        "3": {
+          "name": "string.quoted.single.python string.interpolated.python punctuation.definition.string.begin.python"
         }
       },
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.string.end.python"
+          "name": "string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python"
         },
         "2": {
           "name": "invalid.illegal.newline.python"
@@ -3110,31 +4798,37 @@
       },
       "patterns": [
         {
-          "include": "#string-single-bad-brace1-formatting-raw"
+          "include": "#fstring-guts"
         },
         {
-          "include": "#string-single-bad-brace2-formatting-raw"
+          "include": "#fstring-illegal-single-brace"
         },
         {
-          "include": "#string-raw-guts"
+          "include": "#fstring-single-brace"
+        },
+        {
+          "include": "#fstring-single-core"
         }
       ]
     },
-    "string-bin-quoted-single-line": {
-      "name": "string.quoted.binary.single.python",
-      "begin": "(\\b[bB])((['\"]))",
-      "end": "(\\2)|((?<!\\\\)\\n)",
+    "fstring-normf-quoted-single-line": {
+      "name": "meta.fstring.python",
+      "begin": "(\\b[bBuU])([fF])((['\"]))",
+      "end": "(\\3)|((?<!\\\\)\\n)",
       "beginCaptures": {
         "1": {
-          "name": "storage.type.string.python"
+          "name": "invalid.illegal.prefix.python"
         },
         "2": {
-          "name": "punctuation.definition.string.begin.python"
+          "name": "string.quoted.single.python string.interpolated.python storage.type.string.python"
+        },
+        "3": {
+          "name": "string.quoted.single.python punctuation.definition.string.begin.python"
         }
       },
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.string.end.python"
+          "name": "string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python"
         },
         "2": {
           "name": "invalid.illegal.newline.python"
@@ -3142,25 +4836,34 @@
       },
       "patterns": [
         {
-          "include": "#string-entity"
+          "include": "#fstring-guts"
+        },
+        {
+          "include": "#fstring-illegal-single-brace"
+        },
+        {
+          "include": "#fstring-single-brace"
+        },
+        {
+          "include": "#fstring-single-core"
         }
       ]
     },
-    "string-raw-bin-quoted-single-line": {
-      "name": "string.quoted.raw.binary.single.python",
-      "begin": "(\\b(?:R[bB]|[bB]R))((['\"]))",
+    "fstring-raw-quoted-single-line": {
+      "name": "meta.fstring.python",
+      "begin": "(\\b(?:[R][fF]|[fF][R]))((['\"]))",
       "end": "(\\2)|((?<!\\\\)\\n)",
       "beginCaptures": {
         "1": {
-          "name": "storage.type.string.python"
+          "name": "string.quoted.raw.single.python string.interpolated.python storage.type.string.python"
         },
         "2": {
-          "name": "punctuation.definition.string.begin.python"
+          "name": "string.quoted.raw.single.python punctuation.definition.string.begin.python"
         }
       },
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.string.end.python"
+          "name": "string.quoted.raw.single.python string.interpolated.python punctuation.definition.string.end.python"
         },
         "2": {
           "name": "invalid.illegal.newline.python"
@@ -3168,115 +4871,142 @@
       },
       "patterns": [
         {
-          "include": "#string-raw-bin-guts"
+          "include": "#fstring-raw-guts"
+        },
+        {
+          "include": "#fstring-illegal-single-brace"
+        },
+        {
+          "include": "#fstring-single-brace"
+        },
+        {
+          "include": "#fstring-raw-single-core"
         }
       ]
     },
-    "string-quoted-single-line": {
-      "name": "string.quoted.single.python",
-      "begin": "(\\b[rR](?=[uU]))?([uU])?((['\"]))",
-      "end": "(\\3)|((?<!\\\\)\\n)",
+    "fstring-single-core": {
+      "name": "string.quoted.single.python string.interpolated.python",
+      "match": "(?x)\n  (.+?)\n    (\n      (?# .* and .*? in multi-line match need special handling of\n        newlines otherwise SublimeText and Atom will match slightly\n        differently.\n\n        The guard for newlines has to be separate from the\n        lookahead because of special $ matching rule.)\n      ($\\n?)\n      |\n      (?=[\\\\\\}\\{]|(['\"])|((?<!\\\\)\\n))\n    )\n  (?# due to how multiline regexps are matched we need a special case\n    for matching a newline character)\n  | \\n\n"
+    },
+    "fstring-raw-single-core": {
+      "name": "string.quoted.raw.single.python string.interpolated.python",
+      "match": "(?x)\n  (.+?)\n    (\n      (?# .* and .*? in multi-line match need special handling of\n        newlines otherwise SublimeText and Atom will match slightly\n        differently.\n\n        The guard for newlines has to be separate from the\n        lookahead because of special $ matching rule.)\n      ($\\n?)\n      |\n      (?=[\\\\\\}\\{]|(['\"])|((?<!\\\\)\\n))\n    )\n  (?# due to how multiline regexps are matched we need a special case\n    for matching a newline character)\n  | \\n\n"
+    },
+    "fstring-single-brace": {
+      "comment": "value interpolation using { ... }",
+      "begin": "(\\{)",
+      "end": "(?x)\n  (\\})|(?=\\n)\n",
       "beginCaptures": {
         "1": {
-          "name": "invalid.illegal.prefix.python"
-        },
-        "2": {
-          "name": "storage.type.string.python"
-        },
-        "3": {
-          "name": "punctuation.definition.string.begin.python"
+          "name": "constant.character.format.placeholder.other.python"
         }
       },
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.string.end.python"
-        },
-        "2": {
-          "name": "invalid.illegal.newline.python"
+          "name": "constant.character.format.placeholder.other.python"
         }
       },
       "patterns": [
         {
-          "include": "#string-single-bad-brace1-formatting-unicode"
-        },
-        {
-          "include": "#string-single-bad-brace2-formatting-unicode"
+          "include": "#fstring-terminator-single"
         },
         {
-          "include": "#string-unicode-guts"
+          "include": "#f-expression"
         }
       ]
     },
-    "string-single-bad-brace1-formatting-unicode": {
-      "comment": "template using {% ... %}",
-      "begin": "(?x)\n    (?= \\{%\n          ( .*? (?!(['\"])|((?<!\\\\)\\n)) )\n        %\\}\n    )\n",
-      "end": "(?=(['\"])|((?<!\\\\)\\n))",
+    "fstring-terminator-single": {
       "patterns": [
         {
-          "include": "#escape-sequence-unicode"
+          "name": "storage.type.format.python",
+          "match": "(![rsa])(?=})"
         },
         {
-          "include": "#escape-sequence"
+          "match": "(?x)\n  (![rsa])?\n    ( : \\w? [<>=^]? [-+ ]? \\#?\n      \\d* ,? (\\.\\d+)? [bcdeEfFgGnosxX%]? )(?=})\n",
+          "captures": {
+            "1": {
+              "name": "storage.type.format.python"
+            },
+            "2": {
+              "name": "support.other.format.python"
+            }
+          }
         },
         {
-          "include": "#string-line-continuation"
+          "include": "#fstring-terminator-single-tail"
         }
       ]
     },
-    "string-single-bad-brace1-formatting-raw": {
-      "comment": "template using {% ... %}",
-      "begin": "(?x)\n    (?= \\{%\n          ( .*? (?!(['\"])|((?<!\\\\)\\n)) )\n        %\\}\n    )\n",
-      "end": "(?=(['\"])|((?<!\\\\)\\n))",
-      "patterns": [
-        {
-          "include": "#string-consume-escape"
+    "fstring-terminator-single-tail": {
+      "begin": "(![rsa])?(:)(?=.*?{)",
+      "end": "(?=})|(?=\\n)",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.format.python"
+        },
+        "2": {
+          "name": "support.other.format.python"
         }
-      ]
-    },
-    "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": "#fstring-illegal-single-brace"
         },
         {
-          "include": "#string-entity"
-        }
-      ]
-    },
-    "string-single-bad-brace2-formatting-raw": {
-      "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": "#fstring-single-brace"
+        },
         {
-          "include": "#string-consume-escape"
+          "name": "support.other.format.python",
+          "match": "([bcdeEfFgGnosxX%])(?=})"
         },
         {
-          "include": "#string-formatting"
+          "name": "support.other.format.python",
+          "match": "(\\.\\d+)"
+        },
+        {
+          "name": "support.other.format.python",
+          "match": "(,)"
+        },
+        {
+          "name": "support.other.format.python",
+          "match": "(\\d+)"
+        },
+        {
+          "name": "support.other.format.python",
+          "match": "(\\#)"
+        },
+        {
+          "name": "support.other.format.python",
+          "match": "([-+ ])"
+        },
+        {
+          "name": "support.other.format.python",
+          "match": "([<>=^])"
+        },
+        {
+          "name": "support.other.format.python",
+          "match": "(\\w)"
         }
       ]
     },
-    "string-raw-quoted-multi-line": {
-      "name": "string.quoted.raw.multi.python",
-      "begin": "\\b(([uU]R)|(R))('''|\"\"\")",
-      "end": "(\\4)",
+    "fstring-fnorm-quoted-multi-line": {
+      "name": "meta.fstring.python",
+      "begin": "(\\b[fF])([bBuU])?('''|\"\"\")",
+      "end": "(\\3)",
       "beginCaptures": {
+        "1": {
+          "name": "string.quoted.multi.python string.interpolated.python storage.type.string.python"
+        },
         "2": {
-          "name": "invalid.deprecated.prefix.python"
+          "name": "invalid.illegal.prefix.python"
         },
         "3": {
-          "name": "storage.type.string.python"
-        },
-        "4": {
-          "name": "punctuation.definition.string.begin.python"
+          "name": "string.quoted.multi.python string.interpolated.python punctuation.definition.string.begin.python"
         }
       },
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.string.end.python"
+          "name": "string.quoted.multi.python string.interpolated.python punctuation.definition.string.end.python"
         },
         "2": {
           "name": "invalid.illegal.newline.python"
@@ -3284,31 +5014,37 @@
       },
       "patterns": [
         {
-          "include": "#string-multi-bad-brace1-formatting-raw"
+          "include": "#fstring-guts"
         },
         {
-          "include": "#string-multi-bad-brace2-formatting-raw"
+          "include": "#fstring-illegal-multi-brace"
         },
         {
-          "include": "#string-raw-guts"
+          "include": "#fstring-multi-brace"
+        },
+        {
+          "include": "#fstring-multi-core"
         }
       ]
     },
-    "string-bin-quoted-multi-line": {
-      "name": "string.quoted.binary.multi.python",
-      "begin": "(\\b[bB])('''|\"\"\")",
-      "end": "(\\2)",
+    "fstring-normf-quoted-multi-line": {
+      "name": "meta.fstring.python",
+      "begin": "(\\b[bBuU])([fF])('''|\"\"\")",
+      "end": "(\\3)",
       "beginCaptures": {
         "1": {
-          "name": "storage.type.string.python"
+          "name": "invalid.illegal.prefix.python"
         },
         "2": {
-          "name": "punctuation.definition.string.begin.python"
+          "name": "string.quoted.multi.python string.interpolated.python storage.type.string.python"
+        },
+        "3": {
+          "name": "string.quoted.multi.python punctuation.definition.string.begin.python"
         }
       },
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.string.end.python"
+          "name": "string.quoted.multi.python string.interpolated.python punctuation.definition.string.end.python"
         },
         "2": {
           "name": "invalid.illegal.newline.python"
@@ -3316,25 +5052,34 @@
       },
       "patterns": [
         {
-          "include": "#string-entity"
+          "include": "#fstring-guts"
+        },
+        {
+          "include": "#fstring-illegal-multi-brace"
+        },
+        {
+          "include": "#fstring-multi-brace"
+        },
+        {
+          "include": "#fstring-multi-core"
         }
       ]
     },
-    "string-raw-bin-quoted-multi-line": {
-      "name": "string.quoted.raw.binary.multi.python",
-      "begin": "(\\b(?:R[bB]|[bB]R))('''|\"\"\")",
+    "fstring-raw-quoted-multi-line": {
+      "name": "meta.fstring.python",
+      "begin": "(\\b(?:[R][fF]|[fF][R]))('''|\"\"\")",
       "end": "(\\2)",
       "beginCaptures": {
         "1": {
-          "name": "storage.type.string.python"
+          "name": "string.quoted.raw.multi.python string.interpolated.python storage.type.string.python"
         },
         "2": {
-          "name": "punctuation.definition.string.begin.python"
+          "name": "string.quoted.raw.multi.python punctuation.definition.string.begin.python"
         }
       },
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.string.end.python"
+          "name": "string.quoted.raw.multi.python string.interpolated.python punctuation.definition.string.end.python"
         },
         "2": {
           "name": "invalid.illegal.newline.python"
@@ -3342,94 +5087,121 @@
       },
       "patterns": [
         {
-          "include": "#string-raw-bin-guts"
+          "include": "#fstring-raw-guts"
+        },
+        {
+          "include": "#fstring-illegal-multi-brace"
+        },
+        {
+          "include": "#fstring-multi-brace"
+        },
+        {
+          "include": "#fstring-raw-multi-core"
         }
       ]
     },
-    "string-quoted-multi-line": {
-      "name": "string.quoted.multi.python",
-      "begin": "(\\b[rR](?=[uU]))?([uU])?('''|\"\"\")",
-      "end": "(\\3)",
+    "fstring-multi-core": {
+      "name": "string.quoted.multi.python string.interpolated.python",
+      "match": "(?x)\n  (.+?)\n    (\n      (?# .* and .*? in multi-line match need special handling of\n        newlines otherwise SublimeText and Atom will match slightly\n        differently.\n\n        The guard for newlines has to be separate from the\n        lookahead because of special $ matching rule.)\n      ($\\n?)\n      |\n      (?=[\\\\\\}\\{]|'''|\"\"\")\n    )\n  (?# due to how multiline regexps are matched we need a special case\n    for matching a newline character)\n  | \\n\n"
+    },
+    "fstring-raw-multi-core": {
+      "name": "string.quoted.raw.multi.python string.interpolated.python",
+      "match": "(?x)\n  (.+?)\n    (\n      (?# .* and .*? in multi-line match need special handling of\n        newlines otherwise SublimeText and Atom will match slightly\n        differently.\n\n        The guard for newlines has to be separate from the\n        lookahead because of special $ matching rule.)\n      ($\\n?)\n      |\n      (?=[\\\\\\}\\{]|'''|\"\"\")\n    )\n  (?# due to how multiline regexps are matched we need a special case\n    for matching a newline character)\n  | \\n\n"
+    },
+    "fstring-multi-brace": {
+      "comment": "value interpolation using { ... }",
+      "begin": "(\\{)",
+      "end": "(?x)\n  (\\})\n",
       "beginCaptures": {
         "1": {
-          "name": "invalid.illegal.prefix.python"
-        },
-        "2": {
-          "name": "storage.type.string.python"
-        },
-        "3": {
-          "name": "punctuation.definition.string.begin.python"
+          "name": "constant.character.format.placeholder.other.python"
         }
       },
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.string.end.python"
-        },
-        "2": {
-          "name": "invalid.illegal.newline.python"
+          "name": "constant.character.format.placeholder.other.python"
         }
       },
       "patterns": [
         {
-          "include": "#string-multi-bad-brace1-formatting-unicode"
-        },
-        {
-          "include": "#string-multi-bad-brace2-formatting-unicode"
+          "include": "#fstring-terminator-multi"
         },
         {
-          "include": "#string-unicode-guts"
+          "include": "#f-expression"
         }
       ]
     },
-    "string-multi-bad-brace1-formatting-unicode": {
-      "comment": "template using {% ... %}",
-      "begin": "(?x)\n    (?= \\{%\n          ( .*? (?!'''|\"\"\") )\n        %\\}\n    )\n",
-      "end": "(?='''|\"\"\")",
+    "fstring-terminator-multi": {
       "patterns": [
         {
-          "include": "#escape-sequence-unicode"
+          "name": "storage.type.format.python",
+          "match": "(![rsa])(?=})"
         },
         {
-          "include": "#escape-sequence"
+          "match": "(?x)\n  (![rsa])?\n    ( : \\w? [<>=^]? [-+ ]? \\#?\n      \\d* ,? (\\.\\d+)? [bcdeEfFgGnosxX%]? )(?=})\n",
+          "captures": {
+            "1": {
+              "name": "storage.type.format.python"
+            },
+            "2": {
+              "name": "support.other.format.python"
+            }
+          }
         },
         {
-          "include": "#string-line-continuation"
+          "include": "#fstring-terminator-multi-tail"
         }
       ]
     },
-    "string-multi-bad-brace1-formatting-raw": {
-      "comment": "template using {% ... %}",
-      "begin": "(?x)\n    (?= \\{%\n          ( .*? (?!'''|\"\"\") )\n        %\\}\n    )\n",
-      "end": "(?='''|\"\"\")",
-      "patterns": [
-        {
-          "include": "#string-consume-escape"
+    "fstring-terminator-multi-tail": {
+      "begin": "(![rsa])?(:)(?=.*?{)",
+      "end": "(?=})",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.format.python"
+        },
+        "2": {
+          "name": "support.other.format.python"
         }
-      ]
-    },
-    "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": "#fstring-illegal-multi-brace"
         },
         {
-          "include": "#string-entity"
-        }
-      ]
-    },
-    "string-multi-bad-brace2-formatting-raw": {
-      "comment": "odd format or format-like syntax",
-      "begin": "(?x)\n    (?!\\{\\{)\n    (?= \\{ (\n              \\w*? (?!'''|\"\"\") [^!:\\.\\[}\\w]\n           )\n        .*?(?!'''|\"\"\")\n        \\}\n    )\n",
-      "end": "(?='''|\"\"\")",
-      "patterns": [
+          "include": "#fstring-multi-brace"
+        },
         {
-          "include": "#string-consume-escape"
+          "name": "support.other.format.python",
+          "match": "([bcdeEfFgGnosxX%])(?=})"
         },
         {
-          "include": "#string-formatting"
+          "name": "support.other.format.python",
+          "match": "(\\.\\d+)"
+        },
+        {
+          "name": "support.other.format.python",
+          "match": "(,)"
+        },
+        {
+          "name": "support.other.format.python",
+          "match": "(\\d+)"
+        },
+        {
+          "name": "support.other.format.python",
+          "match": "(\\#)"
+        },
+        {
+          "name": "support.other.format.python",
+          "match": "([-+ ])"
+        },
+        {
+          "name": "support.other.format.python",
+          "match": "([<>=^])"
+        },
+        {
+          "name": "support.other.format.python",
+          "match": "(\\w)"
         }
       ]
     }