github-linguist 5.3.3 → 6.0.0

data/grammars/source.supercollider.json

@@ -1,100 +1,93 @@
 {
-  "fileTypes": [
-    "sc",
-    "scd"
-  ],
-  "foldingStartMarker": "\\{|\\/\\*",
-  "foldingStopMarker": "\\}|\\*\\/",
   "name": "SuperCollider",
+  "scopeName": "source.supercollider",
   "patterns": [
     {
-      "match": "\\b(arg|var|classvar|const|this|thisThread|thisMethod|thisFunction|thisFunctionDef|thisProcess|true|false|inf|nil)\\b",
-      "name": "keyword.control.supercollider"
+      "name": "keyword.control.supercollider",
+      "match": "\\b(arg|var|classvar|const|this|thisThread|thisMethod|thisFunction|thisFunctionDef|thisProcess|true|false|inf|nil)\\b"
     },
     {
+      "name": "string.quoted.double.supercollider",
       "begin": "\"",
       "end": "\"",
-      "name": "string.quoted.double.supercollider",
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.supercollider"
+          "name": "constant.character.escape.supercollider",
+          "match": "\\\\."
         }
       ]
     },
     {
+      "name": "entity.name.symbol.supercollider",
       "begin": "'",
       "end": "'",
-      "name": "entity.name.symbol.supercollider",
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.supercollider"
+          "name": "constant.character.escape.supercollider",
+          "match": "\\\\."
         }
       ]
     },
     {
-      "match": "[a-z][a-zA-Z0-9_]*\\:",
-      "name": "support.name.tag.supercollider"
+      "name": "support.name.tag.supercollider",
+      "match": "[a-z][a-zA-Z0-9_]*\\:"
     },
     {
+      "match": "^\\s*\\+*\\s*([A-Z]{1}[a-zA-Z0-9_]*)\\s*\\:{1}\\s*([A-Z]{1}[a-zA-Z0-9_]*)\\s*\\{",
       "captures": {
         "1": {
           "name": "entity.name.class.supercollider"
         }
-      },
-      "match": "^\\s*\\+*\\s*([A-Z]{1}[a-zA-Z0-9_]*)\\s*\\:{1}\\s*([A-Z]{1}[a-zA-Z0-9_]*)\\s*\\{"
+      }
     },
     {
+      "match": "^([A-Z_]{1}[a-zA-Z0-9_]*)[^a-zA-Z0-9_]",
       "captures": {
         "1": {
           "name": "entity.name.class.supercollider"
         }
-      },
-      "match": "^([A-Z_]{1}[a-zA-Z0-9_]*)[^a-zA-Z0-9_]"
+      }
     },
     {
-      "match": "\\|[a-zA-Z0-9\\#\\[\\]\\\"\\_\\=\\.\\(\\)[[:space:]]\\,]+\\|",
-      "name": "variable.parameter.function.supercollider"
+      "name": "variable.parameter.function.supercollider",
+      "match": "\\|[a-zA-Z0-9\\#\\[\\]\\\"\\_\\=\\.\\(\\)[[:space:]]\\,]+\\|"
     },
     {
+      "match": "[^a-zA-Z0-9\\\\]([A-Z_]{1}[a-zA-Z0-9_]*)[^a-zA-Z0-9_]",
       "captures": {
         "1": {
           "name": "entity.name.class.supercollider"
         }
-      },
-      "match": "[^a-zA-Z0-9\\\\]([A-Z_]{1}[a-zA-Z0-9_]*)[^a-zA-Z0-9_]"
+      }
     },
     {
-      "match": "\\\\[a-zA-Z0-9\\_]+",
-      "name": "entity.name.symbol.supercollider"
+      "name": "entity.name.symbol.supercollider",
+      "match": "\\\\[a-zA-Z0-9\\_]+"
     },
     {
+      "match": "^\\s*(\\**[a-z]{1}[a-zA-Z0-9_]+)\\s*\\{",
       "captures": {
         "1": {
           "name": "entity.name.function.supercollider"
         }
-      },
-      "match": "^\\s*(\\**[a-z]{1}[a-zA-Z0-9_]+)\\s*\\{"
+      }
     },
     {
-      "match": "\\~[a-z][a-zA-Z0-9_]*",
-      "name": "variable.language.supercollider"
+      "name": "variable.language.supercollider",
+      "match": "\\~[a-z][a-zA-Z0-9_]*"
     },
     {
-      "match": "\\/\\/.*",
-      "name": "comment.single.supercollider"
+      "name": "comment.single.supercollider",
+      "match": "\\/\\/.*"
     },
     {
+      "name": "comment.multiline.supercollider",
       "begin": "\\/\\*",
-      "end": "\\*\\/",
-      "name": "comment.multiline.supercollider"
+      "end": "\\*\\/"
     },
     {
-      "comment": "source: ruby bundle",
-      "match": "\\b(0[xX][0-9A-Fa-f](?>_?[0-9A-Fa-f])*|\\d(?>_?\\d)*(\\.(?![^[:space:][:digit:]])(?>_?\\d)*)?([eE][-+]?\\d(?>_?\\d)*)?|0[bB][01]+)\\b",
-      "name": "constant.numeric.supercollider"
+      "name": "constant.numeric.supercollider",
+      "match": "\\b(0[xX][0-9A-Fa-f](?\u003e_?[0-9A-Fa-f])*|\\d(?\u003e_?\\d)*(\\.(?![^[:space:][:digit:]])(?\u003e_?\\d)*)?([eE][-+]?\\d(?\u003e_?\\d)*)?|0[bB][01]+)\\b"
     }
-  ],
-  "scopeName": "source.supercollider"
-}
+  ]
+}

data/grammars/source.swift.json

@@ -1,11 +1,6 @@
 {
-  "comment": "See swift.tmbundle/grammar-test.swift for test cases.",
-  "fileTypes": [
-    "swift"
-  ],
-  "firstLineMatch": "^#!/.*\\bswift",
-  "keyEquivalent": "^~S",
   "name": "Swift",
+  "scopeName": "source.swift",
   "patterns": [
     {
       "include": "#root"
@@ -15,27 +10,12 @@
     "attributes": {
       "patterns": [
         {
+          "name": "meta.attribute.available.swift",
           "begin": "((@)available)(\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.modifier.attribute.swift"
-            },
-            "2": {
-              "name": "punctuation.definition.attribute.swift"
-            },
-            "3": {
-              "name": "punctuation.definition.arguments.begin.swift"
-            }
-          },
           "end": "\\)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.arguments.end.swift"
-            }
-          },
-          "name": "meta.attribute.available.swift",
           "patterns": [
             {
+              "match": "\\b((?:iOS|macOS|OSX|watchOS|tvOS)(?:ApplicationExtension)?)\\b(?:\\s+([0-9]+(?:\\.[0-9]+)*\\b))?",
               "captures": {
                 "1": {
                   "name": "keyword.other.platform.os.swift"
@@ -43,11 +23,17 @@
                 "2": {
                   "name": "constant.numeric.swift"
                 }
-              },
-              "match": "\\b((?:iOS|macOS|OSX|watchOS|tvOS)(?:ApplicationExtension)?)\\b(?:\\s+([0-9]+(?:\\.[0-9]+)*\\b))?"
+              }
             },
             {
               "begin": "\\b(introduced|deprecated|obsoleted)\\s*(:)\\s*",
+              "end": "(?!\\G)",
+              "patterns": [
+                {
+                  "name": "constant.numeric.swift",
+                  "match": "\\b[0-9]+(?:\\.[0-9]+)*\\b"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "keyword.other.swift"
@@ -55,17 +41,16 @@
                 "2": {
                   "name": "punctuation.separator.key-value.swift"
                 }
-              },
+              }
+            },
+            {
+              "begin": "\\b(message|renamed)\\s*(:)\\s*(?=\")",
               "end": "(?!\\G)",
               "patterns": [
                 {
-                  "match": "\\b[0-9]+(?:\\.[0-9]+)*\\b",
-                  "name": "constant.numeric.swift"
+                  "include": "#literals"
                 }
-              ]
-            },
-            {
-              "begin": "\\b(message|renamed)\\s*(:)\\s*(?=\")",
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "keyword.other.swift"
@@ -73,15 +58,10 @@
                 "2": {
                   "name": "punctuation.separator.key-value.swift"
                 }
-              },
-              "end": "(?!\\G)",
-              "patterns": [
-                {
-                  "include": "#literals"
-                }
-              ]
+              }
             },
             {
+              "match": "(?:(\\*)|\\b(deprecated|unavailable)\\b)\\s*(.*?)(?=[,)])",
               "captures": {
                 "1": {
                   "name": "keyword.other.platform.all.swift"
@@ -92,13 +72,9 @@
                 "3": {
                   "name": "invalid.illegal.character-not-allowed-here.swift"
                 }
-              },
-              "match": "(?:(\\*)|\\b(deprecated|unavailable)\\b)\\s*(.*?)(?=[,)])"
+              }
             }
-          ]
-        },
-        {
-          "begin": "((@)objc)(\\()",
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.attribute.swift"
@@ -110,85 +86,100 @@
               "name": "punctuation.definition.arguments.begin.swift"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.arguments.end.swift"
             }
-          },
+          }
+        },
+        {
           "name": "meta.attribute.objc.swift",
+          "begin": "((@)objc)(\\()",
+          "end": "\\)",
           "patterns": [
             {
+              "name": "entity.name.function.swift",
+              "match": "\\w*(?::(?:\\w*:)*(\\w*))?",
               "captures": {
                 "1": {
                   "name": "invalid.illegal.missing-colon-after-selector-piece.swift"
                 }
-              },
-              "match": "\\w*(?::(?:\\w*:)*(\\w*))?",
-              "name": "entity.name.function.swift"
+              }
             }
-          ]
-        },
-        {
-          "begin": "(@)(?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>)",
+          ],
           "beginCaptures": {
-            "0": {
-              "name": "storage.modifier.attribute.swift"
-            },
             "1": {
-              "name": "punctuation.definition.attribute.swift"
+              "name": "storage.modifier.attribute.swift"
             },
             "2": {
-              "name": "punctuation.definition.identifier.swift"
+              "name": "punctuation.definition.attribute.swift"
             },
             "3": {
-              "name": "punctuation.definition.identifier.swift"
+              "name": "punctuation.definition.arguments.begin.swift"
             }
           },
-          "comment": "any other attribute",
-          "end": "(?!\\G\\()",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.arguments.end.swift"
+            }
+          }
+        },
+        {
           "name": "meta.attribute.swift",
+          "begin": "(@)(?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e)",
+          "end": "(?!\\G\\()",
           "patterns": [
             {
+              "name": "meta.arguments.attribute.swift",
               "begin": "\\(",
+              "end": "\\)",
+              "patterns": [
+                {
+                  "include": "#expressions"
+                }
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.arguments.begin.swift"
                 }
               },
-              "end": "\\)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.arguments.end.swift"
                 }
-              },
-              "name": "meta.arguments.attribute.swift",
-              "patterns": [
-                {
-                  "include": "#expressions"
-                }
-              ]
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "storage.modifier.attribute.swift"
+            },
+            "1": {
+              "name": "punctuation.definition.attribute.swift"
+            },
+            "2": {
+              "name": "punctuation.definition.identifier.swift"
+            },
+            "3": {
+              "name": "punctuation.definition.identifier.swift"
+            }
+          }
         }
       ]
     },
     "builtin-functions": {
       "patterns": [
         {
-          "comment": "Member functions in the standard library in Swift 3 which may be used with trailing closures and no parentheses",
-          "match": "(?<=\\.)(?:s(?:ort(?:ed)?|plit)|contains|index|partition|f(?:i(?:lter|rst)|orEach|latMap)|with(?:MutableCharacters|CString|U(?:nsafe(?:Mutable(?:BufferPointer|Pointer(?:s|To(?:Header|Elements)))|BufferPointer)|TF8Buffer))|m(?:in|a(?:p|x)))(?=\\s*[({])\\b",
-          "name": "support.function.swift"
+          "name": "support.function.swift",
+          "match": "(?\u003c=\\.)(?:s(?:ort(?:ed)?|plit)|contains|index|partition|f(?:i(?:lter|rst)|orEach|latMap)|with(?:MutableCharacters|CString|U(?:nsafe(?:Mutable(?:BufferPointer|Pointer(?:s|To(?:Header|Elements)))|BufferPointer)|TF8Buffer))|m(?:in|a(?:p|x)))(?=\\s*[({])\\b"
         },
         {
-          "comment": "Member functions in the standard library in Swift 3",
-          "match": "(?<=\\.)(?:s(?:ymmetricDifference|t(?:oreBytes|arts|ride)|ortInPlace|u(?:ccessor|ffix|btract(?:ing|InPlace|WithOverflow)?)|quareRoot|amePosition)|h(?:oldsUnique(?:Reference|OrPinnedReference)|as(?:Suffix|Prefix))|ne(?:gate(?:d)?|xt)|c(?:o(?:untByEnumerating|py(?:Bytes)?)|lamp(?:ed)?|reate)|t(?:o(?:IntMax|Opaque|UIntMax)|ake(?:RetainedValue|UnretainedValue)|r(?:uncatingRemainder|a(?:nscodedLength|ilSurrogate)))|i(?:s(?:MutableAndUniquelyReferenced(?:OrPinned)?|S(?:trictSu(?:perset(?:Of)?|bset(?:Of)?)|u(?:perset(?:Of)?|bset(?:Of)?))|Continuation|T(?:otallyOrdered|railSurrogate)|Disjoint(?:With)?|Unique(?:Reference|lyReferenced(?:OrPinned)?)|Equal|Le(?:ss(?:ThanOrEqualTo)?|adSurrogate))|n(?:sert(?:ContentsOf)?|tersect(?:ion|InPlace)?|itialize(?:Memory|From)?|dex(?:Of|ForKey)))|o(?:verlaps|bjectAt)|d(?:i(?:stance(?:To)?|vide(?:d|WithOverflow)?)|e(?:s(?:cendant|troy)|code(?:CString)?|initialize|alloc(?:ate(?:Capacity)?)?)|rop(?:First|Last))|u(?:n(?:ion(?:InPlace)?|derestimateCount|wrappedOrError)|p(?:date(?:Value)?|percased))|join(?:ed|WithSeparator)|p(?:op(?:First|Last)|ass(?:Retained|Unretained)|re(?:decessor|fix))|e(?:scape(?:d)?|n(?:code|umerate(?:d)?)|lementsEqual|xclusiveOr(?:InPlace)?)|f(?:orm(?:Remainder|S(?:ymmetricDifference|quareRoot)|TruncatingRemainder|In(?:tersection|dex)|Union)|latten|rom(?:CString(?:RepairingIllFormedUTF8)?|Opaque))|w(?:i(?:thMemoryRebound|dth)|rite(?:To)?)|l(?:o(?:wercased|ad)|e(?:adSurrogate|xicographical(?:Compare|lyPrecedes)))|a(?:ss(?:ign(?:BackwardFrom|From)?|umingMemoryBound)|d(?:d(?:ing(?:Product)?|Product|WithOverflow)?|vanced(?:By)?)|utorelease|ppend(?:ContentsOf)?|lloc(?:ate)?|bs)|r(?:ound(?:ed)?|e(?:serveCapacity|tain|duce|place(?:Range|Subrange)?|verse(?:d)?|quest(?:NativeBuffer|UniqueMutableBackingBuffer)|lease|m(?:ove(?:Range|Subrange|Value(?:ForKey)?|First|Last|A(?:tIndex|ll))?|ainder(?:WithOverflow)?)))|ge(?:nerate|t(?:Objects|Element))|m(?:in(?:imum(?:Magnitude)?|Element)|ove(?:Initialize(?:Memory|BackwardFrom|From)?|Assign(?:From)?)?|ultipl(?:y(?:WithOverflow)?|ied)|easure|a(?:ke(?:Iterator|Description)|x(?:imum(?:Magnitude)?|Element)))|bindMemory)(?=\\s*\\()",
-          "name": "support.function.swift"
+          "name": "support.function.swift",
+          "match": "(?\u003c=\\.)(?:s(?:ymmetricDifference|t(?:oreBytes|arts|ride)|ortInPlace|u(?:ccessor|ffix|btract(?:ing|InPlace|WithOverflow)?)|quareRoot|amePosition)|h(?:oldsUnique(?:Reference|OrPinnedReference)|as(?:Suffix|Prefix))|ne(?:gate(?:d)?|xt)|c(?:o(?:untByEnumerating|py(?:Bytes)?)|lamp(?:ed)?|reate)|t(?:o(?:IntMax|Opaque|UIntMax)|ake(?:RetainedValue|UnretainedValue)|r(?:uncatingRemainder|a(?:nscodedLength|ilSurrogate)))|i(?:s(?:MutableAndUniquelyReferenced(?:OrPinned)?|S(?:trictSu(?:perset(?:Of)?|bset(?:Of)?)|u(?:perset(?:Of)?|bset(?:Of)?))|Continuation|T(?:otallyOrdered|railSurrogate)|Disjoint(?:With)?|Unique(?:Reference|lyReferenced(?:OrPinned)?)|Equal|Le(?:ss(?:ThanOrEqualTo)?|adSurrogate))|n(?:sert(?:ContentsOf)?|tersect(?:ion|InPlace)?|itialize(?:Memory|From)?|dex(?:Of|ForKey)))|o(?:verlaps|bjectAt)|d(?:i(?:stance(?:To)?|vide(?:d|WithOverflow)?)|e(?:s(?:cendant|troy)|code(?:CString)?|initialize|alloc(?:ate(?:Capacity)?)?)|rop(?:First|Last))|u(?:n(?:ion(?:InPlace)?|derestimateCount|wrappedOrError)|p(?:date(?:Value)?|percased))|join(?:ed|WithSeparator)|p(?:op(?:First|Last)|ass(?:Retained|Unretained)|re(?:decessor|fix))|e(?:scape(?:d)?|n(?:code|umerate(?:d)?)|lementsEqual|xclusiveOr(?:InPlace)?)|f(?:orm(?:Remainder|S(?:ymmetricDifference|quareRoot)|TruncatingRemainder|In(?:tersection|dex)|Union)|latten|rom(?:CString(?:RepairingIllFormedUTF8)?|Opaque))|w(?:i(?:thMemoryRebound|dth)|rite(?:To)?)|l(?:o(?:wercased|ad)|e(?:adSurrogate|xicographical(?:Compare|lyPrecedes)))|a(?:ss(?:ign(?:BackwardFrom|From)?|umingMemoryBound)|d(?:d(?:ing(?:Product)?|Product|WithOverflow)?|vanced(?:By)?)|utorelease|ppend(?:ContentsOf)?|lloc(?:ate)?|bs)|r(?:ound(?:ed)?|e(?:serveCapacity|tain|duce|place(?:Range|Subrange)?|verse(?:d)?|quest(?:NativeBuffer|UniqueMutableBackingBuffer)|lease|m(?:ove(?:Range|Subrange|Value(?:ForKey)?|First|Last|A(?:tIndex|ll))?|ainder(?:WithOverflow)?)))|ge(?:nerate|t(?:Objects|Element))|m(?:in(?:imum(?:Magnitude)?|Element)|ove(?:Initialize(?:Memory|BackwardFrom|From)?|Assign(?:From)?)?|ultipl(?:y(?:WithOverflow)?|ied)|easure|a(?:ke(?:Iterator|Description)|x(?:imum(?:Magnitude)?|Element)))|bindMemory)(?=\\s*\\()"
         },
         {
-          "comment": "Member functions in the standard library in Swift 2 only",
-          "match": "(?<=\\.)(?:s(?:uperclassMirror|amePositionIn|tartsWith)|nextObject|c(?:haracterAtIndex|o(?:untByEnumeratingWithState|pyWithZone)|ustom(?:Mirror|PlaygroundQuickLook))|is(?:EmptyInput|ASCII)|object(?:Enumerator|ForKey|AtIndex)|join|put|keyEnumerator|withUnsafeMutablePointerToValue|length|getMirror|m(?:oveInitializeAssignFrom|ember))(?=\\s*\\()",
-          "name": "support.function.swift"
+          "name": "support.function.swift",
+          "match": "(?\u003c=\\.)(?:s(?:uperclassMirror|amePositionIn|tartsWith)|nextObject|c(?:haracterAtIndex|o(?:untByEnumeratingWithState|pyWithZone)|ustom(?:Mirror|PlaygroundQuickLook))|is(?:EmptyInput|ASCII)|object(?:Enumerator|ForKey|AtIndex)|join|put|keyEnumerator|withUnsafeMutablePointerToValue|length|getMirror|m(?:oveInitializeAssignFrom|ember))(?=\\s*\\()"
         }
       ]
     },
