Use RegexBuilder Reference in Captures (#814)

bolsinga · Jun 15, 2024 · 785104b · 785104b
1 parent 4a8d5a0
commit 785104b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/Sources/Site/Utility/String+LibrarySorting.swift b/Sources/Site/Utility/String+LibrarySorting.swift
@@ -27,11 +27,13 @@ extension String {
   }
 
   internal var removeCommonInitialPunctuation: String {
-    var result = self.removeCommonInitialWords
+    let result = self.removeCommonInitialWords
+
+    let body = Reference(Substring.self)
 
     let regex = Regex {
       ZeroOrMore { .word.inverted }
-      Capture {
+      Capture(as: body) {
         OneOrMore {
           .word
           Optionally {
@@ -42,8 +44,8 @@ extension String {
       ZeroOrMore { .word.inverted }
     }
 
-    if let match = result.wholeMatch(of: regex) {
-      result = String(match.output.1)
+    if let match = try? regex.wholeMatch(in: result) {
+      return String(match[body])
     }
     return result
   }

diff --git a/Sources/Site/Utility/String+Markdown.swift b/Sources/Site/Utility/String+Markdown.swift
@@ -13,15 +13,18 @@ extension String {
     // <a href="url">link</a>
     // --->
     // [link](url)
+    let url = Reference(Substring.self)
+    let link = Reference(Substring.self)
+
     let regex = Regex {
       "<a href=\""
-      Capture {
+      Capture(as: url) {
         ZeroOrMore(.reluctant) {
           .any
         }
       }
       "\">"
-      Capture {
+      Capture(as: link) {
         ZeroOrMore(.reluctant) {
           .any
         }
@@ -31,8 +34,7 @@ extension String {
     .anchorsMatchLineEndings()
 
     return self.replacing(regex) { match in
-      let (_, url, link) = match.output
-      return "[\(link)](\(url))"
+      return "[\(match[link])](\(match[url]))"
     }
   }