From ab893c684dd7eeb7c249139e29e931334316fda7 Mon Sep 17 00:00:00 2001
From: Jacob Bandes-Storch <jacob@bandes-stor.ch>
Date: Tue, 12 Dec 2023 16:40:20 -0800
Subject: [PATCH] Fix invalid.illegal `await try` matching even with no word
 boundary (#6)

Fixes #5:

```swift
await tryFoo()
```
---
 Swift.tmLanguage.json     | 2 +-
 Swift.tmLanguage.yaml     | 2 +-
 Syntaxes/Swift.tmLanguage | 2 +-
 grammar-test.swift        | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Swift.tmLanguage.json b/Swift.tmLanguage.json
index a7fa2e9..cc0d07b 100644
--- a/Swift.tmLanguage.json
+++ b/Swift.tmLanguage.json
@@ -2051,7 +2051,7 @@
         },
 
         {
-          "match": "(?<!\\.)\\b(?:(await\\s+try)|(await)\\b)",
+          "match": "(?<!\\.)\\b(?:(await\\s+try)|(await))\\b",
           "captures": {
             "1": { "name": "invalid.illegal.try-must-precede-await.swift" },
             "2": { "name": "keyword.control.await.swift" }
diff --git a/Swift.tmLanguage.yaml b/Swift.tmLanguage.yaml
index 7000a4d..ef64b8f 100644
--- a/Swift.tmLanguage.yaml
+++ b/Swift.tmLanguage.yaml
@@ -1658,7 +1658,7 @@ repository:
       - name: keyword.control.defer.swift
         match: (?<!\.)\bdefer\b
 
-      - match: (?<!\.)\b(?:(await\s+try)|(await)\b)
+      - match: (?<!\.)\b(?:(await\s+try)|(await))\b
         captures:
           1: { name: invalid.illegal.try-must-precede-await.swift }
           2: { name: keyword.control.await.swift }
diff --git a/Syntaxes/Swift.tmLanguage b/Syntaxes/Swift.tmLanguage
index 557ec3f..21eef45 100644
--- a/Syntaxes/Swift.tmLanguage
+++ b/Syntaxes/Swift.tmLanguage
@@ -4566,7 +4566,7 @@
           </dict>
           <dict>
             <key>match</key>
-            <string>(?&lt;!\.)\b(?:(await\s+try)|(await)\b)</string>
+            <string>(?&lt;!\.)\b(?:(await\s+try)|(await))\b</string>
             <key>captures</key>
             <dict>
               <key>1</key>
diff --git a/grammar-test.swift b/grammar-test.swift
index d9177d6..80c2292 100644
--- a/grammar-test.swift
+++ b/grammar-test.swift
@@ -284,6 +284,7 @@ func foo() async {
   let newURL = await server.redirectURL(for: url)
   let (data, response) = try await session.dataTask(with: newURL)
   let (data, response) = await try session.dataTask(with: newURL) // not allowed
+  let (data, response) = await tryFoo() // ok
   let (data, response) = await (try session.dataTask(with: newURL)) // ok
   async let dog = getDoggo()
   async let pup: Dog = getDoggo()