@@ -196,6 +187,12 @@
       "patterns": [
         {
           "begin": "\\b(type)(\\()\\s*(of)(:)",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#expressions"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "support.function.dynamic-type.swift"
@@ -210,60 +207,47 @@
               "name": "punctuation.separator.argument-label.begin.swift"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.arguments.end.swift"
             }
-          },
-          "patterns": [
-            {
-              "include": "#expressions"
-            }
-          ]
+          }
         },
         {
-          "comment": "Global functions available in Swift 3 which may be used with trailing closures and no parentheses",
-          "match": "\\b(?:anyGenerator|autoreleasepool)(?=\\s*[({])\\b",
-          "name": "support.function.swift"
+          "name": "support.function.swift",
+          "match": "\\b(?:anyGenerator|autoreleasepool)(?=\\s*[({])\\b"
         },
         {
-          "comment": "Global functions available in Swift 3",
-          "match": "\\b(?:s(?:tride(?:of(?:Value)?)?|izeof(?:Value)?|equence|wap)|numericCast|transcode|is(?:UniquelyReferenced(?:NonObjC)?|KnownUniquelyReferenced)|zip|d(?:ump|ebugPrint)|unsafe(?:BitCast|Downcast|Unwrap|Address(?:Of)?)|pr(?:int|econdition(?:Failure)?)|fatalError|with(?:Unsafe(?:MutablePointer|Pointer)|ExtendedLifetime|VaList)|a(?:ssert(?:ionFailure)?|lignof(?:Value)?|bs)|re(?:peatElement|adLine)|getVaList|m(?:in|ax))(?=\\s*\\()",
-          "name": "support.function.swift"
+          "name": "support.function.swift",
+          "match": "\\b(?:s(?:tride(?:of(?:Value)?)?|izeof(?:Value)?|equence|wap)|numericCast|transcode|is(?:UniquelyReferenced(?:NonObjC)?|KnownUniquelyReferenced)|zip|d(?:ump|ebugPrint)|unsafe(?:BitCast|Downcast|Unwrap|Address(?:Of)?)|pr(?:int|econdition(?:Failure)?)|fatalError|with(?:Unsafe(?:MutablePointer|Pointer)|ExtendedLifetime|VaList)|a(?:ssert(?:ionFailure)?|lignof(?:Value)?|bs)|re(?:peatElement|adLine)|getVaList|m(?:in|ax))(?=\\s*\\()"
         },
         {
-          "comment": "Global functions available in Swift 2 only",
-          "match": "\\b(?:s(?:ort|uffix|pli(?:ce|t))|insert|overlaps|d(?:istance|rop(?:First|Last))|join|prefix|extend|withUnsafe(?:MutablePointers|Pointers)|lazy|advance|re(?:flect|move(?:Range|Last|A(?:tIndex|ll))))(?=\\s*\\()",
-          "name": "support.function.swift"
+          "name": "support.function.swift",
+          "match": "\\b(?:s(?:ort|uffix|pli(?:ce|t))|insert|overlaps|d(?:istance|rop(?:First|Last))|join|prefix|extend|withUnsafe(?:MutablePointers|Pointers)|lazy|advance|re(?:flect|move(?:Range|Last|A(?:tIndex|ll))))(?=\\s*\\()"
         }
       ]
     },
     "builtin-properties": {
       "patterns": [
         {
-          "match": "(?<=\\bProcess\\.|\\bCommandLine\\.)(arguments|argc|unsafeArgv)",
-          "name": "support.variable.swift"
+          "name": "support.variable.swift",
+          "match": "(?\u003c=\\bProcess\\.|\\bCommandLine\\.)(arguments|argc|unsafeArgv)"
         },
         {
-          "comment": "Properties in the standard library in Swift 3",
-          "match": "(?<=\\.)(?:s(?:t(?:artIndex|ri(?:ngValue|de))|i(?:ze|gn(?:BitIndex|ificand(?:Bit(?:Count|Pattern)|Width)?|alingNaN)?)|u(?:perclassMirror|mmary|bscriptBaseAddress))|h(?:eader|as(?:hValue|PointerRepresentation))|n(?:ulTerminatedUTF8|ext(?:Down|Up)|a(?:n|tiveOwner))|c(?:haracters|ount(?:TrailingZeros)?|ustom(?:Mirror|PlaygroundQuickLook)|apacity)|i(?:s(?:S(?:ign(?:Minus|aling(?:NaN)?)|ubnormal)|N(?:ormal|aN)|Canonical|Infinite|Zero|Empty|Finite|ASCII)|n(?:dices|finity)|dentity)|owner|de(?:scription|bugDescription)|u(?:n(?:safelyUnwrapped|icodeScalar(?:s)?|derestimatedCount)|tf(?:16|8(?:Start|C(?:String|odeUnitCount))?)|intValue|ppercaseString|lp(?:OfOne)?)|p(?:i|ointee)|e(?:ndIndex|lements|xponent(?:Bit(?:Count|Pattern))?)|value(?:s)?|keys|quietNaN|f(?:irst(?:ElementAddress(?:IfContiguous)?)?|loatingPointClass)|l(?:ittleEndian|owercaseString|eastNo(?:nzeroMagnitude|rmalMagnitude)|a(?:st|zy))|a(?:l(?:ignment|l(?:ocatedElementCount|Zeros))|rray(?:PropertyIsNativeTypeChecked)?)|ra(?:dix|wValue)|greatestFiniteMagnitude|m(?:in|emory|ax)|b(?:yteS(?:ize|wapped)|i(?:nade|tPattern|gEndian)|uffer|ase(?:Address)?))\\b",
-          "name": "support.variable.swift"
+          "name": "support.variable.swift",
+          "match": "(?\u003c=\\.)(?:s(?:t(?:artIndex|ri(?:ngValue|de))|i(?:ze|gn(?:BitIndex|ificand(?:Bit(?:Count|Pattern)|Width)?|alingNaN)?)|u(?:perclassMirror|mmary|bscriptBaseAddress))|h(?:eader|as(?:hValue|PointerRepresentation))|n(?:ulTerminatedUTF8|ext(?:Down|Up)|a(?:n|tiveOwner))|c(?:haracters|ount(?:TrailingZeros)?|ustom(?:Mirror|PlaygroundQuickLook)|apacity)|i(?:s(?:S(?:ign(?:Minus|aling(?:NaN)?)|ubnormal)|N(?:ormal|aN)|Canonical|Infinite|Zero|Empty|Finite|ASCII)|n(?:dices|finity)|dentity)|owner|de(?:scription|bugDescription)|u(?:n(?:safelyUnwrapped|icodeScalar(?:s)?|derestimatedCount)|tf(?:16|8(?:Start|C(?:String|odeUnitCount))?)|intValue|ppercaseString|lp(?:OfOne)?)|p(?:i|ointee)|e(?:ndIndex|lements|xponent(?:Bit(?:Count|Pattern))?)|value(?:s)?|keys|quietNaN|f(?:irst(?:ElementAddress(?:IfContiguous)?)?|loatingPointClass)|l(?:ittleEndian|owercaseString|eastNo(?:nzeroMagnitude|rmalMagnitude)|a(?:st|zy))|a(?:l(?:ignment|l(?:ocatedElementCount|Zeros))|rray(?:PropertyIsNativeTypeChecked)?)|ra(?:dix|wValue)|greatestFiniteMagnitude|m(?:in|emory|ax)|b(?:yteS(?:ize|wapped)|i(?:nade|tPattern|gEndian)|uffer|ase(?:Address)?))\\b"
         },
         {
-          "comment": "Properties in the standard library in Swift 2 only",
-          "match": "(?<=\\.)(?:boolValue|disposition|end|objectIdentifier|quickLookObject|start|valueType)\\b",
-          "name": "support.variable.swift"
+          "name": "support.variable.swift",
+          "match": "(?\u003c=\\.)(?:boolValue|disposition|end|objectIdentifier|quickLookObject|start|valueType)\\b"
         },
         {
-          "comment": "Enum cases in the standard library - note that there is some overlap between these and the properties",
-          "match": "(?<=\\.)(?:s(?:calarValue|i(?:ze|gnalingNaN)|o(?:und|me)|uppressed|prite|et)|n(?:one|egative(?:Subnormal|Normal|Infinity|Zero))|c(?:ol(?:or|lection)|ustomized)|t(?:o(?:NearestOr(?:Even|AwayFromZero)|wardZero)|uple|ext)|i(?:nt|mage)|optional|d(?:ictionary|o(?:uble|wn))|u(?:Int|p|rl)|p(?:o(?:sitive(?:Subnormal|Normal|Infinity|Zero)|int)|lus)|e(?:rror|mptyInput)|view|quietNaN|float|a(?:ttributedString|wayFromZero)|r(?:ectangle|ange)|generated|minus|b(?:ool|ezierPath))\\b",
-          "name": "support.variable.swift"
+          "name": "support.variable.swift",
+          "match": "(?\u003c=\\.)(?:s(?:calarValue|i(?:ze|gnalingNaN)|o(?:und|me)|uppressed|prite|et)|n(?:one|egative(?:Subnormal|Normal|Infinity|Zero))|c(?:ol(?:or|lection)|ustomized)|t(?:o(?:NearestOr(?:Even|AwayFromZero)|wardZero)|uple|ext)|i(?:nt|mage)|optional|d(?:ictionary|o(?:uble|wn))|u(?:Int|p|rl)|p(?:o(?:sitive(?:Subnormal|Normal|Infinity|Zero)|int)|lus)|e(?:rror|mptyInput)|view|quietNaN|float|a(?:ttributedString|wayFromZero)|r(?:ectangle|ange)|generated|minus|b(?:ool|ezierPath))\\b"
         }
       ]
     },
     "builtin-types": {
-      "comment": "Types provided in the standard library",
       "patterns": [
         {
           "include": "#builtin-class-type"
@@ -281,79 +265,68 @@
           "include": "#builtin-typealias"
         },
         {
-          "match": "\\bAny\\b",
-          "name": "support.type.any.swift"
+          "name": "support.type.any.swift",
+          "match": "\\bAny\\b"
         }
       ],
       "repository": {
         "builtin-class-type": {
-          "comment": "Builtin class types",
-          "match": "\\b(Managed(Buffer|ProtoBuffer)|NonObjectiveCBase|AnyGenerator)\\b",
-          "name": "support.class.swift"
+          "name": "support.class.swift",
+          "match": "\\b(Managed(Buffer|ProtoBuffer)|NonObjectiveCBase|AnyGenerator)\\b"
         },
         "builtin-enum-type": {
           "patterns": [
             {
-              "comment": "CommandLine is an enum, but it acts like a constant",
-              "match": "\\b(?:CommandLine|Process(?=\\.))\\b",
-              "name": "support.constant.swift"
+              "name": "support.constant.swift",
+              "match": "\\b(?:CommandLine|Process(?=\\.))\\b"
             },
             {
-              "comment": "The return type of a function that never returns",
-              "match": "\\bNever\\b",
-              "name": "support.constant.never.swift"
+              "name": "support.constant.never.swift",
+              "match": "\\bNever\\b"
             },
             {
-              "comment": "Enum types in the standard library in Swift 3",
-              "match": "\\b(?:ImplicitlyUnwrappedOptional|Representation|MemoryLayout|FloatingPointClassification|SetIndexRepresentation|SetIteratorRepresentation|FloatingPointRoundingRule|UnicodeDecodingResult|Optional|DictionaryIndexRepresentation|AncestorRepresentation|DisplayStyle|PlaygroundQuickLook|Never|FloatingPointSign|Bit|DictionaryIteratorRepresentation)\\b",
-              "name": "support.type.swift"
+              "name": "support.type.swift",
+              "match": "\\b(?:ImplicitlyUnwrappedOptional|Representation|MemoryLayout|FloatingPointClassification|SetIndexRepresentation|SetIteratorRepresentation|FloatingPointRoundingRule|UnicodeDecodingResult|Optional|DictionaryIndexRepresentation|AncestorRepresentation|DisplayStyle|PlaygroundQuickLook|Never|FloatingPointSign|Bit|DictionaryIteratorRepresentation)\\b"
             },
             {
-              "comment": "Enum types in the standard library in Swift 2 only",
-              "match": "\\b(?:MirrorDisposition|QuickLookObject)\\b",
-              "name": "support.type.swift"
+              "name": "support.type.swift",
+              "match": "\\b(?:MirrorDisposition|QuickLookObject)\\b"
             }
           ]
         },
         "builtin-protocol-type": {
           "patterns": [
             {
-              "comment": "Protocols in the standard library in Swift 3",
-              "match": "\\b(?:Ra(?:n(?:domAccess(?:Collection|Indexable)|geReplaceable(?:Collection|Indexable))|wRepresentable)|M(?:irrorPath|utable(?:Collection|Indexable))|Bi(?:naryFloatingPoint|twiseOperations|directional(?:Collection|Indexable))|S(?:tr(?:ideable|eamable)|igned(?:Number|Integer)|e(?:tAlgebra|quence))|Hashable|C(?:o(?:llection|mparable)|ustom(?:Reflectable|StringConvertible|DebugStringConvertible|PlaygroundQuickLookable|LeafReflectable)|VarArg)|TextOutputStream|I(?:n(?:teger(?:Arithmetic)?|dexable(?:Base)?)|teratorProtocol)|OptionSet|Un(?:signedInteger|icodeCodec)|E(?:quatable|rror|xpressibleBy(?:BooleanLiteral|String(?:Interpolation|Literal)|NilLiteral|IntegerLiteral|DictionaryLiteral|UnicodeScalarLiteral|ExtendedGraphemeClusterLiteral|FloatLiteral|ArrayLiteral))|FloatingPoint|L(?:osslessStringConvertible|azy(?:SequenceProtocol|CollectionProtocol))|A(?:nyObject|bsoluteValuable))\\b",
-              "name": "support.type.swift"
+              "name": "support.type.swift",
+              "match": "\\b(?:Ra(?:n(?:domAccess(?:Collection|Indexable)|geReplaceable(?:Collection|Indexable))|wRepresentable)|M(?:irrorPath|utable(?:Collection|Indexable))|Bi(?:naryFloatingPoint|twiseOperations|directional(?:Collection|Indexable))|S(?:tr(?:ideable|eamable)|igned(?:Number|Integer)|e(?:tAlgebra|quence))|Hashable|C(?:o(?:llection|mparable)|ustom(?:Reflectable|StringConvertible|DebugStringConvertible|PlaygroundQuickLookable|LeafReflectable)|VarArg)|TextOutputStream|I(?:n(?:teger(?:Arithmetic)?|dexable(?:Base)?)|teratorProtocol)|OptionSet|Un(?:signedInteger|icodeCodec)|E(?:quatable|rror|xpressibleBy(?:BooleanLiteral|String(?:Interpolation|Literal)|NilLiteral|IntegerLiteral|DictionaryLiteral|UnicodeScalarLiteral|ExtendedGraphemeClusterLiteral|FloatLiteral|ArrayLiteral))|FloatingPoint|L(?:osslessStringConvertible|azy(?:SequenceProtocol|CollectionProtocol))|A(?:nyObject|bsoluteValuable))\\b"
             },
             {
-              "comment": "Protocols in the standard library in Swift 2 only",
-              "match": "\\b(?:Ran(?:domAccessIndexType|geReplaceableCollectionType)|GeneratorType|M(?:irror(?:Type|PathType)|utable(?:Sliceable|CollectionType))|B(?:i(?:twiseOperationsType|directionalIndexType)|oolean(?:Type|LiteralConvertible))|S(?:tring(?:InterpolationConvertible|LiteralConvertible)|i(?:nkType|gned(?:NumberType|IntegerType))|e(?:tAlgebraType|quenceType)|liceable)|NilLiteralConvertible|C(?:ollectionType|VarArgType)|Inte(?:rvalType|ger(?:Type|LiteralConvertible|ArithmeticType))|O(?:utputStreamType|ptionSetType)|DictionaryLiteralConvertible|Un(?:signedIntegerType|icode(?:ScalarLiteralConvertible|CodecType))|E(?:rrorType|xten(?:sibleCollectionType|dedGraphemeClusterLiteralConvertible))|F(?:orwardIndexType|loat(?:ingPointType|LiteralConvertible))|A(?:nyCollectionType|rrayLiteralConvertible))\\b",
-              "name": "support.type.swift"
+              "name": "support.type.swift",
+              "match": "\\b(?:Ran(?:domAccessIndexType|geReplaceableCollectionType)|GeneratorType|M(?:irror(?:Type|PathType)|utable(?:Sliceable|CollectionType))|B(?:i(?:twiseOperationsType|directionalIndexType)|oolean(?:Type|LiteralConvertible))|S(?:tring(?:InterpolationConvertible|LiteralConvertible)|i(?:nkType|gned(?:NumberType|IntegerType))|e(?:tAlgebraType|quenceType)|liceable)|NilLiteralConvertible|C(?:ollectionType|VarArgType)|Inte(?:rvalType|ger(?:Type|LiteralConvertible|ArithmeticType))|O(?:utputStreamType|ptionSetType)|DictionaryLiteralConvertible|Un(?:signedIntegerType|icode(?:ScalarLiteralConvertible|CodecType))|E(?:rrorType|xten(?:sibleCollectionType|dedGraphemeClusterLiteralConvertible))|F(?:orwardIndexType|loat(?:ingPointType|LiteralConvertible))|A(?:nyCollectionType|rrayLiteralConvertible))\\b"
             }
           ]
         },
         "builtin-struct-type": {
           "patterns": [
             {
-              "comment": "Structs in the standard library in Swift 3",
-              "match": "\\b(?:R(?:e(?:peat(?:ed)?|versed(?:RandomAccess(?:Collection|Index)|Collection|Index))|an(?:domAccessSlice|ge(?:Replaceable(?:RandomAccessSlice|BidirectionalSlice|Slice)|Generator)?))|Generator(?:Sequence|OfOne)|M(?:irror|utable(?:Ran(?:domAccessSlice|geReplaceable(?:RandomAccessSlice|BidirectionalSlice|Slice))|BidirectionalSlice|Slice)|anagedBufferPointer)|B(?:idirectionalSlice|ool)|S(?:t(?:aticString|ri(?:ng|deT(?:hrough(?:Generator|Iterator)?|o(?:Generator|Iterator)?)))|et(?:I(?:ndex|terator))?|lice)|HalfOpenInterval|C(?:haracter(?:View)?|o(?:ntiguousArray|untable(?:Range|ClosedRange)|llectionOfOne)|OpaquePointer|losed(?:Range(?:I(?:ndex|terator))?|Interval)|VaListPointer)|I(?:n(?:t(?:16|8|32|64)?|d(?:ices|ex(?:ing(?:Generator|Iterator))?))|terator(?:Sequence|OverOne)?)|Zip2(?:Sequence|Iterator)|O(?:paquePointer|bjectIdentifier)|D(?:ictionary(?:I(?:ndex|terator)|Literal)?|ouble|efault(?:RandomAccessIndices|BidirectionalIndices|Indices))|U(?:n(?:safe(?:RawPointer|Mutable(?:RawPointer|BufferPointer|Pointer)|BufferPointer(?:Generator|Iterator)?|Pointer)|icodeScalar(?:View)?|foldSequence|managed)|TF(?:16(?:View)?|8(?:View)?|32)|Int(?:16|8|32|64)?)|Join(?:Generator|ed(?:Sequence|Iterator))|PermutationGenerator|E(?:numerate(?:Generator|Sequence|d(?:Sequence|Iterator))|mpty(?:Generator|Collection|Iterator))|Fl(?:oat(?:80)?|atten(?:Generator|BidirectionalCollection(?:Index)?|Sequence|Collection(?:Index)?|Iterator))|L(?:egacyChildren|azy(?:RandomAccessCollection|Map(?:RandomAccessCollection|Generator|BidirectionalCollection|Sequence|Collection|Iterator)|BidirectionalCollection|Sequence|Collection|Filter(?:Generator|BidirectionalCollection|Sequence|Collection|I(?:ndex|terator))))|A(?:ny(?:RandomAccessCollection|Generator|BidirectionalCollection|Sequence|Hashable|Collection|I(?:ndex|terator))|utoreleasingUnsafeMutablePointer|rray(?:Slice)?))\\b",
-              "name": "support.type.swift"
+              "name": "support.type.swift",
+              "match": "\\b(?:R(?:e(?:peat(?:ed)?|versed(?:RandomAccess(?:Collection|Index)|Collection|Index))|an(?:domAccessSlice|ge(?:Replaceable(?:RandomAccessSlice|BidirectionalSlice|Slice)|Generator)?))|Generator(?:Sequence|OfOne)|M(?:irror|utable(?:Ran(?:domAccessSlice|geReplaceable(?:RandomAccessSlice|BidirectionalSlice|Slice))|BidirectionalSlice|Slice)|anagedBufferPointer)|B(?:idirectionalSlice|ool)|S(?:t(?:aticString|ri(?:ng|deT(?:hrough(?:Generator|Iterator)?|o(?:Generator|Iterator)?)))|et(?:I(?:ndex|terator))?|lice)|HalfOpenInterval|C(?:haracter(?:View)?|o(?:ntiguousArray|untable(?:Range|ClosedRange)|llectionOfOne)|OpaquePointer|losed(?:Range(?:I(?:ndex|terator))?|Interval)|VaListPointer)|I(?:n(?:t(?:16|8|32|64)?|d(?:ices|ex(?:ing(?:Generator|Iterator))?))|terator(?:Sequence|OverOne)?)|Zip2(?:Sequence|Iterator)|O(?:paquePointer|bjectIdentifier)|D(?:ictionary(?:I(?:ndex|terator)|Literal)?|ouble|efault(?:RandomAccessIndices|BidirectionalIndices|Indices))|U(?:n(?:safe(?:RawPointer|Mutable(?:RawPointer|BufferPointer|Pointer)|BufferPointer(?:Generator|Iterator)?|Pointer)|icodeScalar(?:View)?|foldSequence|managed)|TF(?:16(?:View)?|8(?:View)?|32)|Int(?:16|8|32|64)?)|Join(?:Generator|ed(?:Sequence|Iterator))|PermutationGenerator|E(?:numerate(?:Generator|Sequence|d(?:Sequence|Iterator))|mpty(?:Generator|Collection|Iterator))|Fl(?:oat(?:80)?|atten(?:Generator|BidirectionalCollection(?:Index)?|Sequence|Collection(?:Index)?|Iterator))|L(?:egacyChildren|azy(?:RandomAccessCollection|Map(?:RandomAccessCollection|Generator|BidirectionalCollection|Sequence|Collection|Iterator)|BidirectionalCollection|Sequence|Collection|Filter(?:Generator|BidirectionalCollection|Sequence|Collection|I(?:ndex|terator))))|A(?:ny(?:RandomAccessCollection|Generator|BidirectionalCollection|Sequence|Hashable|Collection|I(?:ndex|terator))|utoreleasingUnsafeMutablePointer|rray(?:Slice)?))\\b"
             },
             {
-              "comment": "Structs in the standard library in Swift 2 only",
-              "match": "\\b(?:R(?:everse(?:RandomAccess(?:Collection|Index)|Collection|Index)|awByte)|Map(?:Generator|Sequence|Collection)|S(?:inkOf|etGenerator)|Zip2Generator|DictionaryGenerator|Filter(?:Generator|Sequence|Collection(?:Index)?)|LazyForwardCollection|Any(?:RandomAccessIndex|BidirectionalIndex|Forward(?:Collection|Index)))\\b",
-              "name": "support.type.swift"
+              "name": "support.type.swift",
+              "match": "\\b(?:R(?:everse(?:RandomAccess(?:Collection|Index)|Collection|Index)|awByte)|Map(?:Generator|Sequence|Collection)|S(?:inkOf|etGenerator)|Zip2Generator|DictionaryGenerator|Filter(?:Generator|Sequence|Collection(?:Index)?)|LazyForwardCollection|Any(?:RandomAccessIndex|BidirectionalIndex|Forward(?:Collection|Index)))\\b"
             }
           ]
         },
         "builtin-typealias": {
           "patterns": [
             {
-              "comment": "Typealiases in the standard library in Swift 3",
-              "match": "\\b(?:Raw(?:Significand|Exponent|Value)|B(?:ooleanLiteralType|uffer|ase)|S(?:t(?:orage|r(?:i(?:ngLiteralType|de)|eam(?:1|2)))|ubSequence)|NativeBuffer|C(?:hild(?:ren)?|Bool|S(?:hort|ignedChar)|odeUnit|Char(?:16|32)?|Int|Double|Unsigned(?:Short|Char|Int|Long(?:Long)?)|Float|WideChar|Long(?:Long)?)|I(?:n(?:t(?:Max|egerLiteralType)|d(?:ices|ex(?:Distance)?))|terator)|Distance|U(?:n(?:icodeScalar(?:Type|Index|View|LiteralType)|foldFirstSequence)|TF(?:16(?:Index|View)|8Index)|IntMax)|E(?:lement(?:s)?|x(?:tendedGraphemeCluster(?:Type|LiteralType)|ponent))|V(?:oid|alue)|Key|Float(?:32|LiteralType|64)|AnyClass)\\b",
-              "name": "support.type.swift"
+              "name": "support.type.swift",
+              "match": "\\b(?:Raw(?:Significand|Exponent|Value)|B(?:ooleanLiteralType|uffer|ase)|S(?:t(?:orage|r(?:i(?:ngLiteralType|de)|eam(?:1|2)))|ubSequence)|NativeBuffer|C(?:hild(?:ren)?|Bool|S(?:hort|ignedChar)|odeUnit|Char(?:16|32)?|Int|Double|Unsigned(?:Short|Char|Int|Long(?:Long)?)|Float|WideChar|Long(?:Long)?)|I(?:n(?:t(?:Max|egerLiteralType)|d(?:ices|ex(?:Distance)?))|terator)|Distance|U(?:n(?:icodeScalar(?:Type|Index|View|LiteralType)|foldFirstSequence)|TF(?:16(?:Index|View)|8Index)|IntMax)|E(?:lement(?:s)?|x(?:tendedGraphemeCluster(?:Type|LiteralType)|ponent))|V(?:oid|alue)|Key|Float(?:32|LiteralType|64)|AnyClass)\\b"
             },
             {
-              "comment": "Typealiases in the standard library in Swift 2 only",
-              "match": "\\b(?:Generator|PlaygroundQuickLook|UWord|Word)\\b",
-              "name": "support.type.swift"
+              "name": "support.type.swift",
+              "match": "\\b(?:Generator|PlaygroundQuickLook|UWord|Word)\\b"
             }
           ]
         }
@@ -361,138 +334,138 @@
     },
     "code-block": {
       "begin": "\\{",
+      "end": "\\}",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.scope.begin.swift"
         }
       },
