github-linguist 4.8.18 → 5.0.0

data/grammars/source.rascal.json

@@ -27,7 +27,7 @@
               "name": "punctuation.annotation-argument.end.rascal"
             }
           },
-          "name": "meta.annotation.block.rascal"
+          "name": "comment.block.annotation.rascal"
         },
         {
           "captures": {
@@ -276,12 +276,11 @@
               "name": "markup.underline.link.rascal"
             }
           },
-          "match": "\\|([0-9a-z_A-Z.-_~:/?#\\[\\]@!$&'()*+,;=`])+\\|",
+          "match": "\\|([0-9a-z_A-Z.\\-_~:/?#\\[\\]@!$&'()*+,;=`])+\\|",
           "name": "string.other.url.rascal"
         }
       ]
     }
   },
-  "scopeName": "source.rascal",
-  "uuid": "6d5574d4-85af-4e00-9f3c-9b5fa60f53b8"
+  "scopeName": "source.rascal"
 }

data/grammars/source.regexp.python.json

@@ -12,6 +12,32 @@
   ],
   "repository": {
     "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",
@@ -33,15 +59,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?)",

data/grammars/source.sdbl.json

@@ -1,7 +1,11 @@
 {
   "name": "1C (Query)",
   "scopeName": "source.sdbl",
-  "firstLineMatch": "(?i)Выбрать|Select(\\s+Разрешенные|Allowed)?(\\s+Различные|Distinct)?(\\s+Первые|Top)?.*",
+  "fileTypes": [
+    "sdbl",
+    "query"
+  ],
+  "firstLineMatch": "(?i)Выбрать|Select(\\s+Разрешенные|\\s+Allowed)?(\\s+Различные|\\s+Distinct)?(\\s+Первые|\\s+Top)?.*",
   "uuid": "d94265d3-2270-4ff2-ba36-649fbb4160df",
   "patterns": [
     {
@@ -58,7 +62,7 @@
     },
     {
       "name": "keyword.control.sdbl",
-      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Выбрать|Select|Разрешенные|Allowed|Различные|Distinct|Первые|Top|Как|As|ПустаяТаблица|EpmtyTable|Поместить|Into|Уничтожить|Drop|Из|From|((Левое|Left|Правое|Right|Полное|Full)\\s+(Внешнее\\s+|Outer\\s+)?Соединение|Join)|((Внутреннее\\s+|Inner\\s+)?Соединение|Join)|Где|Where|(Сгруппировать\\s+По)|(Group\\s+By)|Имеющие|Having|Объединить(\\s+Все)?|Union(\\s+All)?|(Упорядочить\\s+По)|(Order\\s+By)|Автоупорядочивание|Autoorder|Итоги|Totals|По(\\s+Общие)?|By(\\s+Overall)|(Только\\s+)?Иерархия|(Only\\s+)Hierarchy|Периодами|Periods|Индексировать|Index|Выразить|Cast|Возр|Asc|Убыв|Desc|Для\\s+Изменения|(For\\sUpdate(\\s+Of)?)|Спецсимвол|Escape)(?=[^\\wа-яё\\.]|$)"
+      "match": "(?i)(?<=[^\\wа-яё\\.]|^)(Выбрать|Select|Разрешенные|Allowed|Различные|Distinct|Первые|Top|Как|As|ПустаяТаблица|EpmtyTable|Поместить|Into|Уничтожить|Drop|Из|From|((Левое|Left|Правое|Right|Полное|Full)\\s+(Внешнее\\s+|Outer\\s+)?Соединение|Join)|((Внутреннее\\s+|Inner\\s+)?Соединение|Join)|Где|Where|(Сгруппировать\\s+По)|(Group\\s+By)|Имеющие|Having|Объединить(\\s+Все)?|Union(\\s+All)?|(Упорядочить\\s+По)|(Order\\s+By)|Автоупорядочивание|Autoorder|Итоги|Totals|По(\\s+Общие)?|By(\\s+Overall)?|(Только\\s+)?Иерархия|(Only\\s+)?Hierarchy|Периодами|Periods|Индексировать|Index|Выразить|Cast|Возр|Asc|Убыв|Desc|Для\\s+Изменения|(For\\s+Update(\\s+Of)?)|Спецсимвол|Escape)(?=[^\\wа-яё\\.]|$)"
     },
     {
       "comment": "Функции языка запросов",

data/grammars/source.swift.json

@@ -1,4 +1,5 @@
 {
+  "comment": "See swift.tmbundle/grammar-test.swift for test cases.",
   "fileTypes": [
     "swift"
   ],
@@ -1132,7 +1133,7 @@
               "name": "keyword.other.generic-constraint-introducer.swift"
             }
           },
-          "end": "(?!\\G)\\n|(?=[>{};\\n])",
+          "end": "(?!\\G)$|(?=[>{};\\n]|//|/\\*)",
           "name": "meta.generic-where-clause.swift",
           "patterns": [
             {
@@ -1145,7 +1146,7 @@
           "repository": {
             "requirement-list": {
               "begin": "\\G|,\\s*",
-              "end": "(?=[,>{};\\n])",
+              "end": "(?=[,>{};\\n]|//|/\\*)",
               "patterns": [
                 {
                   "include": "#comments"
@@ -1163,7 +1164,7 @@
                       "name": "keyword.operator.generic-constraint.same-type.swift"
                     }
                   },
-                  "end": "(?=\\s*[,>{};\\n])",
+                  "end": "(?=\\s*[,>{};\\n]|//|/\\*)",
                   "name": "meta.generic-where-clause.same-type-requirement.swift",
                   "patterns": [
                     {
@@ -1178,13 +1179,13 @@
                       "name": "keyword.operator.generic-constraint.conforms-to.swift"
                     }
                   },
-                  "end": "(?=\\s*[,>{};\\n])",
+                  "end": "(?=\\s*[,>{};\\n]|//|/\\*)",
                   "name": "meta.generic-where-clause.conformance-requirement.swift",
                   "patterns": [
                     {
                       "begin": "\\G\\s*",
                       "contentName": "entity.other.inherited-class.swift",
-                      "end": "(?=\\s*[,>{};\\n])",
+                      "end": "(?=\\s*[,>{};\\n]|//|/\\*)",
                       "patterns": [
                         {
                           "include": "#available-types"
@@ -1256,8 +1257,8 @@
                   "name": "punctuation.separator.import.swift"
                 },
                 {
-                  "begin": "(?!;|$|//|/\\*)",
-                  "end": "(?=;|$|//|/\\*)",
+                  "begin": "(?!\\s*(;|$|//|/\\*))",
+                  "end": "(?=\\s*(;|$|//|/\\*))",
                   "name": "invalid.illegal.character-not-allowed-here.swift"
                 }
               ]
@@ -1274,20 +1275,70 @@
               "name": "punctuation.separator.inheritance-clause.swift"
             }
           },
-          "end": "(?!\\G)\\n|(?=[={}]|(?!\\G)\\bwhere\\b)",
+          "end": "(?!\\G)$|(?=[={}]|(?!\\G)\\bwhere\\b)",
           "name": "meta.inheritance-clause.swift",
           "patterns": [
+            {
+              "begin": "\\bclass\\b",
+              "beginCaptures": {
+                "0": {
+                  "name": "storage.type.class.swift"
+                }
+              },
+              "end": "(?=[={}]|(?!\\G)\\bwhere\\b)",
+              "patterns": [
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#more-types"
+                }
+              ]
+            },
             {
               "begin": "\\G",
-              "end": "(?!\\G)\\n|(?=[={}]|(?!\\G)\\bwhere\\b)",
+              "end": "(?!\\G)$|(?=[={}]|(?!\\G)\\bwhere\\b)",
+              "patterns": [
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#inherited-type"
+                },
+                {
+                  "include": "#more-types"
+                }
+              ]
+            }
+          ],
+          "repository": {
+            "inherited-type": {
+              "begin": "(?=[`\\p{L}_])",
+              "end": "(?!\\G)",
               "name": "entity.other.inherited-class.swift",
               "patterns": [
                 {
-                  "include": "#available-types"
+                  "include": "#type-identifier"
+                }
+              ]
+            },
+            "more-types": {
+              "begin": ",\\s*",
+              "end": "(?!\\G)(?!//|/\\*)|(?=[,={}]|(?!\\G)\\bwhere\\b)",
+              "name": "meta.inheritance-list.more-types",
+              "patterns": [
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#inherited-type"
+                },
+                {
+                  "include": "#more-types"
                 }
               ]
             }
-          ]
+          }
         },
         "operator": {
           "begin": "(?x)\n\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t\\b(prefix|infix|postfix)\n\t\t\t\t\t\t\t\\s+\n\t\t\t\t\t\t)?\n\t\t\t\t\t\t\\b\n\t\t\t\t\t\t(operator)\n\t\t\t\t\t\t\\s+\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t(?<oph>\t\t\t\t\t\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t[/=\\-+!*%<>&|^~?]\n\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\t\t\t\t\t\t\t\t  | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n\t\t\t\t\t\t\t\t  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t\t  | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\\g<oph>\n\t\t\t\t\t\t\t\t  | \\.\t\t\t\t\t\t\t\t\t# Invalid dot\n\t\t\t\t\t\t\t\t  | (?<opc>\t\t\t\t\t\t\t\t# operator-character\n\t\t\t\t\t\t\t\t\t\t[\\x{0300}-\\x{036F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{1DC0}-\\x{1DFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{20D0}-\\x{20FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{FE00}-\\x{FE0F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{FE20}-\\x{FE2F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{E0100}-\\x{E01EF}]\n\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t)*+\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t  | ( \\. ( \\g<oph> | \\g<opc> | \\. )++ )\t\t\t# Dot operators\n\t\t\t\t\t\t)\n\t\t\t\t\t\t\\s*\n\t\t\t\t\t",
@@ -1449,10 +1500,10 @@
             {
               "captures": {
                 "1": {
-                  "name": "entity.name.function.swift"
+                  "name": "variable.parameter.function.swift"
                 },
                 "2": {
-                  "name": "variable.parameter.function.swift"
+                  "name": "entity.name.function.swift"
                 },
                 "3": {
                   "name": "punctuation.definition.identifier.swift"
@@ -1603,6 +1654,10 @@
             {
               "include": "#inheritance-clause"
             },
+            {
+              "comment": "SE-0142: Permit where clauses to constrain associated types",
+              "include": "#generic-where-clause"
+            },
             {
               "begin": "\\{",
               "beginCaptures": {
@@ -1621,6 +1676,9 @@
                 {
                   "include": "#protocol-method"
                 },
+                {
+                  "include": "#protocol-initializer"
+                },
                 {
                   "include": "#associated-type"
                 },
@@ -1647,7 +1705,7 @@
                   "name": "punctuation.definition.identifier.swift"
                 }
               },
-              "end": "(?!\\G)\\n|(?=[;}]|$)",
+              "end": "(?!\\G)$|(?=[;}]|$)",
               "name": "meta.definition.associatedtype.swift",
               "patterns": [
                 {
@@ -1662,6 +1720,61 @@
                 }
               ]
             },
+            "protocol-initializer": {
+              "begin": "(?<!\\.)\\b(init[?!]*(?# only one is valid, but we want the in⇥ snippet to produce something that looks good))\\s*(?=\\(|<)",
+              "beginCaptures": {
+                "1": {
+                  "name": "storage.type.function.swift",
+                  "patterns": [
+                    {
+                      "match": "(?<=[?!])[?!]+",
+                      "name": "invalid.illegal.character-not-allowed-here.swift"
+                    }
+                  ]
+                }
+              },
+              "end": "$|(?=;|//|/\\*|\\})",
+              "name": "meta.definition.function.initializer.swift",
+              "patterns": [
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#generic-parameter-clause"
+                },
+                {
+                  "include": "#parameter-clause"
+                },
+                {
+                  "match": "\\b(?:throws|rethrows)\\b",
+                  "name": "keyword.control.exception.swift"
+                },
+                {
+                  "comment": "Swift 3: generic constraints after the parameters and return type",
+                  "include": "#generic-where-clause"
+                },
+                {
+                  "begin": "\\{",
+                  "beginCaptures": {
+                    "0": {
+                      "name": "punctuation.section.function.begin.swift"
+                    }
+                  },
+                  "end": "\\}",
+                  "endCaptures": {
+                    "0": {
+                      "name": "punctuation.section.function.end.swift"
+                    }
+                  },
+                  "name": "invalid.illegal.function-body-not-allowed-in-protocol.swift",
+                  "patterns": [
+                    {
+                      "include": "$self"
+                    }
+                  ]
+                }
+              ]
+            },
             "protocol-method": {
               "begin": "(?x)\n\t\t\t\t\t\t\t\t\\b\n\t\t\t\t\t\t\t\t(func)\n\t\t\t\t\t\t\t\t\\s+\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>)\n\t\t  \t\t\t\t\t\t  | (?:\n\t\t  \t\t\t\t\t\t\t\t(\n\t\t  \t\t\t\t\t\t\t\t\t(?<oph>\t\t\t\t\t\t\t\t# operator-head\n\t\t  \t\t\t\t\t\t\t\t\t\t[/=\\-+!*%<>&|^~?]\n\t\t  \t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t  \t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t  \t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\t\t  \t\t\t\t\t\t\t\t\t  | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n\t\t  \t\t\t\t\t\t\t\t\t  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t  \t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t  \t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t  \t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t  \t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t  \t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t  \t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t  \t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t  \t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\t  \t\t\t\t\t\t\t\t\t  | [\\x{3008}-\\x{3030}]\n\t\t  \t\t\t\t\t\t\t\t\t)\n\t\t  \t\t\t\t\t\t\t\t\t(\n\t\t  \t\t\t\t\t\t\t\t\t\t\\g<oph>\n\t\t  \t\t\t\t\t\t\t\t\t  | (?<opc>\t\t\t\t\t\t\t\t# operator-character\n\t\t  \t\t\t\t\t\t\t\t\t\t\t[\\x{0300}-\\x{036F}]\n\t\t  \t\t\t\t\t\t\t\t\t\t  | [\\x{1DC0}-\\x{1DFF}]\n\t\t  \t\t\t\t\t\t\t\t\t\t  | [\\x{20D0}-\\x{20FF}]\n\t\t  \t\t\t\t\t\t\t\t\t\t  | [\\x{FE00}-\\x{FE0F}]\n\t\t  \t\t\t\t\t\t\t\t\t\t  | [\\x{FE20}-\\x{FE2F}]\n\t\t  \t\t\t\t\t\t\t\t\t\t  | [\\x{E0100}-\\x{E01EF}]\n\t\t  \t\t\t\t\t\t\t\t\t\t)\n\t\t  \t\t\t\t\t\t\t\t\t)*\n\t\t  \t\t\t\t\t\t\t\t)\n\t\t  \t\t\t\t\t\t\t  | ( \\. ( \\g<oph> | \\g<opc> | \\. )+ )\t\t\t# Dot operators\n\t\t  \t\t\t\t\t\t\t)\n\t\t  \t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\\s*\n\t\t\t\t\t\t\t\t(?=\\(|<)\n\t\t\t\t\t\t\t",
               "beginCaptures": {
@@ -1990,28 +2103,27 @@
           }
         },
         "type-identifier": {
-          "patterns": [
-            {
-              "captures": {
-                "0": {
-                  "patterns": [
-                    {
-                      "include": "#builtin-types"
-                    }
-                  ]
-                },
-                "1": {
-                  "name": "punctuation.definition.identifier.swift"
-                },
-                "2": {
-                  "name": "punctuation.definition.identifier.swift"
+          "begin": "((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))\\s*",
+          "beginCaptures": {
+            "1": {
+              "name": "meta.type-name.swift",
+              "patterns": [
+                {
+                  "include": "#builtin-types"
                 }
-              },
-              "match": "(?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>)",
-              "name": "meta.type-name.swift"
+              ]
             },
+            "2": {
+              "name": "punctuation.definition.identifier.swift"
+            },
+            "3": {
+              "name": "punctuation.definition.identifier.swift"
+            }
+          },
+          "end": "(?!<)",
+          "patterns": [
             {
-              "begin": "(?!\\G)(?=<)",
+              "begin": "(?=<)",
               "end": "(?!\\G)",
               "patterns": [
                 {
@@ -2037,11 +2149,17 @@
               "name": "punctuation.definition.identifier.swift"
             }
           },
-          "end": "(?!\\G)\\n|(?=;|$)",
+          "end": "(?!\\G)$|(?=;|//|/\\*|$)",
           "name": "meta.definition.typealias.swift",
           "patterns": [
             {
-              "include": "#generic-parameter-clause"
+              "begin": "\\G(?=<)",
+              "end": "(?!\\G)",
+              "patterns": [
+                {
+                  "include": "#generic-parameter-clause"
+                }
+              ]
             },
             {
               "include": "#typealias-assignment"
@@ -2055,7 +2173,7 @@
               "name": "keyword.operator.assignment.swift"
             }
           },
-          "end": "(?!\\G)",
+          "end": "(?!\\G)$|(?=;|//|/\\*|$)",
           "patterns": [
             {
               "include": "#available-types"
@@ -2179,7 +2297,7 @@
         },
         "closure-parameter": {
           "match": "\\$[0-9]+",
-          "name": "variable.other.closure-parameter.swift"
+          "name": "variable.language.closure-parameter.swift"
         },
         "compound-name": {
           "captures": {
@@ -2530,17 +2648,17 @@
             },
             {
               "comment": "-0x1.ap2_3, 0x31p-4",
-              "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)(0x\\h[\\h_]*)(?:\\.\\h[\\h_]*)?[pP][-+]?[0-9][0-9_]*\\b(?!\\.[0-9])",
+              "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)(0x[0-9a-fA-F][0-9a-fA-F_]*)(?:\\.[0-9a-fA-F][0-9a-fA-F_]*)?[pP][-+]?[0-9][0-9_]*\\b(?!\\.[0-9])",
               "name": "constant.numeric.float.hexadecimal.swift"
             },
             {
               "comment": "0x1p, 0x1p_2, 0x1.5pa, 0x1.1p+1f, 0x1pz",
-              "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)(0x\\h[\\h_]*)(?:\\.\\h[\\h_]*)?(?:[pP][-+]?\\w*)\\b(?!\\.[0-9])",
+              "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)(0x[0-9a-fA-F][0-9a-fA-F_]*)(?:\\.[0-9a-fA-F][0-9a-fA-F_]*)?(?:[pP][-+]?\\w*)\\b(?!\\.[0-9])",
               "name": "invalid.illegal.numeric.float.invalid-exponent.swift"
             },
             {
               "comment": "0x1.5w (note that 0x1.f may be a valid expression)",
-              "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)(0x\\h[\\h_]*)\\.[0-9][\\w.]*",
+              "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)(0x[0-9a-fA-F][0-9a-fA-F_]*)\\.[0-9][\\w.]*",
               "name": "invalid.illegal.numeric.float.missing-exponent.swift"
             },
             {
@@ -2550,7 +2668,7 @@
             },
             {
               "comment": "0b_0_1, 0x_1p+3q",
-              "match": "(\\B\\-|\\b)0[box]_[\\h_]*(?:[pPeE][+-]?\\w+)?[\\w.]+",
+              "match": "(\\B\\-|\\b)0[box]_[0-9a-fA-F_]*(?:[pPeE][+-]?\\w+)?[\\w.]+",
               "name": "invalid.illegal.numeric.leading-underscore.swift"
             },
             {
@@ -2574,7 +2692,7 @@
             },
             {
               "comment": "0x4, 0xF_7",
-              "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)0x\\h[\\h_]*\\b(?!\\.[0-9])",
+              "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)0x[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\.[0-9])",
               "name": "constant.numeric.integer.hexadecimal.swift"
             },
             {
@@ -2609,31 +2727,37 @@
                   "name": "constant.character.escape.swift"
                 },
                 {
-                  "match": "\\\\u\\{\\h{1,8}\\}",
+                  "match": "\\\\u\\{[0-9a-fA-F]{1,8}\\}",
                   "name": "constant.character.escape.unicode.swift"
                 },
                 {
-                  "captures": {
-                    "1": {
+                  "begin": "\\\\\\(",
+                  "beginCaptures": {
+                    "0": {
                       "name": "punctuation.section.embedded.begin.swift"
-                    },
-                    "2": {
-                      "name": "source.swift",
-                      "patterns": [
-                        {
-                          "include": "#root"
-                        }
-                      ]
-                    },
-                    "5": {
+                    }
+                  },
+                  "contentName": "source.swift",
+                  "end": "(\\))",
+                  "endCaptures": {
+                    "0": {
                       "name": "punctuation.section.embedded.end.swift"
                     },
-                    "6": {
+                    "1": {
                       "name": "source.swift"
                     }
                   },
-                  "match": "(?x)\n\t\t\t\t\t\t\t\t\t\t(\\\\\\()\t\t\t\t\t\t\t# Opening\n\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t(?<parens>\n\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t[^()\"]\t\t\t\t# Anything except parens\n\t\t\t\t\t\t\t\t\t\t\t\t  | \\(\t\t\t\t\t# Matched pairs of parens\n\t\t\t\t\t\t\t\t\t\t\t\t\t\\g<parens>\t\t\t#  …that can be nested\n\t\t\t\t\t\t\t\t\t\t\t\t\t\\)\n\t\t\t\t\t\t\t\t\t\t\t\t  | \"\t\t\t\t\t# Strings\n\t\t\t\t\t\t\t\t\t\t\t\t\t([^\\\\]|\\\\.)*\t\t# Contents allowing for escapes\n\t\t\t\t\t\t\t\t\t\t\t\t\t\"\n\t\t\t\t\t\t\t\t\t\t\t\t)*\n\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t((\\)))\t\t\t\t\t\t\t# Closing\n\t\t\t\t\t\t\t\t\t",
-                  "name": "meta.embedded.line.swift"
+                  "name": "meta.embedded.line.swift",
+                  "patterns": [
+                    {
+                      "include": "$self"
+                    },
+                    {
+                      "begin": "\\(",
+                      "comment": "Nested parens",
+                      "end": "\\)"
+                    }
+                  ]
                 },
                 {
                   "match": "\\\\.",