-      "end": "\\}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.end.swift"
         }
-      },
-      "patterns": [
-        {
-          "include": "$self"
-        }
-      ]
+      }
     },
     "comments": {
       "patterns": [
         {
+          "name": "comment.line.number-sign.swift",
+          "match": "\\A^(#!).*$\\n?",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.swift"
             }
-          },
-          "match": "\\A^(#!).*$\\n?",
-          "name": "comment.line.number-sign.swift"
+          }
         },
         {
+          "name": "comment.block.documentation.swift",
           "begin": "/\\*\\*(?!/)",
+          "end": "\\*/",
+          "patterns": [
+            {
+              "include": "#nested"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.swift"
             }
           },
-          "end": "\\*/",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.swift"
             }
-          },
-          "name": "comment.block.documentation.swift",
+          }
+        },
+        {
+          "name": "comment.block.documentation.playground.swift",
+          "begin": "/\\*:",
+          "end": "\\*/",
           "patterns": [
             {
               "include": "#nested"
             }
-          ]
-        },
-        {
-          "begin": "/\\*:",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.swift"
             }
           },
-          "end": "\\*/",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.swift"
             }
-          },
-          "name": "comment.block.documentation.playground.swift",
+          }
+        },
+        {
+          "name": "comment.block.swift",
+          "begin": "/\\*",
+          "end": "\\*/",
           "patterns": [
             {
               "include": "#nested"
             }
-          ]
-        },
-        {
-          "begin": "/\\*",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.swift"
             }
           },
-          "end": "\\*/",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.swift"
             }
-          },
-          "name": "comment.block.swift",
-          "patterns": [
-            {
-              "include": "#nested"
-            }
-          ]
+          }
         },
         {
-          "match": "\\*/",
-          "name": "invalid.illegal.unexpected-end-of-block-comment.swift"
+          "name": "invalid.illegal.unexpected-end-of-block-comment.swift",
+          "match": "\\*/"
         },
         {
           "begin": "(^[ \\t]+)?(?=//)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.swift"
-            }
-          },
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.triple-slash.documentation.swift",
               "begin": "///",
+              "end": "^",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.swift"
                 }
-              },
-              "end": "^",
-              "name": "comment.line.triple-slash.documentation.swift"
+              }
             },
             {
+              "name": "comment.line.double-slash.documentation.swift",
               "begin": "//:",
+              "end": "^",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.swift"
                 }
-              },
-              "end": "^",
-              "name": "comment.line.double-slash.documentation.swift"
+              }
             },
             {
+              "name": "comment.line.double-slash.swift",
               "begin": "//",
+              "end": "^",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.swift"
                 }
-              },
-              "end": "^",
-              "name": "comment.line.double-slash.swift"
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.swift"
+            }
+          }
         }
       ],
       "repository": {
@@ -510,7 +483,9 @@
     "compiler-control": {
       "patterns": [
         {
+          "contentName": "comment.block.preprocessor.swift",
           "begin": "^\\s*(#)(if|elseif)\\s+(false)\\b.*?(?=$|//|/\\*)",
+          "end": "(?=^\\s*(#(elseif|else|endif)\\b))",
           "beginCaptures": {
             "0": {
               "name": "meta.preprocessor.conditional.swift"
@@ -524,32 +499,23 @@
             "3": {
               "name": "constant.language.boolean.swift"
             }
-          },
-          "contentName": "comment.block.preprocessor.swift",
-          "end": "(?=^\\s*(#(elseif|else|endif)\\b))"
+          }
         },
         {
+          "name": "meta.preprocessor.conditional.swift",
           "begin": "^\\s*(#)(if|elseif)\\s+",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.preprocessor.swift"
-            },
-            "2": {
-              "name": "keyword.control.preprocessor.conditional.swift"
-            }
-          },
           "end": "(?=\\s*(?://|/\\*))|$",
-          "name": "meta.preprocessor.conditional.swift",
           "patterns": [
             {
-              "match": "(&&|\\|\\|)",
-              "name": "keyword.operator.logical.swift"
+              "name": "keyword.operator.logical.swift",
+              "match": "(\u0026\u0026|\\|\\|)"
             },
             {
-              "match": "\\b(true|false)\\b",
-              "name": "constant.language.boolean.swift"
+              "name": "constant.language.boolean.swift",
+              "match": "\\b(true|false)\\b"
             },
             {
+              "match": "\\b(arch)\\s*(\\()\\s*(?:(arm|arm64|powerpc64|powerpc64le|i386|x86_64|s390x)|\\w+)\\s*(\\))",
               "captures": {
                 "1": {
                   "name": "keyword.other.condition.swift"
@@ -563,10 +529,10 @@
                 "4": {
                   "name": "punctuation.definition.parameters.end.swift"
                 }
-              },
-              "match": "\\b(arch)\\s*(\\()\\s*(?:(arm|arm64|powerpc64|powerpc64le|i386|x86_64|s390x)|\\w+)\\s*(\\))"
+              }
             },
             {
+              "match": "\\b(os)\\s*(\\()\\s*(?:(macOS|OSX|iOS|tvOS|watchOS|Android|Linux|FreeBSD|Windows|PS4)|\\w+)\\s*(\\))",
               "captures": {
                 "1": {
                   "name": "keyword.other.condition.swift"
@@ -580,11 +546,21 @@
                 "4": {
                   "name": "punctuation.definition.parameters.end.swift"
                 }
-              },
-              "match": "\\b(os)\\s*(\\()\\s*(?:(macOS|OSX|iOS|tvOS|watchOS|Android|Linux|FreeBSD|Windows|PS4)|\\w+)\\s*(\\))"
+              }
             },
             {
               "begin": "\\b(swift)\\s*(\\()",
+              "end": "(\\))|$",
+              "patterns": [
+                {
+                  "name": "keyword.operator.comparison.swift",
+                  "match": "\u003e="
+                },
+                {
+                  "name": "constant.numeric.swift",
+                  "match": "\\b[0-9]+(?:\\.[0-9]+)*\\b"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "keyword.other.condition.swift"
@@ -593,26 +569,25 @@
                   "name": "punctuation.definition.parameters.begin.swift"
                 }
               },
-              "end": "(\\))|$",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.parameters.end.swift"
                 }
-              },
-              "patterns": [
-                {
-                  "match": ">=",
-                  "name": "keyword.operator.comparison.swift"
-                },
-                {
-                  "match": "\\b[0-9]+(?:\\.[0-9]+)*\\b",
-                  "name": "constant.numeric.swift"
-                }
-              ]
+              }
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.preprocessor.swift"
+            },
+            "2": {
+              "name": "keyword.control.preprocessor.conditional.swift"
+            }
+          }
         },
         {
+          "name": "meta.preprocessor.conditional.swift",
+          "match": "^\\s*(#)(else|endif)(.*?)(?=$|//|/\\*)",
           "captures": {
             "1": {
               "name": "punctuation.definition.preprocessor.swift"
@@ -623,16 +598,16 @@
             "3": {
               "patterns": [
                 {
-                  "match": "\\S+",
-                  "name": "invalid.illegal.character-not-allowed-here.swift"
+                  "name": "invalid.illegal.character-not-allowed-here.swift",
+                  "match": "\\S+"
                 }
               ]
             }
-          },
-          "match": "^\\s*(#)(else|endif)(.*?)(?=$|//|/\\*)",
-          "name": "meta.preprocessor.conditional.swift"
+          }
         },
         {
+          "name": "meta.preprocessor.sourcelocation.swift",
+          "match": "^\\s*(#)(sourceLocation)((\\()([^)]*)(\\)))(.*?)(?=$|//|/\\*)",
           "captures": {
             "1": {
               "name": "punctuation.definition.preprocessor.swift"
@@ -647,6 +622,12 @@
               "patterns": [
                 {
                   "begin": "(file)\\s*(:)\\s*(?=\")",
+                  "end": "(?!\\G)",
+                  "patterns": [
+                    {
+                      "include": "#literals"
+                    }
+                  ],
                   "beginCaptures": {
                     "1": {
                       "name": "support.variable.parameter.swift"
@@ -654,15 +635,10 @@
                     "2": {
                       "name": "punctuation.separator.key-value.swift"
                     }
-                  },
-                  "end": "(?!\\G)",
-                  "patterns": [
-                    {
-                      "include": "#literals"
-                    }
-                  ]
+                  }
                 },
                 {
+                  "match": "(line)\\s*(:)\\s*([0-9]+)",
                   "captures": {
                     "1": {
                       "name": "support.variable.parameter.swift"
@@ -673,16 +649,15 @@
                     "3": {
                       "name": "constant.numeric.integer.swift"
                     }
-                  },
-                  "match": "(line)\\s*(:)\\s*([0-9]+)"
+                  }
                 },
                 {
-                  "match": ",",
-                  "name": "punctuation.separator.parameters.swift"
+                  "name": "punctuation.separator.parameters.swift",
+                  "match": ","
                 },
                 {
-                  "match": "\\S+",
-                  "name": "invalid.illegal.character-not-allowed-here.swift"
+                  "name": "invalid.illegal.character-not-allowed-here.swift",
+                  "match": "\\S+"
                 }
               ]
             },
@@ -692,14 +667,12 @@
             "7": {
               "patterns": [
                 {
-                  "match": "\\S+",
-                  "name": "invalid.illegal.character-not-allowed-here.swift"
+                  "name": "invalid.illegal.character-not-allowed-here.swift",
+                  "match": "\\S+"
                 }
               ]
             }
-          },
-          "match": "^\\s*(#)(sourceLocation)((\\()([^)]*)(\\)))(.*?)(?=$|//|/\\*)",
-          "name": "meta.preprocessor.sourcelocation.swift"
+          }
         }
       ]
     },
@@ -746,50 +719,48 @@
               "include": "#attributes"
             },
             {
-              "match": "\\b(?:throws|rethrows)\\b",
-              "name": "keyword.control.exception.swift"
+              "name": "keyword.control.exception.swift",
+              "match": "\\b(?:throws|rethrows)\\b"
             },
             {
-              "match": "\\binout\\b",
-              "name": "storage.modifier.swift"
+              "name": "storage.modifier.swift",
+              "match": "\\binout\\b"
             },
             {
-              "match": "\\bSelf\\b",
-              "name": "variable.language.swift"
+              "name": "variable.language.swift",
+              "match": "\\bSelf\\b"
             },
             {
+              "match": "(?\u003c![/=\\-+!*%\u003c\u003e\u0026|\\^~.])(-\u003e)(?![/=\\-+!*%\u003c\u003e\u0026|\\^~.])",
               "captures": {
                 "1": {
                   "name": "keyword.operator.type.function.swift"
                 }
-              },
-              "match": "(?<![/=\\-+!*%<>&|\\^~.])(->)(?![/=\\-+!*%<>&|\\^~.])"
+              }
             },
             {
+              "match": "(?\u003c![/=\\-+!*%\u003c\u003e\u0026|\\^~.])(\u0026)(?![/=\\-+!*%\u003c\u003e\u0026|\\^~.])",
               "captures": {
                 "1": {
                   "name": "keyword.operator.type.composition.swift"
                 }
-              },
-              "comment": "Swift 3: A & B",
-              "match": "(?<![/=\\-+!*%<>&|\\^~.])(&)(?![/=\\-+!*%<>&|\\^~.])"
+              }
             },
             {
-              "match": "[?!]",
-              "name": "keyword.operator.type.optional.swift"
+              "name": "keyword.operator.type.optional.swift",
+              "match": "[?!]"
             },
             {
-              "match": "\\.\\.\\.",
-              "name": "keyword.operator.function.variadic-parameter.swift"
+              "name": "keyword.operator.function.variadic-parameter.swift",
+              "match": "\\.\\.\\."
             },
             {
-              "comment": "Swift 2: protocol<A, B>",
-              "match": "\\bprotocol\\b",
-              "name": "keyword.operator.type.composition.swift"
+              "name": "keyword.operator.type.composition.swift",
+              "match": "\\bprotocol\\b"
             },
             {
-              "match": "(?<=\\.)(?:Protocol|Type)\\b",
-              "name": "keyword.operator.type.metatype.swift"
+              "name": "keyword.operator.type.metatype.swift",
+              "match": "(?\u003c=\\.)(?:Protocol|Type)\\b"
             },
             {
               "include": "#tuple-type"
@@ -804,127 +775,108 @@
           "repository": {
             "collection-type": {
               "begin": "\\[",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.collection-type.begin.swift"
-                }
-              },
-              "comment": "array and dictionary types [Value] and [Key: Value]",
-              "end": "\\]|(?=[>){}])",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.section.collection-type.end.swift"
-                }
-              },
+              "end": "\\]|(?=[\u003e){}])",
               "patterns": [
                 {
                   "include": "#available-types"
                 },
                 {
                   "begin": ":",
-                  "beginCaptures": {
-                    "0": {
-                      "name": "punctuation.separator.key-value.swift"
-                    }
-                  },
-                  "end": "(?=\\]|[>){}])",
+                  "end": "(?=\\]|[\u003e){}])",
                   "patterns": [
                     {
-                      "match": ":",
-                      "name": "invalid.illegal.extra-colon-in-dictionary-type.swift"
+                      "name": "invalid.illegal.extra-colon-in-dictionary-type.swift",
+                      "match": ":"
                     },
                     {
                       "include": "#available-types"
                     }
-                  ]
+                  ],
+                  "beginCaptures": {
+                    "0": {
+                      "name": "punctuation.separator.key-value.swift"
+                    }
+                  }
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.section.collection-type.begin.swift"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.section.collection-type.end.swift"
+                }
+              }
             },
             "tuple-type": {
               "begin": "\\(",
+              "end": "\\)|(?=[\u003e\\]{}])",
+              "patterns": [
+                {
+                  "include": "#available-types"
+                }
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.tuple-type.begin.swift"
                 }
               },
-              "end": "\\)|(?=[>\\]{}])",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.tuple-type.end.swift"
                 }
-              },
-              "patterns": [
-                {
-                  "include": "#available-types"
-                }
-              ]
+              }
             }
           }
         },
         "extension": {
-          "begin": "\\b(extension)\\s+((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.$1.swift"
-            },
-            "2": {
-              "name": "entity.name.type.swift",
-              "patterns": [
-                {
-                  "include": "#available-types"
-                }
-              ]
-            },
-            "3": {
-              "name": "punctuation.definition.identifier.swift"
-            },
-            "4": {
-              "name": "punctuation.definition.identifier.swift"
-            }
-          },
-          "end": "(?<=\\})",
           "name": "meta.definition.type.$1.swift",
+          "begin": "\\b(extension)\\s+((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e))",
+          "end": "(?\u003c=\\})",
           "patterns": [
             {
               "include": "#comments"
             },
             {
-              "comment": "SE-0143: Conditional Conformances",
               "include": "#generic-where-clause"
             },
             {
               "include": "#inheritance-clause"
             },
             {
+              "name": "meta.definition.type.body.swift",
               "begin": "\\{",
+              "end": "\\}",
+              "patterns": [
+                {
+                  "include": "$self"
+                }
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.type.begin.swift"
                 }
               },
-              "end": "\\}",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.type.end.swift"
                 }
-              },
-              "name": "meta.definition.type.body.swift",
-              "patterns": [
-                {
-                  "include": "$self"
-                }
-              ]
+              }
             }
-          ]
-        },
-        "function": {
-          "begin": "(?x)\n\t\t\t\t\t\t\\b\n\t\t\t\t\t\t(func)\n\t\t\t\t\t\t\\s+\n\t\t\t\t\t\t(\n\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  | (?:\n\t\t\t\t\t\t\t\t(\n\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[/=\\-+!*%<>&|^~?]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\\g<oph>\n\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[\\x{0300}-\\x{036F}]\n\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  | [\\x{20D0}-\\x{20FF}]\n\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  | [\\x{FE20}-\\x{FE2F}]\n\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)\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  | ( \\. ( \\g<oph> | \\g<opc> | \\. )+ )\t\t\t# Dot operators\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t)\n\t\t\t\t\t\t\\s*\n\t\t\t\t\t\t(?=\\(|<)\n\t\t\t\t\t",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "storage.type.function.swift"
+              "name": "storage.type.$1.swift"
             },
             "2": {
-              "name": "entity.name.function.swift"
+              "name": "entity.name.type.swift",
+              "patterns": [
+                {
+                  "include": "#available-types"
+                }
+              ]
             },
             "3": {
               "name": "punctuation.definition.identifier.swift"
@@ -932,9 +884,12 @@
             "4": {
               "name": "punctuation.definition.identifier.swift"
             }
-          },
-          "end": "(?<=\\})|$(?# functions in protocol declarations or generated interfaces have no body)",
+          }
+        },
+        "function": {
           "name": "meta.definition.function.swift",
+          "begin": "(?x)\n\t\t\t\t\t\t\\b\n\t\t\t\t\t\t(func)\n\t\t\t\t\t\t\\s+\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t(?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e)\n\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(?\u003coph\u003e\t\t\t\t\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t\t[/=\\-+!*%\u003c\u003e\u0026|^~?]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\\g\u003coph\u003e\n\t\t\t\t\t\t\t\t\t  | (?\u003copc\u003e\t\t\t\t\t\t\t\t# operator-character\n\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  | [\\x{1DC0}-\\x{1DFF}]\n\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  | [\\x{FE00}-\\x{FE0F}]\n\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  | [\\x{E0100}-\\x{E01EF}]\n\t\t\t\t\t\t\t\t\t\t)\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  | ( \\. ( \\g\u003coph\u003e | \\g\u003copc\u003e | \\. )+ )\t\t\t# Dot operators\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t)\n\t\t\t\t\t\t\\s*\n\t\t\t\t\t\t(?=\\(|\u003c)\n\t\t\t\t\t",
+          "end": "(?\u003c=\\})|$(?# functions in protocol declarations or generated interfaces have no body)",
           "patterns": [
             {
               "include": "#comments"
@@ -949,50 +904,52 @@
               "include": "#function-result"
             },
             {
-              "match": "\\b(?:throws|rethrows)\\b",
-              "name": "keyword.control.exception.swift"
+              "name": "keyword.control.exception.swift",
+              "match": "\\b(?:throws|rethrows)\\b"
             },
             {
-              "comment": "Swift 3: generic constraints after the parameters and return type",
               "include": "#generic-where-clause"
             },
             {
+              "name": "meta.definition.function.body.swift",
               "begin": "(\\{)",
+              "end": "(\\})",
+              "patterns": [
+                {
+                  "include": "$self"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.section.function.begin.swift"
                 }
               },
-              "end": "(\\})",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.section.function.end.swift"
                 }
-              },
-              "name": "meta.definition.function.body.swift",
-              "patterns": [
-                {
-                  "include": "$self"
-                }
-              ]
+              }
             }
-          ]
-        },
-        "function-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"
-                }
-              ]
+              "name": "storage.type.function.swift"
+            },
+            "2": {
+              "name": "entity.name.function.swift"
+            },
+            "3": {
+              "name": "punctuation.definition.identifier.swift"
+            },
+            "4": {
+              "name": "punctuation.definition.identifier.swift"
             }
-          },
-          "end": "(?<=\\})|$",
+          }
+        },
+        "function-initializer": {
           "name": "meta.definition.function.initializer.swift",
+          "begin": "(?\u003c!\\.)\\b(init[?!]*(?# only one is valid, but we want the in⇥ snippet to produce something that looks good))\\s*(?=\\(|\u003c)",
+          "end": "(?\u003c=\\})|$",
           "patterns": [
             {
               "include": "#comments"
@@ -1004,137 +961,141 @@
               "include": "#parameter-clause"
             },
             {
-              "match": "\\b(?:throws|rethrows)\\b",
-              "name": "keyword.control.exception.swift"
+              "name": "keyword.control.exception.swift",
+              "match": "\\b(?:throws|rethrows)\\b"
             },
             {
-              "comment": "Swift 3: generic constraints after the parameters and return type",
               "include": "#generic-where-clause"
             },
             {
+              "name": "meta.definition.function.body.swift",
               "begin": "(\\{)",
+              "end": "(\\})",
+              "patterns": [
+                {
+                  "include": "$self"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.section.function.begin.swift"
                 }
               },
-              "end": "(\\})",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.section.function.end.swift"
                 }
-              },
-              "name": "meta.definition.function.body.swift",
+              }
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.function.swift",
               "patterns": [
                 {
-                  "include": "$self"
+                  "name": "invalid.illegal.character-not-allowed-here.swift",
+                  "match": "(?\u003c=[?!])[?!]+"
                 }
               ]
             }
-          ]
+          }
         },
         "function-result": {
-          "begin": "(?<![/=\\-+!*%<>&|\\^~.])(->)(?![/=\\-+!*%<>&|\\^~.])\\s*",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.function-result.swift"
-            }
-          },
-          "end": "(?!\\G)(?=\\{|\\bwhere\\b|;)|$",
           "name": "meta.function-result.swift",
+          "begin": "(?\u003c![/=\\-+!*%\u003c\u003e\u0026|\\^~.])(-\u003e)(?![/=\\-+!*%\u003c\u003e\u0026|\\^~.])\\s*",
+          "end": "(?!\\G)(?=\\{|\\bwhere\\b|;)|$",
           "patterns": [
             {
               "include": "#available-types"
             }
-          ]
-        },
-        "generic-argument-clause": {
-          "begin": "<",
+          ],
           "beginCaptures": {
-            "0": {
-              "name": "punctuation.separator.generic-argument-clause.begin.swift"
-            }
-          },
-          "end": ">|(?=[)\\]{}])",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.separator.generic-argument-clause.end.swift"
+            "1": {
+              "name": "keyword.operator.function-result.swift"
             }
-          },
+          }
+        },
+        "generic-argument-clause": {
           "name": "meta.generic-argument-clause.swift",
+          "begin": "\u003c",
+          "end": "\u003e|(?=[)\\]{}])",
           "patterns": [
             {
               "include": "#available-types"
             }
-          ]
-        },
-        "generic-parameter-clause": {
-          "begin": "<",
+          ],
           "beginCaptures": {
             "0": {
-              "name": "punctuation.separator.generic-parameter-clause.begin.swift"
+              "name": "punctuation.separator.generic-argument-clause.begin.swift"
             }
           },
-          "end": ">|(?=[^\\w\\d:<>\\s,=&`])(?# characters besides these are never valid in a generic param list -- even if it's not really a valid clause, we should stop trying to parse it if we see one of them.)",
           "endCaptures": {
             "0": {
-              "name": "punctuation.separator.generic-parameter-clause.end.swift"
+              "name": "punctuation.separator.generic-argument-clause.end.swift"
             }
-          },
+          }
+        },
+        "generic-parameter-clause": {
           "name": "meta.generic-parameter-clause.swift",
+          "begin": "\u003c",
+          "end": "\u003e|(?=[^\\w\\d:\u003c\u003e\\s,=\u0026`])(?# characters besides these are never valid in a generic param list -- even if it's not really a valid clause, we should stop trying to parse it if we see one of them.)",
           "patterns": [
             {
               "include": "#comments"
             },
             {
-              "comment": "Swift 2: constraints inside the generic param list",
               "include": "#generic-where-clause"
             },
             {
+              "match": "\\b((?!\\d)\\w[\\w\\d]*)\\b",
               "captures": {
                 "1": {
                   "name": "variable.language.generic-parameter.swift"
                 }
-              },
-              "match": "\\b((?!\\d)\\w[\\w\\d]*)\\b"
+              }
             },
             {
-              "match": ",",
-              "name": "punctuation.separator.generic-parameters.swift"
+              "name": "punctuation.separator.generic-parameters.swift",
+              "match": ","
             },
             {
-              "begin": "(:)\\s*",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.separator.generic-parameter-constraint.swift"
-                }
-              },
-              "end": "(?=[,>]|(?!\\G)\\bwhere\\b)",
               "name": "meta.generic-parameter-constraint.swift",
+              "begin": "(:)\\s*",
+              "end": "(?=[,\u003e]|(?!\\G)\\bwhere\\b)",
               "patterns": [
                 {
-                  "begin": "\\G",
-                  "end": "(?=[,>]|(?!\\G)\\bwhere\\b)",
                   "name": "entity.other.inherited-class.swift",
+                  "begin": "\\G",
+                  "end": "(?=[,\u003e]|(?!\\G)\\bwhere\\b)",
                   "patterns": [
                     {
                       "include": "#type-identifier"
                     }
                   ]
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.separator.generic-parameter-constraint.swift"
+                }
+              }
             }
-          ]
-        },
-        "generic-where-clause": {
-          "begin": "\\b(where)\\b\\s*",
+          ],
           "beginCaptures": {
-            "1": {
-              "name": "keyword.other.generic-constraint-introducer.swift"
+            "0": {
+              "name": "punctuation.separator.generic-parameter-clause.begin.swift"
             }
           },
-          "end": "(?!\\G)$|(?=[>{};\\n]|//|/\\*)",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.separator.generic-parameter-clause.end.swift"
+            }
+          }
+        },
+        "generic-where-clause": {
           "name": "meta.generic-where-clause.swift",
+          "begin": "\\b(where)\\b\\s*",
+          "end": "(?!\\G)$|(?=[\u003e{};\\n]|//|/\\*)",
           "patterns": [
             {
               "include": "#comments"
@@ -1143,10 +1104,15 @@
               "include": "#requirement-list"
             }
           ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.generic-constraint-introducer.swift"
+            }
+          },
           "repository": {
             "requirement-list": {
               "begin": "\\G|,\\s*",
-              "end": "(?=[,>{};\\n]|//|/\\*)",
+              "end": "(?=[,\u003e{};\\n]|//|/\\*)",
               "patterns": [
                 {
                   "include": "#comments"
@@ -1158,71 +1124,58 @@
                   "include": "#available-types"
                 },
                 {
-                  "begin": "(?<![/=\\-+!*%<>&|\\^~.])(==)(?![/=\\-+!*%<>&|\\^~.])",
-                  "beginCaptures": {
-                    "1": {
-                      "name": "keyword.operator.generic-constraint.same-type.swift"
-                    }
-                  },
-                  "end": "(?=\\s*[,>{};\\n]|//|/\\*)",
                   "name": "meta.generic-where-clause.same-type-requirement.swift",
+                  "begin": "(?\u003c![/=\\-+!*%\u003c\u003e\u0026|\\^~.])(==)(?![/=\\-+!*%\u003c\u003e\u0026|\\^~.])",
+                  "end": "(?=\\s*[,\u003e{};\\n]|//|/\\*)",
                   "patterns": [
                     {
                       "include": "#available-types"
                     }
-                  ]
-                },
-                {
-                  "begin": "(?<![/=\\-+!*%<>&|\\^~.])(:)(?![/=\\-+!*%<>&|\\^~.])",
+                  ],
                   "beginCaptures": {
                     "1": {
-                      "name": "keyword.operator.generic-constraint.conforms-to.swift"
+                      "name": "keyword.operator.generic-constraint.same-type.swift"
                     }
-                  },
-                  "end": "(?=\\s*[,>{};\\n]|//|/\\*)",
-                  "name": "meta.generic-where-clause.conformance-requirement.swift",
+                  }
+                },
+                {
+                  "name": "meta.generic-where-clause.conformance-requirement.swift",
+                  "begin": "(?\u003c![/=\\-+!*%\u003c\u003e\u0026|\\^~.])(:)(?![/=\\-+!*%\u003c\u003e\u0026|\\^~.])",
+                  "end": "(?=\\s*[,\u003e{};\\n]|//|/\\*)",
                   "patterns": [
                     {
-                      "begin": "\\G\\s*",
                       "contentName": "entity.other.inherited-class.swift",
-                      "end": "(?=\\s*[,>{};\\n]|//|/\\*)",
+                      "begin": "\\G\\s*",
+                      "end": "(?=\\s*[,\u003e{};\\n]|//|/\\*)",
                       "patterns": [
                         {
                           "include": "#available-types"
                         }
                       ]
                     }
-                  ]
+                  ],
+                  "beginCaptures": {
+                    "1": {
+                      "name": "keyword.operator.generic-constraint.conforms-to.swift"
+                    }
+                  }
                 }
               ]
             }
           }
         },
         "import": {
-          "begin": "(?<!\\.)\\b(import)\\s+",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.import.swift"
-            }
-          },
-          "end": "(;)|$\\n?|(?=//|/\\*)",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.terminator.statement.swift"
-            }
-          },
           "name": "meta.import.swift",
+          "begin": "(?\u003c!\\.)\\b(import)\\s+",
+          "end": "(;)|$\\n?|(?=//|/\\*)",
           "patterns": [
             {
               "begin": "\\G(?!;|$|//|/\\*)(?:(typealias|struct|class|enum|protocol|var|func)\\s+)?",
-              "beginCaptures": {
-                "1": {
-                  "name": "storage.modifier.swift"
-                }
-              },
               "end": "(?=;|$|//|/\\*)",
               "patterns": [
                 {
+                  "name": "entity.name.type.swift",
+                  "match": "(?x)\n\t\t\t\t\t\t\t\t\t\t(?\u003c=\\G|\\.)\n\t\t\t\t\t\t\t\t\t\t(?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e)\n\t\t\t\t\t\t\t\t\t",
                   "captures": {
                     "1": {
                       "name": "punctuation.definition.identifier.swift"
@@ -1230,61 +1183,61 @@
                     "2": {
                       "name": "punctuation.definition.identifier.swift"
                     }
-                  },
-                  "match": "(?x)\n\t\t\t\t\t\t\t\t\t\t(?<=\\G|\\.)\n\t\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\t",
-                  "name": "entity.name.type.swift"
+                  }
                 },
                 {
-                  "match": "(?x)\n\t\t\t\t\t\t\t\t\t\t(?<=\\G|\\.)\n\t\t\t\t\t\t\t\t\t\t\\$[0-9]+\n\t\t\t\t\t\t\t\t\t",
-                  "name": "entity.name.type.swift"
+                  "name": "entity.name.type.swift",
+                  "match": "(?x)\n\t\t\t\t\t\t\t\t\t\t(?\u003c=\\G|\\.)\n\t\t\t\t\t\t\t\t\t\t\\$[0-9]+\n\t\t\t\t\t\t\t\t\t"
                 },
                 {
+                  "name": "entity.name.type.swift",
+                  "match": "(?x)\n\t\t\t\t\t\t\t\t\t\t(?\u003c=\\G|\\.)\n\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(?\u003coph\u003e\t\t\t\t\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t\t\t\t\t[/=\\-+!*%\u003c\u003e\u0026|^~?]\n\t\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\t  | [\\x{00A9}\\x{00AB}]\n\t\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\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\t  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\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\t  | [\\x{2041}-\\x{2053}]\n\t\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\t  | [\\x{2190}-\\x{23FF}]\n\t\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\t  | [\\x{2794}-\\x{2BFF}]\n\t\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\t  | [\\x{3001}-\\x{3003}]\n\t\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\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\t\t\\g\u003coph\u003e\n\t\t\t\t\t\t\t\t\t\t\t\t  | (?\u003copc\u003e\t\t\t\t\t\t\t\t# operator-character\n\t\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\t  | [\\x{1DC0}-\\x{1DFF}]\n\t\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\t  | [\\x{FE00}-\\x{FE0F}]\n\t\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\t  | [\\x{E0100}-\\x{E01EF}]\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  | ( \\. ( \\g\u003coph\u003e | \\g\u003copc\u003e | \\. )+ )\t\t\t# Dot operators\n\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t(?=\\.|;|$|//|/\\*|\\s)\n\t\t\t\t\t\t\t\t\t",
                   "captures": {
                     "1": {
                       "patterns": [
                         {
-                          "match": "\\.",
-                          "name": "invalid.illegal.dot-not-allowed-here.swift"
+                          "name": "invalid.illegal.dot-not-allowed-here.swift",
+                          "match": "\\."
                         }
                       ]
                     }
-                  },
-                  "match": "(?x)\n\t\t\t\t\t\t\t\t\t\t(?<=\\G|\\.)\n\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(?<oph>\t\t\t\t\t\t\t\t# operator-head\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  | [\\x{00A1}-\\x{00A7}]\n\t\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\t  | [\\x{00AC}\\x{00AE}]\n\t\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\t  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\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\t  | [\\x{2041}-\\x{2053}]\n\t\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\t  | [\\x{2190}-\\x{23FF}]\n\t\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\t  | [\\x{2794}-\\x{2BFF}]\n\t\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\t  | [\\x{3001}-\\x{3003}]\n\t\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\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\t\t\\g<oph>\n\t\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\t[\\x{0300}-\\x{036F}]\n\t\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\t  | [\\x{20D0}-\\x{20FF}]\n\t\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\t  | [\\x{FE20}-\\x{FE2F}]\n\t\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\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  | ( \\. ( \\g<oph> | \\g<opc> | \\. )+ )\t\t\t# Dot operators\n\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t(?=\\.|;|$|//|/\\*|\\s)\n\t\t\t\t\t\t\t\t\t",
-                  "name": "entity.name.type.swift"
+                  }
                 },
                 {
-                  "match": "\\.",
-                  "name": "punctuation.separator.import.swift"
+                  "name": "punctuation.separator.import.swift",
+                  "match": "\\."
                 },
                 {
+                  "name": "invalid.illegal.character-not-allowed-here.swift",
                   "begin": "(?!\\s*(;|$|//|/\\*))",
-                  "end": "(?=\\s*(;|$|//|/\\*))",
-                  "name": "invalid.illegal.character-not-allowed-here.swift"
+                  "end": "(?=\\s*(;|$|//|/\\*))"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "storage.modifier.swift"
+                }
+              }
             }
-          ]
-        },
-        "inheritance-clause": {
-          "begin": "(:)(?=\\s*\\{)|(:)\\s*",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "invalid.illegal.empty-inheritance-clause.swift"
-            },
-            "2": {
-              "name": "punctuation.separator.inheritance-clause.swift"
+              "name": "keyword.control.import.swift"
             }
           },
-          "end": "(?!\\G)$|(?=[={}]|(?!\\G)\\bwhere\\b)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.terminator.statement.swift"
+            }
+          }
+        },
+        "inheritance-clause": {
           "name": "meta.inheritance-clause.swift",
+          "begin": "(:)(?=\\s*\\{)|(:)\\s*",
+          "end": "(?!\\G)$|(?=[={}]|(?!\\G)\\bwhere\\b)",
           "patterns": [
             {
               "begin": "\\bclass\\b",
-              "beginCaptures": {
-                "0": {
-                  "name": "storage.type.class.swift"
-                }
-              },
               "end": "(?=[={}]|(?!\\G)\\bwhere\\b)",
               "patterns": [
                 {
@@ -1293,7 +1246,12 @@
                 {
                   "include": "#more-types"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "storage.type.class.swift"
+                }
+              }
             },
             {
               "begin": "\\G",
@@ -1311,11 +1269,19 @@
               ]
             }
           ],
+          "beginCaptures": {
+            "1": {
+              "name": "invalid.illegal.empty-inheritance-clause.swift"
+            },
+            "2": {
+              "name": "punctuation.separator.inheritance-clause.swift"
+            }
+          },
           "repository": {
             "inherited-type": {
+              "name": "entity.other.inherited-class.swift",
               "begin": "(?=[`\\p{L}_])",
               "end": "(?!\\G)",
-              "name": "entity.other.inherited-class.swift",
               "patterns": [
                 {
                   "include": "#type-identifier"
@@ -1323,9 +1289,9 @@
               ]
             },
             "more-types": {
+              "name": "meta.inheritance-list.more-types",
               "begin": ",\\s*",
               "end": "(?!\\G)(?!//|/\\*)|(?=[,={}]|(?!\\G)\\bwhere\\b)",
-              "name": "meta.inheritance-list.more-types",
               "patterns": [
                 {
                   "include": "#comments"
@@ -1341,7 +1307,21 @@
           }
         },
         "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",
+          "name": "meta.definition.operator.swift",
+          "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(?\u003coph\u003e\t\t\t\t\t\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t[/=\\-+!*%\u003c\u003e\u0026|^~?]\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\u003coph\u003e\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  | (?\u003copc\u003e\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\u003coph\u003e | \\g\u003copc\u003e | \\. )++ )\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",
+          "end": "(;)|$\\n?|(?=//|/\\*)",
+          "patterns": [
+            {
+              "include": "#swift2"
+            },
+            {
+              "include": "#swift3"
+            },
+            {
+              "name": "invalid.illegal.character-not-allowed-here.swift",
+              "match": "((?!$|;|//|/\\*)\\S)+"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.modifier.swift"
@@ -1355,50 +1335,27 @@
             "4": {
               "patterns": [
                 {
-                  "match": "\\.",
-                  "name": "invalid.illegal.dot-not-allowed-here.swift"
+                  "name": "invalid.illegal.dot-not-allowed-here.swift",
+                  "match": "\\."
                 }
               ]
             }
           },
-          "end": "(;)|$\\n?|(?=//|/\\*)",
           "endCaptures": {
             "1": {
               "name": "punctuation.terminator.statement.swift"
             }
           },
-          "name": "meta.definition.operator.swift",
-          "patterns": [
-            {
-              "include": "#swift2"
-            },
-            {
-              "include": "#swift3"
-            },
-            {
-              "match": "((?!$|;|//|/\\*)\\S)+",
-              "name": "invalid.illegal.character-not-allowed-here.swift"
-            }
-          ],
           "repository": {
             "swift2": {
               "begin": "\\G(\\{)",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.operator.begin.swift"
-                }
-              },
               "end": "(\\})",
-              "endCaptures": {
-                "1": {
-                  "name": "punctuation.definition.operator.end.swift"
-                }
-              },
               "patterns": [
                 {
                   "include": "#comments"
                 },
                 {
+                  "match": "\\b(associativity)\\s+(left|right)\\b",
                   "captures": {
                     "1": {
                       "name": "storage.modifier.swift"
@@ -1406,10 +1363,10 @@
                     "2": {
                       "name": "keyword.other.operator.associativity.swift"
                     }
-                  },
-                  "match": "\\b(associativity)\\s+(left|right)\\b"
+                  }
                 },
                 {
+                  "match": "\\b(precedence)\\s+([0-9]+)\\b",
                   "captures": {
                     "1": {
                       "name": "storage.modifier.swift"
@@ -1417,20 +1374,30 @@
                     "2": {
                       "name": "constant.numeric.integer.swift"
                     }
-                  },
-                  "match": "\\b(precedence)\\s+([0-9]+)\\b"
+                  }
                 },
                 {
+                  "match": "\\b(assignment)\\b",
                   "captures": {
                     "1": {
                       "name": "storage.modifier.swift"
                     }
-                  },
-                  "match": "\\b(assignment)\\b"
+                  }
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.operator.begin.swift"
+                }
+              },
+              "endCaptures": {
+                "1": {
+                  "name": "punctuation.definition.operator.end.swift"
+                }
+              }
             },
             "swift3": {
+              "match": "\\G(:)\\s*((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e))",
               "captures": {
                 "2": {
                   "name": "entity.other.inherited-class.swift",
@@ -1446,34 +1413,34 @@
                 "4": {
                   "name": "punctuation.definition.identifier.swift"
                 }
-              },
-              "match": "\\G(:)\\s*((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))"
+              }
             }
           }
         },
         "parameter-clause": {
+          "name": "meta.parameter-clause.swift",
           "begin": "(\\()",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "include": "#parameter-list"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.parameters.begin.swift"
             }
           },
-          "end": "(\\))",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.parameters.end.swift"
             }
-          },
-          "name": "meta.parameter-clause.swift",
-          "patterns": [
-            {
-              "include": "#parameter-list"
-            }
-          ]
+          }
         },
         "parameter-list": {
           "patterns": [
             {
+              "match": "((?\u003cq1\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq1\u003e))\\s+((?\u003cq2\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq2\u003e))(?=\\s*:)",
               "captures": {
                 "1": {
                   "name": "entity.name.function.swift"
@@ -1493,11 +1460,10 @@
                 "6": {
                   "name": "punctuation.definition.identifier.swift"
                 }
-              },
-              "comment": "External parameter labels are considered part of the function name",
-              "match": "((?<q1>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q1>))\\s+((?<q2>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q2>))(?=\\s*:)"
+              }
             },
             {
+              "match": "(((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e)))(?=\\s*:)",
               "captures": {
                 "1": {
                   "name": "variable.parameter.function.swift"
@@ -1511,9 +1477,7 @@
                 "4": {
                   "name": "punctuation.definition.identifier.swift"
                 }
-              },
-              "comment": "If no external label is given, the name is both the external label and the internal variable name",
-              "match": "(((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>)))(?=\\s*:)"
+              }
             },
             {
               "begin": ":\\s*(?!\\s)",
@@ -1523,65 +1487,41 @@
                   "include": "#available-types"
                 },
                 {
-                  "match": ":",
-                  "name": "invalid.illegal.extra-colon-in-parameter-list.swift"
+                  "name": "invalid.illegal.extra-colon-in-parameter-list.swift",
+                  "match": ":"
                 },
                 {
                   "begin": "=",
-                  "beginCaptures": {
-                    "0": {
-                      "name": "keyword.operator.assignment.swift"
-                    }
-                  },
-                  "comment": "a parameter's default value",
                   "end": "(?=[,)])",
                   "patterns": [
                     {
                       "include": "#expressions"
                     }
-                  ]
+                  ],
+                  "beginCaptures": {
+                    "0": {
+                      "name": "keyword.operator.assignment.swift"
+                    }
+                  }
                 }
               ]
             }
           ]
         },
         "precedencegroup": {
-          "begin": "\\b(precedencegroup)\\s+((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))\\s*(?=\\{)",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.precedencegroup.swift"
-            },
-            "2": {
-              "name": "entity.name.type.precedencegroup.swift"
-            },
-            "3": {
-              "name": "punctuation.definition.identifier.swift"
-            },
-            "4": {
-              "name": "punctuation.definition.identifier.swift"
-            }
-          },
-          "end": "(?!\\G)",
           "name": "meta.definition.precedencegroup.swift",
+          "begin": "\\b(precedencegroup)\\s+((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e))\\s*(?=\\{)",
+          "end": "(?!\\G)",
           "patterns": [
             {
               "begin": "\\{",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.precedencegroup.begin.swift"
-                }
-              },
               "end": "\\}",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.precedencegroup.end.swift"
-                }
-              },
               "patterns": [
                 {
                   "include": "#comments"
                 },
                 {
+                  "match": "\\b(higherThan|lowerThan)\\s*:\\s*((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e))",
                   "captures": {
                     "1": {
                       "name": "storage.modifier.swift"
@@ -1600,10 +1540,10 @@
                     "4": {
                       "name": "punctuation.definition.identifier.swift"
                     }
-                  },
-                  "match": "\\b(higherThan|lowerThan)\\s*:\\s*((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))"
+                  }
                 },
                 {
+                  "match": "\\b(associativity)\\b(?:\\s*:\\s*(right|left|none)\\b)?",
                   "captures": {
                     "1": {
                       "name": "storage.modifier.swift"
@@ -1611,10 +1551,10 @@
                     "2": {
                       "name": "keyword.other.operator.associativity.swift"
                     }
-                  },
-                  "match": "\\b(associativity)\\b(?:\\s*:\\s*(right|left|none)\\b)?"
+                  }
                 },
                 {
+                  "match": "\\b(assignment)\\b(?:\\s*:\\s*(true|false)\\b)?",
                   "captures": {
                     "1": {
                       "name": "storage.modifier.swift"
@@ -1622,21 +1562,27 @@
                     "2": {
                       "name": "constant.language.boolean.swift"
                     }
-                  },
-                  "match": "\\b(assignment)\\b(?:\\s*:\\s*(true|false)\\b)?"
+                  }
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.precedencegroup.begin.swift"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.precedencegroup.end.swift"
+                }
+              }
             }
-          ]
-        },
-        "protocol": {
-          "begin": "\\b(protocol)\\s+((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "storage.type.$1.swift"
+              "name": "storage.type.precedencegroup.swift"
             },
             "2": {
-              "name": "entity.name.type.$1.swift"
+              "name": "entity.name.type.precedencegroup.swift"
             },
             "3": {
               "name": "punctuation.definition.identifier.swift"
@@ -1644,9 +1590,12 @@
             "4": {
               "name": "punctuation.definition.identifier.swift"
             }
-          },
-          "end": "(?<=\\})",
+          }
+        },
+        "protocol": {
           "name": "meta.definition.type.protocol.swift",
+          "begin": "\\b(protocol)\\s+((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e))",
+          "end": "(?\u003c=\\})",
           "patterns": [
             {
               "include": "#comments"
@@ -1655,23 +1604,12 @@
               "include": "#inheritance-clause"
             },
             {
-              "comment": "SE-0142: Permit where clauses to constrain associated types",
               "include": "#generic-where-clause"
             },
             {
+              "name": "meta.definition.type.body.swift",
               "begin": "\\{",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.type.begin.swift"
-                }
-              },
               "end": "\\}",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.type.end.swift"
-                }
-              },
-              "name": "meta.definition.type.body.swift",
               "patterns": [
                 {
                   "include": "#protocol-method"
@@ -1685,12 +1623,49 @@
                 {
                   "include": "$self"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.type.begin.swift"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.type.end.swift"
+                }
+              }
             }
           ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.$1.swift"
+            },
+            "2": {
+              "name": "entity.name.type.$1.swift"
+            },
+            "3": {
+              "name": "punctuation.definition.identifier.swift"
+            },
+            "4": {
+              "name": "punctuation.definition.identifier.swift"
+            }
+          },
           "repository": {
             "associated-type": {
-              "begin": "\\b(associatedtype)\\s+((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))\\s*",
+              "name": "meta.definition.associatedtype.swift",
+              "begin": "\\b(associatedtype)\\s+((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e))\\s*",
+              "end": "(?!\\G)$|(?=[;}]|$)",
+              "patterns": [
+                {
+                  "include": "#inheritance-clause"
+                },
+                {
+                  "include": "#generic-where-clause"
+                },
+                {
+                  "include": "#typealias-assignment"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "keyword.other.declaration-specifier.swift"
@@ -1704,37 +1679,12 @@
                 "4": {
                   "name": "punctuation.definition.identifier.swift"
                 }
-              },
-              "end": "(?!\\G)$|(?=[;}]|$)",
-              "name": "meta.definition.associatedtype.swift",
-              "patterns": [
-                {
-                  "include": "#inheritance-clause"
-                },
-                {
-                  "comment": "SE-0142: Permit where clauses to constrain associated types",
-                  "include": "#generic-where-clause"
-                },
-                {
-                  "include": "#typealias-assignment"
-                }
-              ]
+              }
             },
             "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",
+              "begin": "(?\u003c!\\.)\\b(init[?!]*(?# only one is valid, but we want the in⇥ snippet to produce something that looks good))\\s*(?=\\(|\u003c)",
+              "end": "$|(?=;|//|/\\*|\\})",
               "patterns": [
                 {
                   "include": "#comments"
@@ -1746,53 +1696,49 @@
                   "include": "#parameter-clause"
                 },
                 {
-                  "match": "\\b(?:throws|rethrows)\\b",
-                  "name": "keyword.control.exception.swift"
+                  "name": "keyword.control.exception.swift",
+                  "match": "\\b(?:throws|rethrows)\\b"
                 },
                 {
-                  "comment": "Swift 3: generic constraints after the parameters and return type",
                   "include": "#generic-where-clause"
                 },
                 {
+                  "name": "invalid.illegal.function-body-not-allowed-in-protocol.swift",
                   "begin": "\\{",
+                  "end": "\\}",
+                  "patterns": [
+                    {
+                      "include": "$self"
+                    }
+                  ],
                   "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",
+                  }
+                }
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "storage.type.function.swift",
                   "patterns": [
                     {
-                      "include": "$self"
+                      "name": "invalid.illegal.character-not-allowed-here.swift",
+                      "match": "(?\u003c=[?!])[?!]+"
                     }
                   ]
                 }
-              ]
+              }
             },
             "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": {
-                "1": {
-                  "name": "storage.type.function.swift"
-                },
-                "2": {
-                  "name": "entity.name.function.swift"
-                },
-                "3": {
-                  "name": "punctuation.definition.identifier.swift"
-                },
-                "4": {
-                  "name": "punctuation.definition.identifier.swift"
-                }
-              },
-              "end": "$|(?=;|//|/\\*|\\})",
               "name": "meta.definition.function.swift",
+              "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(?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e)\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(?\u003coph\u003e\t\t\t\t\t\t\t\t# operator-head\n\t\t  \t\t\t\t\t\t\t\t\t\t[/=\\-+!*%\u003c\u003e\u0026|^~?]\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\u003coph\u003e\n\t\t  \t\t\t\t\t\t\t\t\t  | (?\u003copc\u003e\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\u003coph\u003e | \\g\u003copc\u003e | \\. )+ )\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(?=\\(|\u003c)\n\t\t\t\t\t\t\t",
+              "end": "$|(?=;|//|/\\*|\\})",
               "patterns": [
                 {
                   "include": "#comments"
@@ -1807,47 +1753,39 @@
                   "include": "#function-result"
                 },
                 {
-                  "match": "\\b(?:throws|rethrows)\\b",
-                  "name": "keyword.control.exception.swift"
+                  "name": "keyword.control.exception.swift",
+                  "match": "\\b(?:throws|rethrows)\\b"
                 },
                 {
-                  "comment": "Swift 3: generic constraints after the parameters and return type",
                   "include": "#generic-where-clause"
                 },
                 {
+                  "name": "invalid.illegal.function-body-not-allowed-in-protocol.swift",
                   "begin": "\\{",
+                  "end": "\\}",
+                  "patterns": [
+                    {
+                      "include": "$self"
+                    }
+                  ],
                   "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"
-                    }
-                  ]
+                  }
                 }
-              ]
-            }
-          }
-        },
-        "type": {
-          "patterns": [
-            {
-              "begin": "\\b(class(?!\\s+(?:func|var|let)\\b)|struct)\\s+((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))",
+              ],
               "beginCaptures": {
                 "1": {
-                  "name": "storage.type.$1.swift"
+                  "name": "storage.type.function.swift"
                 },
                 "2": {
-                  "name": "entity.name.type.$1.swift"
+                  "name": "entity.name.function.swift"
                 },
                 "3": {
                   "name": "punctuation.definition.identifier.swift"
@@ -1855,9 +1793,16 @@
                 "4": {
                   "name": "punctuation.definition.identifier.swift"
                 }
-              },
-              "end": "(?<=\\})",
+              }
+            }
+          }
+        },
+        "type": {
+          "patterns": [
+            {
               "name": "meta.definition.type.$1.swift",
+              "begin": "\\b(class(?!\\s+(?:func|var|let)\\b)|struct)\\s+((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e))",
+              "end": "(?\u003c=\\})",
               "patterns": [
                 {
                   "include": "#comments"
@@ -1866,33 +1811,46 @@
                   "include": "#generic-parameter-clause"
                 },
                 {
-                  "comment": "Swift 3: generic constraints after the generic param list",
                   "include": "#generic-where-clause"
                 },
                 {
                   "include": "#inheritance-clause"
                 },
                 {
+                  "name": "meta.definition.type.body.swift",
                   "begin": "\\{",
+                  "end": "\\}",
+                  "patterns": [
+                    {
+                      "include": "$self"
+                    }
+                  ],
                   "beginCaptures": {
                     "0": {
                       "name": "punctuation.definition.type.begin.swift"
                     }
                   },
-                  "end": "\\}",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.definition.type.end.swift"
                     }
-                  },
-                  "name": "meta.definition.type.body.swift",
-                  "patterns": [
-                    {
-                      "include": "$self"
-                    }
-                  ]
+                  }
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "storage.type.$1.swift"
+                },
+                "2": {
+                  "name": "entity.name.type.$1.swift"
+                },
+                "3": {
+                  "name": "punctuation.definition.identifier.swift"
+                },
+                "4": {
+                  "name": "punctuation.definition.identifier.swift"
+                }
+              }
             },
             {
               "include": "#type-enum"
@@ -1900,23 +1858,9 @@
           ]
         },
         "type-enum": {
-          "begin": "\\b(enum)\\s+((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.$1.swift"
-            },
-            "2": {
-              "name": "entity.name.type.$1.swift"
-            },
-            "3": {
-              "name": "punctuation.definition.identifier.swift"
-            },
-            "4": {
-              "name": "punctuation.definition.identifier.swift"
-            }
-          },
-          "end": "(?<=\\})",
           "name": "meta.definition.type.$1.swift",
+          "begin": "\\b(enum)\\s+((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e))",
+          "end": "(?\u003c=\\})",
           "patterns": [
             {
               "include": "#comments"
@@ -1925,26 +1869,15 @@
               "include": "#generic-parameter-clause"
             },
             {
-              "comment": "Swift 3: generic constraints after the generic param list",
               "include": "#generic-where-clause"
             },
             {
               "include": "#inheritance-clause"
             },
             {
+              "name": "meta.definition.type.body.swift",
               "begin": "\\{",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.type.begin.swift"
-                }
-              },
               "end": "\\}",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.type.end.swift"
-                }
-              },
-              "name": "meta.definition.type.body.swift",
               "patterns": [
                 {
                   "include": "#enum-case-clause"
@@ -1952,28 +1885,44 @@
                 {
                   "include": "$self"
                 }
-              ]
-            }
-          ],
-          "repository": {
-            "associated-values": {
-              "begin": "\\G\\(",
+              ],
               "beginCaptures": {
                 "0": {
-                  "name": "punctuation.definition.parameters.begin.swift"
+                  "name": "punctuation.definition.type.begin.swift"
                 }
               },
-              "end": "\\)",
               "endCaptures": {
                 "0": {
-                  "name": "punctuation.definition.parameters.end.swift"
+                  "name": "punctuation.definition.type.end.swift"
                 }
-              },
+              }
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.$1.swift"
+            },
+            "2": {
+              "name": "entity.name.type.$1.swift"
+            },
+            "3": {
+              "name": "punctuation.definition.identifier.swift"
+            },
+            "4": {
+              "name": "punctuation.definition.identifier.swift"
+            }
+          },
+          "repository": {
+            "associated-values": {
+              "begin": "\\G\\(",
+              "end": "\\)",
               "patterns": [
                 {
                   "include": "#comments"
                 },
                 {
+                  "match": "(?x)\n\t\t\t\t\t\t\t\t\t\t((?\u003cq1\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*\\k\u003cq1\u003e)\n\t\t\t\t\t\t\t\t\t\t\\s+\n\t\t\t\t\t\t\t\t\t\t(((?\u003cq2\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*\\k\u003cq2\u003e))\n\t\t\t\t\t\t\t\t\t\t\\s*(:)",
+                  "end": "(?=[,)\\]])",
                   "captures": {
                     "1": {
                       "name": "invalid.illegal.distinct-labels-not-allowed.swift"
@@ -1987,12 +1936,16 @@
                     "6": {
                       "name": "punctuation.separator.argument-label.swift"
                     }
-                  },
-                  "end": "(?=[,)\\]])",
-                  "match": "(?x)\n\t\t\t\t\t\t\t\t\t\t((?<q1>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*\\k<q1>)\n\t\t\t\t\t\t\t\t\t\t\\s+\n\t\t\t\t\t\t\t\t\t\t(((?<q2>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*\\k<q2>))\n\t\t\t\t\t\t\t\t\t\t\\s*(:)"
+                  }
                 },
                 {
-                  "begin": "(((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*\\k<q>))\\s*(:)",
+                  "begin": "(((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*\\k\u003cq\u003e))\\s*(:)",
+                  "end": "(?=[,)\\]])",
+                  "patterns": [
+                    {
+                      "include": "#available-types"
+                    }
+                  ],
                   "beginCaptures": {
                     "1": {
                       "name": "entity.name.function.swift"
@@ -2003,38 +1956,36 @@
                     "4": {
                       "name": "punctuation.separator.argument-label.swift"
                     }
-                  },
-                  "end": "(?=[,)\\]])",
-                  "patterns": [
-                    {
-                      "include": "#available-types"
-                    }
-                  ]
+                  }
                 },
                 {
                   "begin": "(?![,)\\]])(?=\\S)",
-                  "comment": "an element without a label (i.e. anything else)",
                   "end": "(?=[,)\\]])",
                   "patterns": [
                     {
                       "include": "#available-types"
                     },
                     {
-                      "match": ":",
-                      "name": "invalid.illegal.extra-colon-in-parameter-list.swift"
+                      "name": "invalid.illegal.extra-colon-in-parameter-list.swift",
+                      "match": ":"
                     }
                   ]
                 }
-              ]
-            },
-            "enum-case": {
-              "begin": "(?x)((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))\\s*",
+              ],
               "beginCaptures": {
-                "1": {
-                  "name": "constant.other.swift"
+                "0": {
+                  "name": "punctuation.definition.parameters.begin.swift"
                 }
               },
-              "end": "(?<=\\))|(?![=(])",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.parameters.end.swift"
+                }
+              }
+            },
+            "enum-case": {
+              "begin": "(?x)((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e))\\s*",
+              "end": "(?\u003c=\\))|(?![=(])",
               "patterns": [
                 {
                   "include": "#comments"
@@ -2045,15 +1996,15 @@
                 {
                   "include": "#raw-value-assignment"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "constant.other.swift"
+                }
+              }
             },
             "enum-case-clause": {
               "begin": "\\b(case)\\b\\s*",
-              "beginCaptures": {
-                "1": {
-                  "name": "storage.type.enum.case.swift"
-                }
-              },
               "end": "(?=[;}])|(?!\\G)(?!//|/\\*)(?=[^\\s,])",
               "patterns": [
                 {
@@ -2065,12 +2016,17 @@
                 {
                   "include": "#more-cases"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "storage.type.enum.case.swift"
+                }
+              }
             },
             "more-cases": {
+              "name": "meta.enum-case.more-cases",
               "begin": ",\\s*",
               "end": "(?!\\G)(?!//|/\\*)(?=[;}]|[^\\s,])",
-              "name": "meta.enum-case.more-cases",
               "patterns": [
                 {
                   "include": "#comments"
@@ -2085,11 +2041,6 @@
             },
             "raw-value-assignment": {
               "begin": "(=)\\s*",
-              "beginCaptures": {
-                "1": {
-                  "name": "keyword.operator.assignment.swift"
-                }
-              },
               "end": "(?!\\G)",
               "patterns": [
                 {
@@ -2098,12 +2049,29 @@
                 {
                   "include": "#literals"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "keyword.operator.assignment.swift"
+                }
+              }
             }
           }
         },
         "type-identifier": {
-          "begin": "((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))\\s*",
+          "begin": "((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e))\\s*",
+          "end": "(?!\u003c)",
+          "patterns": [
+            {
+              "begin": "(?=\u003c)",
+              "end": "(?!\\G)",
+              "patterns": [
+                {
+                  "include": "#generic-argument-clause"
+                }
+              ]
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "meta.type-name.swift",
@@ -2119,22 +2087,26 @@
             "3": {
               "name": "punctuation.definition.identifier.swift"
             }
-          },
-          "end": "(?!<)",
+          }
+        },
+        "typealias": {
+          "name": "meta.definition.typealias.swift",
+          "begin": "\\b(typealias)\\s+((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e))\\s*",
+          "end": "(?!\\G)$|(?=;|//|/\\*|$)",
           "patterns": [
             {
-              "begin": "(?=<)",
+              "begin": "\\G(?=\u003c)",
               "end": "(?!\\G)",
               "patterns": [
                 {
-                  "include": "#generic-argument-clause"
+                  "include": "#generic-parameter-clause"
                 }
               ]
+            },
+            {
+              "include": "#typealias-assignment"
             }
-          ]
-        },
-        "typealias": {
-          "begin": "\\b(typealias)\\s+((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))\\s*",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.other.declaration-specifier.swift"
@@ -2148,44 +2120,27 @@
             "4": {
               "name": "punctuation.definition.identifier.swift"
             }
-          },
-          "end": "(?!\\G)$|(?=;|//|/\\*|$)",
-          "name": "meta.definition.typealias.swift",
-          "patterns": [
-            {
-              "begin": "\\G(?=<)",
-              "end": "(?!\\G)",
-              "patterns": [
-                {
-                  "include": "#generic-parameter-clause"
-                }
-              ]
-            },
-            {
-              "include": "#typealias-assignment"
-            }
-          ]
+          }
         },
         "typealias-assignment": {
           "begin": "(=)\\s*",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.assignment.swift"
-            }
-          },
           "end": "(?!\\G)$|(?=;|//|/\\*|$)",
           "patterns": [
             {
               "include": "#available-types"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.assignment.swift"
+            }
+          }
         },
         "types-precedencegroup": {
           "patterns": [
             {
-              "comment": "Precedence groups in the standard library",
-              "match": "\\b(?:BitwiseShift|Assignment|RangeFormation|Casting|Addition|NilCoalescing|Comparison|LogicalConjunction|LogicalDisjunction|Default|Ternary|Multiplication|FunctionArrow)Precedence\\b",
-              "name": "support.type.swift"
+              "name": "support.type.swift",
+              "match": "\\b(?:BitwiseShift|Assignment|RangeFormation|Casting|Addition|NilCoalescing|Comparison|LogicalConjunction|LogicalDisjunction|Default|Ternary|Multiplication|FunctionArrow)Precedence\\b"
             }
           ]
         }
@@ -2245,29 +2200,17 @@
           "include": "#availability-condition"
         },
         {
-          "match": "\\b_\\b",
-          "name": "support.variable.discard-value.swift"
+          "name": "support.variable.discard-value.swift",
+          "match": "\\b_\\b"
         }
       ],
       "repository": {
         "availability-condition": {
           "begin": "\\B(#available)(\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "support.function.availability-condition.swift"
-            },
-            "2": {
-              "name": "punctuation.definition.arguments.begin.swift"
-            }
-          },
           "end": "\\)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.arguments.end.swift"
-            }
-          },
           "patterns": [
             {
+              "match": "\\s*\\b((?:iOS|macOS|OSX|watchOS|tvOS)(?:ApplicationExtension)?)\\b(?:\\s+([0-9]+(?:\\.[0-9]+)*\\b))",
               "captures": {
                 "1": {
                   "name": "keyword.other.platform.os.swift"
@@ -2275,10 +2218,10 @@
                 "2": {
                   "name": "constant.numeric.swift"
                 }
-              },
-              "match": "\\s*\\b((?:iOS|macOS|OSX|watchOS|tvOS)(?:ApplicationExtension)?)\\b(?:\\s+([0-9]+(?:\\.[0-9]+)*\\b))"
+              }
             },
             {
+              "match": "(\\*)\\s*(.*?)(?=[,)])",
               "captures": {
                 "1": {
                   "name": "keyword.other.platform.all.swift"
@@ -2286,20 +2229,33 @@
                 "2": {
                   "name": "invalid.illegal.character-not-allowed-here.swift"
                 }
-              },
-              "match": "(\\*)\\s*(.*?)(?=[,)])"
+              }
             },
             {
-              "match": "[^\\s,)]+",
-              "name": "invalid.illegal.character-not-allowed-here.swift"
+              "name": "invalid.illegal.character-not-allowed-here.swift",
+              "match": "[^\\s,)]+"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.availability-condition.swift"
+            },
+            "2": {
+              "name": "punctuation.definition.arguments.begin.swift"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.arguments.end.swift"
+            }
+          }
         },
         "closure-parameter": {
-          "match": "\\$[0-9]+",
-          "name": "variable.language.closure-parameter.swift"
+          "name": "variable.language.closure-parameter.swift",
+          "match": "\\$[0-9]+"
         },
         "compound-name": {
+          "match": "(?x)\n\t\t\t\t\t\t((?\u003cq1\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq1\u003e))       \t\t# function name\n\t\t\t\t\t\t\\(\n\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((?\u003cq2\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq2\u003e)) \t# argument label\n\t\t\t\t\t\t\t\t\t:\t\t\t\t\t\t\t\t\t\t\t\t# colon\n\t\t\t\t\t\t\t\t)+\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\\)\n\t\t\t\t\t",
           "captures": {
             "1": {
               "name": "entity.name.function.compound-name.swift"
@@ -2313,6 +2269,8 @@
             "4": {
               "patterns": [
                 {
+                  "name": "entity.name.function.compound-name.swift",
+                  "match": "(?\u003cq\u003e`?)(?!_:)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e):",
                   "captures": {
                     "1": {
                       "name": "punctuation.definition.entity.swift"
@@ -2320,15 +2278,11 @@
                     "2": {
                       "name": "punctuation.definition.entity.swift"
                     }
-                  },
-                  "match": "(?<q>`?)(?!_:)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>):",
-                  "name": "entity.name.function.compound-name.swift"
+                  }
                 }
               ]
             }
-          },
-          "comment": "a reference to a function with disambiguating argument labels, such as foo(_:), foo(bar:), etc.",
-          "match": "(?x)\n\t\t\t\t\t\t((?<q1>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q1>))       \t\t# function name\n\t\t\t\t\t\t\\(\n\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((?<q2>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q2>)) \t# argument label\n\t\t\t\t\t\t\t\t\t:\t\t\t\t\t\t\t\t\t\t\t\t# colon\n\t\t\t\t\t\t\t\t)+\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\\)\n\t\t\t\t\t"
+          }
         },
         "expression-element-list": {
           "patterns": [
@@ -2336,7 +2290,13 @@
               "include": "#comments"
             },
             {
-              "begin": "((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))\\s*(:)",
+              "begin": "((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e))\\s*(:)",
+              "end": "(?=[,)\\]])",
+              "patterns": [
+                {
+                  "include": "#expressions"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "support.function.any-method.swift"
@@ -2350,18 +2310,10 @@
                 "4": {
                   "name": "punctuation.separator.argument-label.swift"
                 }
-              },
-              "comment": "an element with a label",
-              "end": "(?=[,)\\]])",
-              "patterns": [
-                {
-                  "include": "#expressions"
-                }
-              ]
+              }
             },
             {
               "begin": "(?![,)\\]])(?=\\S)",
-              "comment": "an element without a label (i.e. anything else)",
               "end": "(?=[,)\\]])",
               "patterns": [
                 {
@@ -2374,7 +2326,14 @@
         "function-call-expression": {
           "patterns": [
             {
-              "begin": "((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))\\s*(\\()",
+              "name": "meta.function-call.swift",
+              "begin": "((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e))\\s*(\\()",
+              "end": "\\)",
+              "patterns": [
+                {
+                  "include": "#expression-element-list"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "support.function.any-method.swift"
@@ -2389,46 +2348,38 @@
                   "name": "punctuation.definition.arguments.begin.swift"
                 }
               },
-              "comment": "foo(args) -- a call whose callee is a highlightable name",
-              "end": "\\)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.arguments.end.swift"
                 }
-              },
+              }
+            },
+            {
               "name": "meta.function-call.swift",
+              "begin": "(?\u003c=[`\\])}\u003e\\p{L}_\\p{N}\\p{M}])\\s*(\\()",
+              "end": "\\)",
               "patterns": [
                 {
                   "include": "#expression-element-list"
                 }
-              ]
-            },
-            {
-              "begin": "(?<=[`\\])}>\\p{L}_\\p{N}\\p{M}])\\s*(\\()",
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.definition.arguments.begin.swift"
                 }
               },
-              "comment": "[Int](args) -- a call whose callee is a more complicated expression",
-              "end": "\\)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.arguments.end.swift"
                 }
-              },
-              "name": "meta.function-call.swift",
-              "patterns": [
-                {
-                  "include": "#expression-element-list"
-                }
-              ]
+              }
             }
           ]
         },
         "member-reference": {
           "patterns": [
             {
+              "match": "(?\u003c=\\.)((?\u003cq\u003e`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k\u003cq\u003e))",
               "captures": {
                 "1": {
                   "name": "variable.other.swift"
@@ -2439,67 +2390,67 @@
                 "3": {
                   "name": "punctuation.definition.identifier.swift"
                 }
-              },
-              "match": "(?<=\\.)((?<q>`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k<q>))"
+              }
             }
           ]
         },
         "parenthesized-expression": {
           "begin": "\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#expression-element-list"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.tuple.begin.swift"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.tuple.end.swift"
             }
-          },
+          }
+        },
+        "subscript-expression": {
+          "name": "meta.subscript-expression.swift",
+          "begin": "(?\u003c=[`\\p{L}_\\p{N}\\p{M}])\\s*(\\[)",
+          "end": "\\]",
           "patterns": [
             {
               "include": "#expression-element-list"
             }
-          ]
-        },
-        "subscript-expression": {
-          "begin": "(?<=[`\\p{L}_\\p{N}\\p{M}])\\s*(\\[)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.begin.swift"
             }
           },
-          "end": "\\]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.arguments.end.swift"
             }
-          },
-          "name": "meta.subscript-expression.swift",
-          "patterns": [
-            {
-              "include": "#expression-element-list"
-            }
-          ]
+          }
         }
       }
     },
     "keywords": {
       "patterns": [
         {
-          "match": "(?<!\\.)\\b(?:if|else|guard|where|switch|case|default|fallthrough)\\b",
-          "name": "keyword.control.branch.swift"
+          "name": "keyword.control.branch.swift",
+          "match": "(?\u003c!\\.)\\b(?:if|else|guard|where|switch|case|default|fallthrough)\\b"
         },
         {
-          "match": "(?<!\\.)\\b(?:continue|break|fallthrough|return)\\b",
-          "name": "keyword.control.transfer.swift"
+          "name": "keyword.control.transfer.swift",
+          "match": "(?\u003c!\\.)\\b(?:continue|break|fallthrough|return)\\b"
         },
         {
-          "match": "(?<!\\.)\\b(?:while|for|in)\\b",
-          "name": "keyword.control.loop.swift"
+          "name": "keyword.control.loop.swift",
+          "match": "(?\u003c!\\.)\\b(?:while|for|in)\\b"
         },
         {
+          "match": "(?\u003c!\\.)\\b(repeat)\\b(\\s*)",
           "captures": {
             "1": {
               "name": "keyword.control.loop.swift"
@@ -2507,19 +2458,18 @@
             "2": {
               "name": "punctuation.whitespace.trailing.repeat.swift"
             }
-          },
-          "comment": "extra scopes for repeat-while snippet",
-          "match": "(?<!\\.)\\b(repeat)\\b(\\s*)"
+          }
         },
         {
-          "match": "(?<!\\.)\\bdefer\\b",
-          "name": "keyword.control.defer.swift"
+          "name": "keyword.control.defer.swift",
+          "match": "(?\u003c!\\.)\\bdefer\\b"
         },
         {
-          "match": "(?<!\\.)\\b(?:catch|throws?|rethrows|try)\\b|\\btry[?!]\\B",
-          "name": "keyword.control.exception.swift"
+          "name": "keyword.control.exception.swift",
+          "match": "(?\u003c!\\.)\\b(?:catch|throws?|rethrows|try)\\b|\\btry[?!]\\B"
         },
         {
+          "match": "(?\u003c!\\.)\\b(do)\\b(\\s*)",
           "captures": {
             "1": {
               "name": "keyword.control.exception.swift"
@@ -2527,36 +2477,34 @@
             "2": {
               "name": "punctuation.whitespace.trailing.do.swift"
             }
-          },
-          "comment": "extra scopes for do-catch snippet",
-          "match": "(?<!\\.)\\b(do)\\b(\\s*)"
+          }
         },
         {
-          "match": "(?<!\\.)\\b(?:associatedtype|let|operator|typealias|var)\\b",
-          "name": "keyword.other.declaration-specifier.swift"
+          "name": "keyword.other.declaration-specifier.swift",
+          "match": "(?\u003c!\\.)\\b(?:associatedtype|let|operator|typealias|var)\\b"
         },
         {
-          "match": "(?<!\\.)\\b(class|enum|extension|precedencegroup|protocol|struct)\\b",
-          "name": "storage.type.$1.swift"
+          "name": "storage.type.$1.swift",
+          "match": "(?\u003c!\\.)\\b(class|enum|extension|precedencegroup|protocol|struct)\\b"
         },
         {
-          "match": "(?<!\\.)\\b(?:inout|static|final|lazy|mutating|nonmutating|optional|indirect|required|override|dynamic|convenience|infix|prefix|postfix)\\b",
-          "name": "storage.modifier.swift"
+          "name": "storage.modifier.swift",
+          "match": "(?\u003c!\\.)\\b(?:inout|static|final|lazy|mutating|nonmutating|optional|indirect|required|override|dynamic|convenience|infix|prefix|postfix)\\b"
         },
         {
-          "match": "\\binit[?!]|\\binit\\b|(?<!\\.)\\b(?:func|deinit|subscript|didSet|get|set|willSet)\\b",
-          "name": "storage.type.function.swift"
+          "name": "storage.type.function.swift",
+          "match": "\\binit[?!]|\\binit\\b|(?\u003c!\\.)\\b(?:func|deinit|subscript|didSet|get|set|willSet)\\b"
         },
         {
-          "match": "(?<!\\.)\\b(?:fileprivate|private|internal|public|open)\\b",
-          "name": "keyword.other.declaration-specifier.accessibility.swift"
+          "name": "keyword.other.declaration-specifier.accessibility.swift",
+          "match": "(?\u003c!\\.)\\b(?:fileprivate|private|internal|public|open)\\b"
         },
         {
-          "comment": "matches weak, unowned, unowned(safe), unowned(unsafe)",
-          "match": "(?<!\\.)\\b(?:weak|unowned)\\b|\\bunowned\\((?:safe|unsafe)\\)",
-          "name": "keyword.other.capture-specifier.swift"
+          "name": "keyword.other.capture-specifier.swift",
+          "match": "(?\u003c!\\.)\\b(?:weak|unowned)\\b|\\bunowned\\((?:safe|unsafe)\\)"
         },
         {
+          "match": "(?\u003c=\\.)(?:(dynamicType|self)|(Protocol|Type))\\b",
           "captures": {
             "1": {
               "name": "keyword.operator.type.swift"
@@ -2564,20 +2512,19 @@
             "2": {
               "name": "keyword.operator.type.metatype.swift"
             }
-          },
-          "match": "(?<=\\.)(?:(dynamicType|self)|(Protocol|Type))\\b"
+          }
         },
         {
-          "match": "(?<!\\.)\\b(?:super|self|Self)\\b",
-          "name": "variable.language.swift"
+          "name": "variable.language.swift",
+          "match": "(?\u003c!\\.)\\b(?:super|self|Self)\\b"
         },
         {
-          "match": "\\B(?:#file|#line|#column|#function|#dsohandle)\\b|\\b(?:__FILE__|__LINE__|__COLUMN__|__FUNCTION__|__DSO_HANDLE__)\\b",
-          "name": "support.variable.swift"
+          "name": "support.variable.swift",
+          "match": "\\B(?:#file|#line|#column|#function|#dsohandle)\\b|\\b(?:__FILE__|__LINE__|__COLUMN__|__FUNCTION__|__DSO_HANDLE__)\\b"
         },
         {
-          "match": "(?<!\\.)\\bimport\\b",
-          "name": "keyword.control.import.swift"
+          "name": "keyword.control.import.swift",
+          "match": "(?\u003c!\\.)\\bimport\\b"
         }
       ]
     },
@@ -2593,20 +2540,25 @@
           "include": "#string"
         },
         {
-          "match": "\\bnil\\b",
-          "name": "constant.language.nil.swift"
+          "name": "constant.language.nil.swift",
+          "match": "\\bnil\\b"
         },
         {
-          "comment": "object \"literals\" used in playgrounds",
-          "match": "\\B#(colorLiteral|imageLiteral|fileLiteral)\\b",
-          "name": "support.function.object-literal.swift"
+          "name": "support.function.object-literal.swift",
+          "match": "\\B#(colorLiteral|imageLiteral|fileLiteral)\\b"
         },
         {
-          "match": "\\B#keyPath\\b",
-          "name": "support.function.key-path.swift"
+          "name": "support.function.key-path.swift",
+          "match": "\\B#keyPath\\b"
         },
         {
           "begin": "\\B(#selector)(\\()(?:\\s*(getter|setter)\\s*(:))?",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#expressions"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "support.function.selector-reference.swift"
@@ -2621,167 +2573,158 @@
               "name": "punctuation.separator.argument-label.swift"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.arguments.end.swift"
             }
-          },
-          "patterns": [
-            {
-              "include": "#expressions"
-            }
-          ]
+          }
         }
       ],
       "repository": {
         "boolean": {
-          "match": "\\b(true|false)\\b",
-          "name": "constant.language.boolean.swift"
+          "name": "constant.language.boolean.swift",
+          "match": "\\b(true|false)\\b"
         },
         "numeric": {
           "patterns": [
             {
-              "comment": "0.1, -4_2.5, 6.022e23, 10E-5",
-              "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)[0-9][0-9_]*(?=\\.[0-9]|[eE])(?:\\.[0-9][0-9_]*)?(?:[eE][-+]?[0-9][0-9_]*)?\\b(?!\\.[0-9])",
-              "name": "constant.numeric.float.decimal.swift"
+              "name": "constant.numeric.float.decimal.swift",
+              "match": "(\\B\\-|\\b)(?\u003c![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)[0-9][0-9_]*(?=\\.[0-9]|[eE])(?:\\.[0-9][0-9_]*)?(?:[eE][-+]?[0-9][0-9_]*)?\\b(?!\\.[0-9])"
             },
             {
-              "comment": "-0x1.ap2_3, 0x31p-4",
-              "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"
+              "name": "constant.numeric.float.hexadecimal.swift",
+              "match": "(\\B\\-|\\b)(?\u003c![\\[\\](){}\\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])"
             },
             {
-              "comment": "0x1p, 0x1p_2, 0x1.5pa, 0x1.1p+1f, 0x1pz",
-              "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"
+              "name": "invalid.illegal.numeric.float.invalid-exponent.swift",
+              "match": "(\\B\\-|\\b)(?\u003c![\\[\\](){}\\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])"
             },
             {
-              "comment": "0x1.5w (note that 0x1.f may be a valid expression)",
-              "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"
+              "name": "invalid.illegal.numeric.float.missing-exponent.swift",
+              "match": "(\\B\\-|\\b)(?\u003c![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)(0x[0-9a-fA-F][0-9a-fA-F_]*)\\.[0-9][\\w.]*"
             },
             {
-              "comment": "-.5, .2f (note that 1.-.5 may be a valid expression)",
-              "match": "(?<=\\s|^)\\-?\\.[0-9][\\w.]*",
-              "name": "invalid.illegal.numeric.float.missing-leading-zero.swift"
+              "name": "invalid.illegal.numeric.float.missing-leading-zero.swift",
+              "match": "(?\u003c=\\s|^)\\-?\\.[0-9][\\w.]*"
             },
             {
-              "comment": "0b_0_1, 0x_1p+3q",
-              "match": "(\\B\\-|\\b)0[box]_[0-9a-fA-F_]*(?:[pPeE][+-]?\\w+)?[\\w.]+",
-              "name": "invalid.illegal.numeric.leading-underscore.swift"
+              "name": "invalid.illegal.numeric.leading-underscore.swift",
+              "match": "(\\B\\-|\\b)0[box]_[0-9a-fA-F_]*(?:[pPeE][+-]?\\w+)?[\\w.]+"
             },
             {
-              "comment": "tuple positional member: not really a numeric literal, but not invalid",
-              "match": "(?<=[\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)[0-9]+\\b"
+              "match": "(?\u003c=[\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)[0-9]+\\b"
             },
             {
-              "comment": "0b010, 0b1_0",
-              "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)0b[01][01_]*\\b(?!\\.[0-9])",
-              "name": "constant.numeric.integer.binary.swift"
+              "name": "constant.numeric.integer.binary.swift",
+              "match": "(\\B\\-|\\b)(?\u003c![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)0b[01][01_]*\\b(?!\\.[0-9])"
             },
             {
-              "comment": "0o1, 0o7_3",
-              "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)0o[0-7][0-7_]*\\b(?!\\.[0-9])",
-              "name": "constant.numeric.integer.octal.swift"
+              "name": "constant.numeric.integer.octal.swift",
+              "match": "(\\B\\-|\\b)(?\u003c![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)0o[0-7][0-7_]*\\b(?!\\.[0-9])"
             },
             {
-              "comment": "02, 3_456",
-              "match": "(\\B\\-|\\b)(?<![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)[0-9][0-9_]*\\b(?!\\.[0-9])",
-              "name": "constant.numeric.integer.decimal.swift"
+              "name": "constant.numeric.integer.decimal.swift",
+              "match": "(\\B\\-|\\b)(?\u003c![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)[0-9][0-9_]*\\b(?!\\.[0-9])"
             },
             {
-              "comment": "0x4, 0xF_7",
-              "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"
+              "name": "constant.numeric.integer.hexadecimal.swift",
+              "match": "(\\B\\-|\\b)(?\u003c![\\[\\](){}\\p{L}_\\p{N}\\p{M}]\\.)0x[0-9a-fA-F][0-9a-fA-F_]*\\b(?!\\.[0-9])"
             },
             {
-              "match": "(\\B\\-|\\b)[0-9][\\w.]*",
-              "name": "invalid.illegal.numeric.other.swift"
+              "name": "invalid.illegal.numeric.other.swift",
+              "match": "(\\B\\-|\\b)[0-9][\\w.]*"
             }
           ]
         },
         "string": {
           "patterns": [
             {
+              "name": "string.quoted.double.block.swift",
               "begin": "\"\"\"",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.string.begin.swift"
-                }
-              },
-              "comment": "SE-0168: Multi-Line String Literals",
               "end": "\"\"\"",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.string.end.swift"
-                }
-              },
-              "name": "string.quoted.double.block.swift",
               "patterns": [
                 {
-                  "match": "\\G.+(?=\"\"\")|\\G.+",
-                  "name": "invalid.illegal.content-after-opening-delimiter.swift"
+                  "name": "invalid.illegal.content-after-opening-delimiter.swift",
+                  "match": "\\G.+(?=\"\"\")|\\G.+"
                 },
                 {
-                  "match": "\\\\\\s*\\n",
-                  "name": "constant.character.escape.newline.swift"
+                  "name": "constant.character.escape.newline.swift",
+                  "match": "\\\\\\s*\\n"
                 },
                 {
                   "include": "#string-guts"
                 },
                 {
-                  "comment": "Allow \\(\"\"\"...\"\"\") to appear inside a block string",
-                  "match": "\\S((?!\\\\\\().)*(?=\"\"\")",
-                  "name": "invalid.illegal.content-before-closing-delimiter.swift"
+                  "name": "invalid.illegal.content-before-closing-delimiter.swift",
+                  "match": "\\S((?!\\\\\\().)*(?=\"\"\")"
                 }
-              ]
-            },
-            {
-              "begin": "\"",
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.begin.swift"
                 }
               },
-              "end": "\"",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.string.end.swift"
                 }
-              },
+              }
+            },
+            {
               "name": "string.quoted.double.single-line.swift",
+              "begin": "\"",
+              "end": "\"",
               "patterns": [
                 {
-                  "match": "\\r|\\n",
-                  "name": "invalid.illegal.returns-not-allowed.swift"
+                  "name": "invalid.illegal.returns-not-allowed.swift",
+                  "match": "\\r|\\n"
                 },
                 {
                   "include": "#string-guts"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.begin.swift"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.end.swift"
+                }
+              }
             }
           ],
           "repository": {
             "string-guts": {
               "patterns": [
                 {
-                  "match": "\\\\[0\\\\tnr\"']",
-                  "name": "constant.character.escape.swift"
+                  "name": "constant.character.escape.swift",
+                  "match": "\\\\[0\\\\tnr\"']"
                 },
                 {
-                  "match": "\\\\u\\{[0-9a-fA-F]{1,8}\\}",
-                  "name": "constant.character.escape.unicode.swift"
+                  "name": "constant.character.escape.unicode.swift",
+                  "match": "\\\\u\\{[0-9a-fA-F]{1,8}\\}"
                 },
                 {
+                  "name": "meta.embedded.line.swift",
+                  "contentName": "source.swift",
                   "begin": "\\\\\\(",
+                  "end": "(\\))",
+                  "patterns": [
+                    {
+                      "include": "$self"
+                    },
+                    {
+                      "begin": "\\(",
+                      "end": "\\)"
+                    }
+                  ],
                   "beginCaptures": {
                     "0": {
                       "name": "punctuation.section.embedded.begin.swift"
                     }
                   },
-                  "contentName": "source.swift",
-                  "end": "(\\))",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.section.embedded.end.swift"
@@ -2789,22 +2732,11 @@
                     "1": {
                       "name": "source.swift"
                     }
-                  },
-                  "name": "meta.embedded.line.swift",
-                  "patterns": [
-                    {
-                      "include": "$self"
-                    },
-                    {
-                      "begin": "\\(",
-                      "comment": "Nested parens",
-                      "end": "\\)"
-                    }
-                  ]
+                  }
                 },
                 {
-                  "match": "\\\\.",
-                  "name": "invalid.illegal.escape-not-recognized"
+                  "name": "invalid.illegal.escape-not-recognized",
+                  "match": "\\\\."
                 }
               ]
             }
@@ -2815,176 +2747,168 @@
     "operators": {
       "patterns": [
         {
-          "comment": "Type casting",
-          "match": "\\b(is\\b|as([!?]\\B|\\b))",
-          "name": "keyword.operator.type-casting.swift"
+          "name": "keyword.operator.type-casting.swift",
+          "match": "\\b(is\\b|as([!?]\\B|\\b))"
         },
         {
-          "begin": "(?x)\n\t\t\t\t\t\t(?=\n\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[/=\\-+!*%<>&|^~?]\n\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t  | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t  | \\.\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\\g<oph>\t\t\t\t\t\t\t# operator-head\n\t\t\t\t\t\t\t  | \\.\n\t\t\t\t\t\t\t  | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\n\t\t\t\t\t\t\t  | [\\x{1DC0}-\\x{1DFF}]\n\t\t\t\t\t\t\t  | [\\x{20D0}-\\x{20FF}]\n\t\t\t\t\t\t\t  | [\\x{FE00}-\\x{FE0F}]\n\t\t\t\t\t\t\t  | [\\x{FE20}-\\x{FE2F}]\n\t\t\t\t\t\t\t  | [\\x{E0100}-\\x{E01EF}]\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t)\n\t\t\t\t\t",
-          "comment": "This rule helps us speed up the matching.",
+          "begin": "(?x)\n\t\t\t\t\t\t(?=\n\t\t\t\t\t\t\t(?\u003coph\u003e\t\t\t\t\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t[/=\\-+!*%\u003c\u003e\u0026|^~?]\n\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t  | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t  | \\.\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\\g\u003coph\u003e\t\t\t\t\t\t\t# operator-head\n\t\t\t\t\t\t\t  | \\.\n\t\t\t\t\t\t\t  | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\n\t\t\t\t\t\t\t  | [\\x{1DC0}-\\x{1DFF}]\n\t\t\t\t\t\t\t  | [\\x{20D0}-\\x{20FF}]\n\t\t\t\t\t\t\t  | [\\x{FE00}-\\x{FE0F}]\n\t\t\t\t\t\t\t  | [\\x{FE20}-\\x{FE2F}]\n\t\t\t\t\t\t\t  | [\\x{E0100}-\\x{E01EF}]\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t)\n\t\t\t\t\t",
           "end": "(?!\\G)",
           "patterns": [
             {
+              "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t(?\u003c=^|[\\s(\\[{,;:])\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?!(//|/\\*|\\*/))\n\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t[/=\\-+!*%\u003c\u003e\u0026|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\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\t  | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\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\t(?![\\s)\\]},;:]|\\z)\n\t\t\t\t\t\t\t",
               "captures": {
                 "0": {
                   "patterns": [
                     {
-                      "match": "\\G(\\+\\+|\\-\\-)$",
-                      "name": "keyword.operator.increment-or-decrement.swift"
+                      "name": "keyword.operator.increment-or-decrement.swift",
+                      "match": "\\G(\\+\\+|\\-\\-)$"
                     },
                     {
-                      "match": "\\G(\\+|\\-)$",
-                      "name": "keyword.operator.arithmetic.unary.swift"
+                      "name": "keyword.operator.arithmetic.unary.swift",
+                      "match": "\\G(\\+|\\-)$"
                     },
                     {
-                      "match": "\\G!$",
-                      "name": "keyword.operator.logical.not.swift"
+                      "name": "keyword.operator.logical.not.swift",
+                      "match": "\\G!$"
                     },
                     {
-                      "match": "\\G~$",
-                      "name": "keyword.operator.bitwise.not.swift"
+                      "name": "keyword.operator.bitwise.not.swift",
+                      "match": "\\G~$"
                     },
                     {
-                      "match": ".+",
-                      "name": "keyword.operator.custom.prefix.swift"
+                      "name": "keyword.operator.custom.prefix.swift",
+                      "match": ".+"
                     }
                   ]
                 }
-              },
-              "comment": "Prefix unary operator",
-              "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\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(?!(//|/\\*|\\*/))\n\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t[/=\\-+!*%<>&|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\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\t  | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\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\t(?![\\s)\\]},;:]|\\z)\n\t\t\t\t\t\t\t"
+              }
             },
             {
+              "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t(?\u003c!^|[\\s(\\[{,;:])\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?!(//|/\\*|\\*/))\n\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t[/=\\-+!*%\u003c\u003e\u0026|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\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\t  | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\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\t(?=[\\s)\\]},;:]|\\z)\n\t\t\t\t\t\t\t",
               "captures": {
                 "0": {
                   "patterns": [
                     {
-                      "match": "\\G(\\+\\+|\\-\\-)$",
-                      "name": "keyword.operator.increment-or-decrement.swift"
+                      "name": "keyword.operator.increment-or-decrement.swift",
+                      "match": "\\G(\\+\\+|\\-\\-)$"
                     },
                     {
-                      "match": "\\G!$",
-                      "name": "keyword.operator.increment-or-decrement.swift"
+                      "name": "keyword.operator.increment-or-decrement.swift",
+                      "match": "\\G!$"
                     },
                     {
-                      "match": ".+",
-                      "name": "keyword.operator.custom.postfix.swift"
+                      "name": "keyword.operator.custom.postfix.swift",
+                      "match": ".+"
                     }
                   ]
                 }
-              },
-              "comment": "Postfix unary operator",
-              "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\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(?!(//|/\\*|\\*/))\n\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t[/=\\-+!*%<>&|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\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\t  | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\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\t(?=[\\s)\\]},;:]|\\z)\n\t\t\t\t\t\t\t"
+              }
             },
             {
+              "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?!(//|/\\*|\\*/))\n\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t[/=\\-+!*%\u003c\u003e\u0026|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\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\t  | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\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",
               "captures": {
                 "0": {
                   "patterns": [
                     {
-                      "match": "\\G=$",
-                      "name": "keyword.operator.assignment.swift"
+                      "name": "keyword.operator.assignment.swift",
+                      "match": "\\G=$"
                     },
                     {
-                      "match": "\\G(\\+|\\-|\\*|/|%|<<|>>|&|\\^|\\||&&|\\|\\|)=$",
-                      "name": "keyword.operator.assignment.compound.swift"
+                      "name": "keyword.operator.assignment.compound.swift",
+                      "match": "\\G(\\+|\\-|\\*|/|%|\u003c\u003c|\u003e\u003e|\u0026|\\^|\\||\u0026\u0026|\\|\\|)=$"
                     },
                     {
-                      "match": "\\G(\\+|\\-|\\*|/)$",
-                      "name": "keyword.operator.arithmetic.swift"
+                      "name": "keyword.operator.arithmetic.swift",
+                      "match": "\\G(\\+|\\-|\\*|/)$"
                     },
                     {
-                      "match": "\\G&(\\+|\\-|\\*)$",
-                      "name": "keyword.operator.arithmetic.overflow.swift"
+                      "name": "keyword.operator.arithmetic.overflow.swift",
+                      "match": "\\G\u0026(\\+|\\-|\\*)$"
                     },
                     {
-                      "match": "\\G%$",
-                      "name": "keyword.operator.arithmetic.remainder.swift"
+                      "name": "keyword.operator.arithmetic.remainder.swift",
+                      "match": "\\G%$"
                     },
                     {
-                      "match": "\\G(==|!=|>|<|>=|<=|~=)$",
-                      "name": "keyword.operator.comparison.swift"
+                      "name": "keyword.operator.comparison.swift",
+                      "match": "\\G(==|!=|\u003e|\u003c|\u003e=|\u003c=|~=)$"
                     },
                     {
-                      "match": "\\G\\?\\?$",
-                      "name": "keyword.operator.coalescing.swift"
+                      "name": "keyword.operator.coalescing.swift",
+                      "match": "\\G\\?\\?$"
                     },
                     {
-                      "match": "\\G(&&|\\|\\|)$",
-                      "name": "keyword.operator.logical.swift"
+                      "name": "keyword.operator.logical.swift",
+                      "match": "\\G(\u0026\u0026|\\|\\|)$"
                     },
                     {
-                      "match": "\\G(&|\\||\\^|<<|>>)$",
-                      "name": "keyword.operator.bitwise.swift"
+                      "name": "keyword.operator.bitwise.swift",
+                      "match": "\\G(\u0026|\\||\\^|\u003c\u003c|\u003e\u003e)$"
                     },
                     {
-                      "match": "\\G(===|!==)$",
-                      "name": "keyword.operator.bitwise.swift"
+                      "name": "keyword.operator.bitwise.swift",
+                      "match": "\\G(===|!==)$"
                     },
                     {
-                      "match": "\\G\\?$",
-                      "name": "keyword.operator.ternary.swift"
+                      "name": "keyword.operator.ternary.swift",
+                      "match": "\\G\\?$"
                     },
                     {
-                      "match": ".+",
-                      "name": "keyword.operator.custom.infix.swift"
+                      "name": "keyword.operator.custom.infix.swift",
+                      "match": ".+"
                     }
                   ]
                 }
-              },
-              "comment": "Infix operator",
-              "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?!(//|/\\*|\\*/))\n\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t[/=\\-+!*%<>&|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\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\t  | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\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"
+              }
             },
             {
+              "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t(?\u003c=^|[\\s(\\[{,;:])\n\t\t\t\t\t\t\t\t\\.\t\t\t\t\t\t\t\t\t\t# dot\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?!(//|/\\*|\\*/))\n\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\t# dot\n\t\t\t\t\t\t\t\t\t  | [/=\\-+!*%\u003c\u003e\u0026|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\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\t  | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\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\t(?![\\s)\\]},;:]|\\z)\n\t\t\t\t\t\t\t",
               "captures": {
                 "0": {
                   "patterns": [
                     {
-                      "match": ".+",
-                      "name": "keyword.operator.custom.prefix.dot.swift"
+                      "name": "keyword.operator.custom.prefix.dot.swift",
+                      "match": ".+"
                     }
                   ]
                 }
-              },
-              "comment": "Dot prefix unary operator",
-              "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t(?<=^|[\\s(\\[{,;:])\n\t\t\t\t\t\t\t\t\\.\t\t\t\t\t\t\t\t\t\t# dot\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?!(//|/\\*|\\*/))\n\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\t# dot\n\t\t\t\t\t\t\t\t\t  | [/=\\-+!*%<>&|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\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\t  | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\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\t(?![\\s)\\]},;:]|\\z)\n\t\t\t\t\t\t\t"
+              }
             },
             {
+              "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t(?\u003c!^|[\\s(\\[{,;:])\n\t\t\t\t\t\t\t\t\\.\t\t\t\t\t\t\t\t\t\t# dot\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?!(//|/\\*|\\*/))\n\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\t# dot\n\t\t\t\t\t\t\t\t\t  | [/=\\-+!*%\u003c\u003e\u0026|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\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\t  | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\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\t(?=[\\s)\\]},;:]|\\z)\n\t\t\t\t\t\t\t",
               "captures": {
                 "0": {
                   "patterns": [
                     {
-                      "match": ".+",
-                      "name": "keyword.operator.custom.postfix.dot.swift"
+                      "name": "keyword.operator.custom.postfix.dot.swift",
+                      "match": ".+"
                     }
                   ]
                 }
-              },
-              "comment": "Dot postfix unary operator",
-              "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t(?<!^|[\\s(\\[{,;:])\n\t\t\t\t\t\t\t\t\\.\t\t\t\t\t\t\t\t\t\t# dot\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?!(//|/\\*|\\*/))\n\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\t# dot\n\t\t\t\t\t\t\t\t\t  | [/=\\-+!*%<>&|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\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\t  | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\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\t(?=[\\s)\\]},;:]|\\z)\n\t\t\t\t\t\t\t"
+              }
             },
             {
+              "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t\\.\t\t\t\t\t\t\t\t\t\t# dot\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?!(//|/\\*|\\*/))\n\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\t# dot\n\t\t\t\t\t\t\t\t\t  | [/=\\-+!*%\u003c\u003e\u0026|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\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\t  | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\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",
               "captures": {
                 "0": {
                   "patterns": [
                     {
-                      "match": "\\G\\.\\.[.<]$",
-                      "name": "keyword.operator.range.swift"
+                      "name": "keyword.operator.range.swift",
+                      "match": "\\G\\.\\.[.\u003c]$"
                     },
                     {
-                      "match": ".+",
-                      "name": "keyword.operator.custom.infix.dot.swift"
+                      "name": "keyword.operator.custom.infix.dot.swift",
+                      "match": ".+"
                     }
                   ]
                 }
-              },
-              "comment": "Dot infix operator",
-              "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t\\.\t\t\t\t\t\t\t\t\t\t# dot\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?!(//|/\\*|\\*/))\n\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\t# dot\n\t\t\t\t\t\t\t\t\t  | [/=\\-+!*%<>&|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t  | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t  | [\\x{00AC}\\x{00AE}]\n\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  | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t  | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t  | [\\x{3001}-\\x{3003}]\n\t\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\t  | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\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"
+              }
             }
           ]
         },
         {
-          "match": ":",
-          "name": "keyword.operator.ternary.swift"
+          "name": "keyword.operator.ternary.swift",
+          "match": ":"
         }
       ]
     },
@@ -3001,7 +2925,5 @@
         }
       ]
     }
-  },
-  "scopeName": "source.swift",
-  "uuid": "8C743E89-9C8D-4833-8149-6500D82AA463"
-}
+  }
+}